atom feed1 message in org.apache.tuscany.commitssvn commit: r1044593 - in /tuscany/sc...
FromSent OnAttachments
jsde...@apache.orgDec 11, 2010 12:59 am 
Subject:svn commit: r1044593 - in /tuscany/sca-cpp/trunk: etc/git-exclude modules/scheme/Makefile.am modules/scheme/json-value.cpp modules/scheme/value-json.cpp modules/scheme/value-xml.cpp modules/scheme/xml-value.cpp
From:jsde...@apache.org (jsde@apache.org)
Date:Dec 11, 2010 12:59:36 am
List:org.apache.tuscany.commits

Author: jsdelfino Date: Sat Dec 11 08:59:36 2010 New Revision: 1044593

URL: http://svn.apache.org/viewvc?rev=1044593&view=rev Log: Add XML and JSON to/from Scheme conversion test programs.

Added: tuscany/sca-cpp/trunk/modules/scheme/json-value.cpp tuscany/sca-cpp/trunk/modules/scheme/value-json.cpp tuscany/sca-cpp/trunk/modules/scheme/value-xml.cpp tuscany/sca-cpp/trunk/modules/scheme/xml-value.cpp Modified: tuscany/sca-cpp/trunk/etc/git-exclude tuscany/sca-cpp/trunk/modules/scheme/Makefile.am

Modified: tuscany/sca-cpp/trunk/etc/git-exclude URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/etc/git-exclude?rev=1044593&r1=1044592&r2=1044593&view=diff ============================================================================== --- tuscany/sca-cpp/trunk/etc/git-exclude (original) +++ tuscany/sca-cpp/trunk/etc/git-exclude Sat Dec 11 08:59:36 2010 @@ -106,4 +106,8 @@ rss-test scribe-cat js-test file-test +xml-value +value-xml +json-value +value-json

Modified: tuscany/sca-cpp/trunk/modules/scheme/Makefile.am URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/scheme/Makefile.am?rev=1044593&r1=1044592&r2=1044593&view=diff ============================================================================== --- tuscany/sca-cpp/trunk/modules/scheme/Makefile.am (original) +++ tuscany/sca-cpp/trunk/modules/scheme/Makefile.am Sat Dec 11 08:59:36 2010 @@ -22,5 +22,17 @@ eval_test_SOURCES = eval-test.cpp

eval_shell_SOURCES = eval-shell.cpp

-noinst_PROGRAMS = eval-test eval-shell +xml_value_SOURCES = xml-value.cpp +xml_value_LDFLAGS = -lxml2 + +value_xml_SOURCES = value-xml.cpp +value_xml_LDFLAGS = -lxml2 + +json_value_SOURCES = json-value.cpp +json_value_LDFLAGS = -lmozjs + +value_json_SOURCES = value-json.cpp +value_json_LDFLAGS = -lmozjs + +noinst_PROGRAMS = eval-test eval-shell xml-value value-xml json-value
value-json TESTS = eval-test

Added: tuscany/sca-cpp/trunk/modules/scheme/json-value.cpp URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/scheme/json-value.cpp?rev=1044593&view=auto ============================================================================== --- tuscany/sca-cpp/trunk/modules/scheme/json-value.cpp (added) +++ tuscany/sca-cpp/trunk/modules/scheme/json-value.cpp Sat Dec 11 08:59:36 2010 @@ -0,0 +1,53 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +/* $Rev$ $Date$ */ + +/** + * Convert a JSON document to a scheme value. + */ + +#include "fstream.hpp" +#include "string.hpp" +#include "../json/json.hpp" +#include "element.hpp" +#include "eval.hpp" + +namespace tuscany { +namespace scheme { + +int jsonValue() { + const js::JSContext cx; + const failable<list<value> > lv = json::readJSON(streamList(cin), cx); + if (!hasContent(lv)) { + cerr << reason(lv); + return 1; + } + const value v = elementsToValues(content(lv)); + cout << writeValue(v); + return 0; +} + +} +} + +int main() { + return tuscany::scheme::jsonValue(); +} +

Added: tuscany/sca-cpp/trunk/modules/scheme/value-json.cpp URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/scheme/value-json.cpp?rev=1044593&view=auto ============================================================================== --- tuscany/sca-cpp/trunk/modules/scheme/value-json.cpp (added) +++ tuscany/sca-cpp/trunk/modules/scheme/value-json.cpp Sat Dec 11 08:59:36 2010 @@ -0,0 +1,52 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +/* $Rev$ $Date$ */ + +/** + * Convert a scheme value to a JSON document. + */ + +#include "fstream.hpp" +#include "string.hpp" +#include "../json/json.hpp" +#include "element.hpp" +#include "eval.hpp" + +namespace tuscany { +namespace scheme { + +int valueJSON() { + const js::JSContext cx; + failable<list<string> > s =
json::writeJSON(valuesToElements(readValue(cin)), cx); + if (!hasContent(s)) { + cerr << reason(s); + return 1; + } + write(content(s), cout); + return 0; +} + +} +} + +int main() { + return tuscany::scheme::valueJSON(); +} +

Added: tuscany/sca-cpp/trunk/modules/scheme/value-xml.cpp URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/scheme/value-xml.cpp?rev=1044593&view=auto ============================================================================== --- tuscany/sca-cpp/trunk/modules/scheme/value-xml.cpp (added) +++ tuscany/sca-cpp/trunk/modules/scheme/value-xml.cpp Sat Dec 11 08:59:36 2010 @@ -0,0 +1,51 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +/* $Rev$ $Date$ */ + +/** + * Convert a scheme value to an XML document. + */ + +#include "fstream.hpp" +#include "string.hpp" +#include "xml.hpp" +#include "element.hpp" +#include "eval.hpp" + +namespace tuscany { +namespace scheme { + +int valueXML() { + failable<list<string> > s = writeXML(valuesToElements(readValue(cin))); + if (!hasContent(s)) { + cerr << reason(s); + return 1; + } + write(content(s), cout); + return 0; +} + +} +} + +int main() { + return tuscany::scheme::valueXML(); +} +

Added: tuscany/sca-cpp/trunk/modules/scheme/xml-value.cpp URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/scheme/xml-value.cpp?rev=1044593&view=auto ============================================================================== --- tuscany/sca-cpp/trunk/modules/scheme/xml-value.cpp (added) +++ tuscany/sca-cpp/trunk/modules/scheme/xml-value.cpp Sat Dec 11 08:59:36 2010 @@ -0,0 +1,47 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +/* $Rev$ $Date$ */ + +/** + * Convert an XML document to a scheme value. + */ + +#include "fstream.hpp" +#include "string.hpp" +#include "xml.hpp" +#include "element.hpp" +#include "eval.hpp" + +namespace tuscany { +namespace scheme { + +int xmlValue() { + const value v = elementsToValues(readXML(streamList(cin))); + cout << writeValue(v); + return 0; +} + +} +} + +int main() { + return tuscany::scheme::xmlValue(); +} +