diff options
author | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2009-05-02 00:43:35 +0000 |
---|---|---|
committer | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2009-05-02 00:43:35 +0000 |
commit | 88389b44557c4465d011d9a7cd69421ed8857686 (patch) | |
tree | f728b3933ab65db8c3580b681e073f1af7d66337 /branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src | |
parent | 7dcc8f6ff21977553ea41d144429ffeb4ff19bd1 (diff) |
TUSCANY-2968 - Changing binding to tuscany namespace and other small updates
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@770874 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src')
3 files changed, 12 insertions, 12 deletions
diff --git a/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor index 60c504b4be..17a340c06c 100644 --- a/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor +++ b/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor @@ -16,5 +16,5 @@ # 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 -org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#operationSelector.jsonrpc,model=org.apache.tuscany.sca.binding.http.operationselector.jsonrpc.JSONRPCOperationSelector,factory=org.apache.tuscany.sca.binding.http.operationselector.jsonrpc.JSONRPCOperationSelectorFactory
\ No newline at end of file +org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor;qname=http://tuscany.apache.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 +org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#operationSelector.jsonrpc,model=org.apache.tuscany.sca.binding.http.operationselector.jsonrpc.JSONRPCOperationSelector,factory=org.apache.tuscany.sca.binding.http.operationselector.jsonrpc.JSONRPCOperationSelectorFactory
\ No newline at end of file diff --git a/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/impl/JSONRPCOperationSelectorProcessorTestCase.java b/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/impl/JSONRPCOperationSelectorProcessorTestCase.java index 14ea721546..f86f580cf6 100644 --- a/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/impl/JSONRPCOperationSelectorProcessorTestCase.java +++ b/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/impl/JSONRPCOperationSelectorProcessorTestCase.java @@ -51,15 +51,15 @@ import org.junit.Test; */ public class JSONRPCOperationSelectorProcessorTestCase { - public static final String WIRE_FORMAT = + public static final String COMPOSITE_WITH_OPERATION_SELECTOR = "<?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\" >" - + " <operationSelector.jsonrpc/>" - + " </binding.http>" + + " <tuscany:binding.http uri=\"http://localhost:8080/uri\" >" + + " <tuscany:operationSelector.jsonrpc/>" + + " </tuscany:binding.http>" + " </service>" + " </component>" + "</composite>"; @@ -92,7 +92,7 @@ public class JSONRPCOperationSelectorProcessorTestCase { */ @Test public void testWireFormat() throws Exception { - XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(WIRE_FORMAT)); + XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(COMPOSITE_WITH_OPERATION_SELECTOR)); Composite composite = (Composite)staxProcessor.read(reader); HTTPBinding binding = (HTTPBinding) composite.getComponents().get(0).getServices().get(0).getBindings().get(0); diff --git a/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatProcessorTestCase.java b/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatProcessorTestCase.java index 04719bf7b0..8d08f2a450 100644 --- a/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatProcessorTestCase.java +++ b/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatProcessorTestCase.java @@ -51,15 +51,15 @@ import org.junit.Test; */ public class JSONRPCWireFormatProcessorTestCase { - public static final String WIRE_FORMAT = + public static final String COMPOSITE_WITH_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>" + + " <tuscany:binding.http uri=\"http://localhost:8080/uri\" >" + + " <tuscany:wireFormat.jsonrpc/>" + + " </tuscany:binding.http>" + " </service>" + " </component>" + "</composite>"; @@ -93,7 +93,7 @@ public class JSONRPCWireFormatProcessorTestCase { */ @Test public void testWireFormat() throws Exception { - XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(WIRE_FORMAT)); + XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(COMPOSITE_WITH_WIRE_FORMAT)); Composite composite = (Composite)staxProcessor.read(reader); HTTPBinding binding = (HTTPBinding) composite.getComponents().get(0).getServices().get(0).getBindings().get(0); |