Author: lresende
Date: Thu Apr 23 04:04:06 2009
New Revision: 767780
URL: http://svn.apache.org/viewvc?rev=767780&view=rev
Log:
TUSCANY-2968 - Adding module to handle json-rpc wireformat and initial support
for it
Added:
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/LICENSE
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/NOTICE
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/pom.xml
(with props)
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/java/
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/java/org/
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/java/org/apache/
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/java/org/apache/tuscany/
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/java/org/apache/tuscany/sca/
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCWireFormat.java
- copied, changed from r767779,
tuscany/branches/sca-java-1.x/modules/binding-http-oasis/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCWireFormatFactory.java
- copied, changed from r767779,
tuscany/branches/sca-java-1.x/modules/binding-http-oasis/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatFactoryImpl.java
- copied, changed from r767779,
tuscany/branches/sca-java-1.x/modules/binding-http-oasis/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatImpl.java
- copied, changed from r767779,
tuscany/branches/sca-java-1.x/modules/binding-http-oasis/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/resources/
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/resources/META-INF/
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/resources/META-INF/services/
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.wireformat.jsonrpc.JSONRPCWireFormatFactory
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/test/
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/test/java/
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/test/java/org/
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/test/java/org/apache/
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/test/java/org/apache/tuscany/
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/test/java/org/apache/tuscany/sca/
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatProcessorTestCase.java
(with props)
Modified:
tuscany/branches/sca-java-1.x/modules/binding-http-oasis/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java
tuscany/branches/sca-java-1.x/modules/binding-http-oasis/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java
tuscany/branches/sca-java-1.x/modules/binding-http-oasis/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessor.java
tuscany/branches/sca-java-1.x/modules/binding-http-oasis/src/test/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessorTestCase.java
tuscany/branches/sca-java-1.x/modules/pom.xml
Added: tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/LICENSE
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/LICENSE?rev=767780&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/LICENSE
(added)
+++ tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/LICENSE
Thu Apr 23 04:04:06 2009
@@ -0,0 +1,205 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
+
+
+
Added: tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/NOTICE
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/NOTICE?rev=767780&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/NOTICE
(added)
+++ tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/NOTICE Thu
Apr 23 04:04:06 2009
@@ -0,0 +1,6 @@
+${pom.name}
+Copyright (c) 2005 - 2008 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
Added: tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/pom.xml?rev=767780&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/pom.xml
(added)
+++ tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/pom.xml
Thu Apr 23 04:04:06 2009
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-modules</artifactId>
+ <version>1.6-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>tuscany-binding-http-oasis-jsonrpc</artifactId>
+ <name>Apache Tuscany SCA HTTP Binding JSON-RPC Model</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-assembly</artifactId>
+ <version>1.6-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-assembly-xml</artifactId>
+ <version>1.6-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-http-oasis</artifactId>
+ <version>1.6-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-java-runtime</artifactId>
+ <version>1.6-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.5</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+
+ <configuration>
+ <instructions>
+ <Bundle-Version>${tuscany.version}</Bundle-Version>
+
<Bundle-SymbolicName>org.apache.tuscany.sca.binding.http.wireformat.jsonrpc</Bundle-SymbolicName>
+ <Bundle-Description>${pom.name}</Bundle-Description>
+
<Export-Package>org.apache.tuscany.sca.binding.http.wireformat.jsonrpc</Export-Package>
+
<Import-Package>org.apache.tuscany.sca.assembly.xml;version="1.4",
*</Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange:
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied:
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCWireFormat.java
(from r767779,
tuscany/branches/sca-java-1.x/modules/binding-http-oasis/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java)
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCWireFormat.java?p2=tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCWireFormat.java&p1=tuscany/branches/sca-java-1.x/modules/binding-http-oasis/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java&r1=767779&r2=767780&rev=767780&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/binding-http-oasis/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCWireFormat.java
Thu Apr 23 04:04:06 2009
@@ -17,16 +17,19 @@
* under the License.
*/
-package org.apache.tuscany.sca.binding.http;
+package org.apache.tuscany.sca.binding.http.wireformat.jsonrpc;
-import org.apache.tuscany.sca.assembly.Binding;
+import javax.xml.namespace.QName;
+import org.apache.tuscany.sca.assembly.WireFormat;
+import org.apache.tuscany.sca.assembly.xml.Constants;
/**
- * HTTP binding model.
- *
- * @version $Rev$ $Date$
+*
+* @version $Rev$ $Date$
*/
-public interface HTTPBinding extends Binding {
-
+public interface JSONRPCWireFormat extends WireFormat {
+ public static final QName WIRE_FORMAT_HTTP_JSONRPC_QNAME = new
QName(Constants.SCA10_NS, "wireFormat.jsonrpc");
+
+ QName getSchemaName();
}
Copied:
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCWireFormatFactory.java
(from r767779,
tuscany/branches/sca-java-1.x/modules/binding-http-oasis/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java)
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCWireFormatFactory.java?p2=tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCWireFormatFactory.java&p1=tuscany/branches/sca-java-1.x/modules/binding-http-oasis/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java&r1=767779&r2=767780&rev=767780&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/binding-http-oasis/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCWireFormatFactory.java
Thu Apr 23 04:04:06 2009
@@ -17,16 +17,17 @@
* under the License.
*/
-package org.apache.tuscany.sca.binding.http;
-
-import org.apache.tuscany.sca.assembly.Binding;
-
+package org.apache.tuscany.sca.binding.http.wireformat.jsonrpc;
/**
- * HTTP binding model.
- *
+ *
* @version $Rev$ $Date$
-*/
-public interface HTTPBinding extends Binding {
-
+ */
+public interface JSONRPCWireFormatFactory {
+
+ /**
+ * Create a new JSONRPC Wire Format
+ * @return
+ */
+ JSONRPCWireFormat createJSONRPCWireFormat();
}
Copied:
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatFactoryImpl.java
(from r767779,
tuscany/branches/sca-java-1.x/modules/binding-http-oasis/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java)
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatFactoryImpl.java?p2=tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatFactoryImpl.java&p1=tuscany/branches/sca-java-1.x/modules/binding-http-oasis/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java&r1=767779&r2=767780&rev=767780&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/binding-http-oasis/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatFactoryImpl.java
Thu Apr 23 04:04:06 2009
@@ -17,16 +17,20 @@
* under the License.
*/
-package org.apache.tuscany.sca.binding.http;
+package org.apache.tuscany.sca.binding.http.wireformat.jsonrpc.impl;
-import org.apache.tuscany.sca.assembly.Binding;
+import
org.apache.tuscany.sca.binding.http.wireformat.jsonrpc.JSONRPCWireFormat;
+import
org.apache.tuscany.sca.binding.http.wireformat.jsonrpc.JSONRPCWireFormatFactory;
/**
- * HTTP binding model.
- *
- * @version $Rev$ $Date$
+*
+* @version $Rev$ $Date$
*/
-public interface HTTPBinding extends Binding {
-
+public class JSONRPCWireFormatFactoryImpl implements JSONRPCWireFormatFactory {
+
+ public JSONRPCWireFormat createJSONRPCWireFormat() {
+ return new JSONRPCWireFormatImpl();
+ }
+
}
Copied:
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatImpl.java
(from r767779,
tuscany/branches/sca-java-1.x/modules/binding-http-oasis/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java)
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatImpl.java?p2=tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatImpl.java&p1=tuscany/branches/sca-java-1.x/modules/binding-http-oasis/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java&r1=767779&r2=767780&rev=767780&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/binding-http-oasis/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatImpl.java
Thu Apr 23 04:04:06 2009
@@ -17,16 +17,28 @@
* under the License.
*/
-package org.apache.tuscany.sca.binding.http;
+package org.apache.tuscany.sca.binding.http.wireformat.jsonrpc.impl;
-import org.apache.tuscany.sca.assembly.Binding;
+import javax.xml.namespace.QName;
+import
org.apache.tuscany.sca.binding.http.wireformat.jsonrpc.JSONRPCWireFormat;
/**
- * HTTP binding model.
- *
- * @version $Rev$ $Date$
+*
+* @version $Rev$ $Date$
*/
-public interface HTTPBinding extends Binding {
+public class JSONRPCWireFormatImpl implements JSONRPCWireFormat {
+ public QName getSchemaName() {
+ return WIRE_FORMAT_HTTP_JSONRPC_QNAME;
+ }
+
+ public boolean isUnresolved() {
+ return false;
+ }
+
+ public void setUnresolved(boolean unresolved) {
+
+ }
+
}
Added:
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.wireformat.jsonrpc.JSONRPCWireFormatFactory
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.wireformat.jsonrpc.JSONRPCWireFormatFactory?rev=767780&view=auto
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.wireformat.jsonrpc.JSONRPCWireFormatFactory
(added)
+++
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.wireformat.jsonrpc.JSONRPCWireFormatFactory
Thu Apr 23 04:04:06 2009
@@ -0,0 +1,19 @@
+# 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.
+
+# Implementation class for model factory
+org.apache.tuscany.sca.binding.http.wireformat.jsonrpc.impl.JSONRPCWireFormatFactoryImpl
Added:
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=767780&view=auto
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
(added)
+++
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
Thu Apr 23 04:04:06 2009
@@ -0,0 +1,19 @@
+# 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.
+
+# Implementation class for the artifact processor extension
+org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#wireFormat.jsonrpc,model=org.apache.tuscany.sca.binding.http.wireformat.jsonrpc.JSONRPCWireFormat,factory=org.apache.tuscany.sca.binding.http.wireformat.jsonrpc.JSONRPCWireFormatFactory
\ No newline at end of file
Added:
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatProcessorTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatProcessorTestCase.java?rev=767780&view=auto
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatProcessorTestCase.java
(added)
+++
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatProcessorTestCase.java
Thu Apr 23 04:04:06 2009
@@ -0,0 +1,102 @@
+/*
+ * 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.
+ */
+
+package org.apache.tuscany.sca.binding.http.wireformat.jsonrpc.impl;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.io.StringReader;
+
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.tuscany.sca.assembly.Composite;
+import org.apache.tuscany.sca.assembly.WireFormat;
+import org.apache.tuscany.sca.binding.http.HTTPBinding;
+import
org.apache.tuscany.sca.binding.http.wireformat.jsonrpc.JSONRPCWireFormat;
+import
org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
+import
org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
+import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
+import
org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
+import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
+import org.apache.tuscany.sca.core.UtilityExtensionPoint;
+import org.apache.tuscany.sca.monitor.Monitor;
+import org.apache.tuscany.sca.monitor.MonitorFactory;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorFactoryImpl;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class JSONRPCWireFormatProcessorTestCase {
+
+ public static final String WIRE_FORMAT =
+ "<?xml version=\"1.0\" encoding=\"ASCII\"?>"
+ + "<composite xmlns=\"http://www.osoa.org/xmlns/sca/1.0\";
targetNamespace=\"http://binding-http\";
xmlns:tuscany=\"http://tuscany.apache.org/xmlns/sca/1.0\";
name=\"binding-http\">"
+ + " <component name=\"HelloWorldComponent\">"
+ + " <implementation.java class=\"services.HelloWorld\"/>"
+ + " <service name=\"HelloWorldService\">"
+ + " <binding.http uri=\"http://localhost:8080/uri\"; >"
+ + " <wireFormat.jsonrpc/>"
+ + " </binding.http>"
+ + " </service>"
+ + " </component>"
+ + "</composite>";
+
+ private static XMLInputFactory inputFactory;
+ private static StAXArtifactProcessor<Object> staxProcessor;
+ private static Monitor monitor;
+
+ @BeforeClass
+ public static void setUp() throws Exception {
+ DefaultExtensionPointRegistry extensionPoints = new
DefaultExtensionPointRegistry();
+ inputFactory = XMLInputFactory.newInstance();
+ // Create a monitor
+ UtilityExtensionPoint utilities =
extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
+ MonitorFactory monitorFactory = new DefaultMonitorFactoryImpl();
+ if (monitorFactory != null) {
+ monitor = monitorFactory.createMonitor();
+ utilities.addUtility(monitorFactory);
+ }
+ StAXArtifactProcessorExtensionPoint staxProcessors = new
DefaultStAXArtifactProcessorExtensionPoint(extensionPoints);
+ staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors,
inputFactory, null, monitor);
+
+ }
+
+ /**
+ * Tests the APIs:
+ * public WireFormat getRequstWireFormat();
+ * public WireFormat getResponseWireFormat();
+ *
+ * @throws Exception
+ */
+ @Test
+ public void testWireFormat() throws Exception {
+ XMLStreamReader reader = inputFactory.createXMLStreamReader(new
StringReader(WIRE_FORMAT));
+
+ Composite composite = (Composite)staxProcessor.read(reader);
+ HTTPBinding binding = (HTTPBinding)
composite.getComponents().get(0).getServices().get(0).getBindings().get(0);
+ assertNotNull(binding);
+
+ WireFormat requestWireFormat = binding.getRequestWireFormat();
+ assertEquals(JSONRPCWireFormat.class,
requestWireFormat.getClass().getInterfaces()[0]);
+
+ WireFormat responseWireFormat = binding.getResponseWireFormat();
+ assertEquals(JSONRPCWireFormat.class,
responseWireFormat.getClass().getInterfaces()[0]);
+ }
+}
Propchange:
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatProcessorTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatProcessorTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
tuscany/branches/sca-java-1.x/modules/binding-http-oasis/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-http-oasis/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java?rev=767780&r1=767779&r2=767780&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/binding-http-oasis/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/binding-http-oasis/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java
Thu Apr 23 04:04:06 2009
@@ -19,7 +19,7 @@
package org.apache.tuscany.sca.binding.http;
-import org.apache.tuscany.sca.assembly.Binding;
+import org.apache.tuscany.sca.assembly.BindingRRB;
/**
@@ -27,6 +27,6 @@
*
* @version $Rev$ $Date$
*/
-public interface HTTPBinding extends Binding {
+public interface HTTPBinding extends BindingRRB {
}
Modified:
tuscany/branches/sca-java-1.x/modules/binding-http-oasis/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-http-oasis/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java?rev=767780&r1=767779&r2=767780&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/binding-http-oasis/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/binding-http-oasis/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java
Thu Apr 23 04:04:06 2009
@@ -22,6 +22,8 @@
import java.util.ArrayList;
import java.util.List;
+import org.apache.tuscany.sca.assembly.OperationSelector;
+import org.apache.tuscany.sca.assembly.WireFormat;
import org.apache.tuscany.sca.binding.http.HTTPBinding;
import org.apache.tuscany.sca.policy.Intent;
import org.apache.tuscany.sca.policy.IntentAttachPointType;
@@ -39,12 +41,14 @@
private String name;
private String uri;
+ private WireFormat wireFormat;
+ private OperationSelector operationSelector;
+
private List<Intent> requiredIntents = new ArrayList<Intent>();
private List<PolicySet> policySets = new ArrayList<PolicySet>();
private IntentAttachPointType intentAttachPointType;
private List<PolicySet> applicablePolicySets = new ArrayList<PolicySet>();
-
public String getName() {
return name;
}
@@ -60,8 +64,7 @@
public void setURI(String uri) {
this.uri = uri;
}
-
-
+
public boolean isUnresolved() {
return false;
}
@@ -70,6 +73,32 @@
// The sample binding is always resolved
}
+ // Wireformat and Operation selection
+
+ public WireFormat getRequestWireFormat() {
+ return wireFormat;
+ }
+
+ public void setRequestWireFormat(WireFormat wireFormat) {
+ this.wireFormat = wireFormat;
+ }
+
+ public WireFormat getResponseWireFormat() {
+ return wireFormat;
+ }
+
+ public void setResponseWireFormat(WireFormat wireFormat) {
+ this.wireFormat = wireFormat;
+ }
+
+ public OperationSelector getOperationSelector() {
+ return operationSelector;
+ }
+
+ public void setOperationSelector(OperationSelector operationSelector) {
+ this.operationSelector = operationSelector;
+ }
+
//Policy related getters/setters
public List<PolicySet> getPolicySets() {
Modified:
tuscany/branches/sca-java-1.x/modules/binding-http-oasis/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-http-oasis/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessor.java?rev=767780&r1=767779&r2=767780&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/binding-http-oasis/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessor.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/binding-http-oasis/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessor.java
Thu Apr 23 04:04:06 2009
@@ -19,11 +19,16 @@
package org.apache.tuscany.sca.binding.http.xml;
+import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
+import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
+
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
+import org.apache.tuscany.sca.assembly.OperationSelector;
+import org.apache.tuscany.sca.assembly.WireFormat;
import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl;
import org.apache.tuscany.sca.assembly.xml.Constants;
import org.apache.tuscany.sca.binding.http.HTTPBinding;
@@ -31,10 +36,12 @@
import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
+import org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessor;
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
import org.apache.tuscany.sca.contribution.service.ContributionReadException;
import
org.apache.tuscany.sca.contribution.service.ContributionResolveException;
import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
import org.apache.tuscany.sca.monitor.Problem.Severity;
@@ -47,10 +54,18 @@
private static final String URI = "uri";
private HTTPBindingFactory httpBindingFactory;
+ private StAXArtifactProcessor<Object> extensionProcessor;
+ private StAXAttributeProcessor<Object> extensionAttributeProcessor;
private Monitor monitor;
- public HTTPBindingProcessor(ModelFactoryExtensionPoint modelFactories,
Monitor monitor) {
+ public HTTPBindingProcessor(ExtensionPointRegistry extensionPoints,
+ StAXArtifactProcessor extensionProcessor,
+ StAXAttributeProcessor
extensionAttributeProcessor,
+ Monitor monitor) {
+ ModelFactoryExtensionPoint modelFactories =
extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
this.httpBindingFactory =
modelFactories.getFactory(HTTPBindingFactory.class);
+ this.extensionProcessor =
(StAXArtifactProcessor<Object>)extensionProcessor;
+ this.extensionAttributeProcessor = extensionAttributeProcessor;
this.monitor = monitor;
}
@@ -64,22 +79,55 @@
public HTTPBinding read(XMLStreamReader reader) throws
ContributionReadException, XMLStreamException {
HTTPBinding httpBinding = httpBindingFactory.createHTTPBinding();
-
- String name = getString(reader, NAME);
- if(name != null) {
- httpBinding.setName(name);
- }
- String uri = getString(reader, URI);
- if (uri != null) {
- httpBinding.setURI(uri);
+ while(reader.hasNext()) {
+ QName elementName = null;
+ int event = reader.getEventType();
+ switch (event) {
+ case START_ELEMENT:
+ elementName = reader.getName();
+
+ if (BINDING_HTTP_QNAME.equals(elementName)) {
+ String name = getString(reader, NAME);
+ if(name != null) {
+ httpBinding.setName(name);
+ }
+
+ String uri = getString(reader, URI);
+ if (uri != null) {
+ httpBinding.setURI(uri);
+ }
+ } else {
+ // Read an extension element
+ Object extension = extensionProcessor.read(reader);
+ if (extension != null) {
+ if (extension instanceof WireFormat) {
+
httpBinding.setRequestWireFormat((WireFormat)extension);
+ } else if(extension instanceof OperationSelector)
{
+
httpBinding.setOperationSelector((OperationSelector)extension);
+ }
+ }
+ }
+
+ }
+
+ if (event == END_ELEMENT &&
BINDING_HTTP_QNAME.equals(reader.getName())) {
+ break;
+ }
+
+ // Read the next element
+ if (reader.hasNext()) {
+ reader.next();
+ }
}
return httpBinding;
}
public void write(HTTPBinding httpBinding, XMLStreamWriter writer) throws
ContributionWriteException, XMLStreamException {
- writer.writeStartElement(Constants.SCA10_NS, BINDING_HTTP);
+ //writer.writeStartElement(Constants.SCA10_NS, BINDING_HTTP);
+
+ writeStart(writer, BINDING_HTTP_QNAME.getNamespaceURI(),
BINDING_HTTP_QNAME.getLocalPart());
// Write binding name
if (httpBinding.getName() != null) {
@@ -91,7 +139,8 @@
writer.writeAttribute(URI, httpBinding.getURI());
}
- writer.writeEndElement();
+ writeEnd(writer);
+ //writer.writeEndElement();
}
Modified:
tuscany/branches/sca-java-1.x/modules/binding-http-oasis/src/test/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessorTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-http-oasis/src/test/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessorTestCase.java?rev=767780&r1=767779&r2=767780&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/binding-http-oasis/src/test/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessorTestCase.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/binding-http-oasis/src/test/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessorTestCase.java
Thu Apr 23 04:04:06 2009
@@ -31,7 +31,8 @@
import javax.xml.stream.XMLStreamWriter;
import org.apache.tuscany.sca.binding.http.HTTPBinding;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
+import
org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
+import
org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
import org.apache.tuscany.sca.core.UtilityExtensionPoint;
import org.apache.tuscany.sca.monitor.Monitor;
@@ -45,20 +46,22 @@
* @version $Rev$ $Date$
*/
public class HTTPBindingProcessorTestCase {
-
- private static final String XML = "<binding.http name=\"name\" uri=\"uri\"
/>";
+ private static final String XML = "<binding.http
xmlns=\"http://www.osoa.org/xmlns/sca/1.0\";
xmlns:ns1=\"http://www.osoa.org/xmlns/sca/1.0\"; name=\"name\" uri=\"uri\" />";
private static XMLInputFactory inputFactory;
private static XMLOutputFactory outputFactory;
private static Monitor monitor;
+ private static ExtensibleStAXArtifactProcessor staxProcessor;
private static HTTPBindingProcessor httpBindingProcessor;
@BeforeClass
public static void setUp() throws Exception {
inputFactory = XMLInputFactory.newInstance();
+
outputFactory = XMLOutputFactory.newInstance();
+ outputFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES,
Boolean.TRUE);
DefaultExtensionPointRegistry extensionPoints = new
DefaultExtensionPointRegistry();
// Create a monitor
@@ -69,8 +72,10 @@
utilities.addUtility(monitorFactory);
}
- ModelFactoryExtensionPoint modelFactories =
extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
- httpBindingProcessor = new HTTPBindingProcessor(modelFactories,
monitor);
+ StAXArtifactProcessorExtensionPoint staxProcessors =
extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
+ staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors,
inputFactory, XMLOutputFactory.newInstance(), null);
+
+ httpBindingProcessor = new HTTPBindingProcessor(extensionPoints,
staxProcessor, null, monitor);
}
@@ -96,8 +101,8 @@
writer.writeEndDocument();
// used for debug comparison
- // System.out.println(XML);
- // System.out.println(bos.toString());
+ System.out.println(XML);
+ System.out.println(bos.toString());
assertEquals(XML, bos.toString());
}
Modified: tuscany/branches/sca-java-1.x/modules/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/pom.xml?rev=767780&r1=767779&r2=767780&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/modules/pom.xml Thu Apr 23 04:04:06 2009
@@ -62,6 +62,7 @@
<module>binding-http</module>
<module>binding-http-runtime</module>
<module>binding-http-oasis</module>
+ <module>binding-http-oasis-jsonrpc</module>
<module>binding-http-oasis-runtime</module>
<module>binding-jms</module>
<module>binding-jms-runtime</module>
