You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2009/05/02 03:59:47 UTC
svn commit: r770874 - in /tuscany/branches/sca-java-1.x/modules:
binding-http-oasis-jsonrpc-runtime/
binding-http-oasis-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/
binding-http-oasis-jsonrpc-runtime/sr...
Author: lresende
Date: Sat May 2 00:43:35 2009
New Revision: 770874
URL: http://svn.apache.org/viewvc?rev=770874&view=rev
Log:
TUSCANY-2968 - Changing binding to tuscany namespace and other small updates
Added:
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatInterceptor.java (contents, props changed)
- copied, changed from r770873, tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatServiceInterceptor.java
Removed:
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatServiceInterceptor.java
Modified:
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/pom.xml
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatReferenceProvider.java
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatServiceProvider.java
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCServiceTestCase.java
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite
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/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/impl/JSONRPCOperationSelectorProcessorTestCase.java
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
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-runtime/src/test/resources/test.composite
tuscany/branches/sca-java-1.x/modules/binding-http-oasis-runtime/src/test/resources/testCache.composite
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/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
tuscany/branches/sca-java-1.x/modules/binding-http-oasis/src/test/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessorTestCase.java
Modified: tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/pom.xml?rev=770874&r1=770873&r2=770874&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/pom.xml Sat May 2 00:43:35 2009
@@ -135,5 +135,4 @@
</plugin>
</plugins>
</build>
-
</project>
Copied: tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatInterceptor.java (from r770873, tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatServiceInterceptor.java)
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatInterceptor.java?p2=tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatInterceptor.java&p1=tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatServiceInterceptor.java&r1=770873&r2=770874&rev=770874&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatServiceInterceptor.java (original)
+++ tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatInterceptor.java Sat May 2 00:43:35 2009
@@ -23,7 +23,7 @@
import org.apache.tuscany.sca.invocation.Invoker;
import org.apache.tuscany.sca.invocation.Message;
-public class JSONRPCWireFormatServiceInterceptor implements Interceptor {
+public class JSONRPCWireFormatInterceptor implements Interceptor {
public Invoker getNext() {
// TODO Auto-generated method stub
Propchange: tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatInterceptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatInterceptor.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatReferenceProvider.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatReferenceProvider.java?rev=770874&r1=770873&r2=770874&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatReferenceProvider.java (original)
+++ tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatReferenceProvider.java Sat May 2 00:43:35 2009
@@ -23,6 +23,7 @@
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
import org.apache.tuscany.sca.interfacedef.InterfaceContract;
import org.apache.tuscany.sca.invocation.Interceptor;
+import org.apache.tuscany.sca.invocation.Phase;
import org.apache.tuscany.sca.provider.WireFormatProvider;
import org.apache.tuscany.sca.runtime.RuntimeComponent;
import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
@@ -40,18 +41,15 @@
}
public InterfaceContract configureWireFormatInterfaceContract(InterfaceContract interfaceContract) {
- // TODO Auto-generated method stub
return null;
}
public Interceptor createInterceptor() {
- // TODO Auto-generated method stub
return null;
}
public String getPhase() {
- // TODO Auto-generated method stub
- return null;
+ return Phase.REFERENCE_BINDING_WIREFORMAT;
}
}
Modified: tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatServiceProvider.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatServiceProvider.java?rev=770874&r1=770873&r2=770874&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatServiceProvider.java (original)
+++ tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatServiceProvider.java Sat May 2 00:43:35 2009
@@ -23,6 +23,7 @@
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
import org.apache.tuscany.sca.interfacedef.InterfaceContract;
import org.apache.tuscany.sca.invocation.Interceptor;
+import org.apache.tuscany.sca.invocation.Phase;
import org.apache.tuscany.sca.provider.WireFormatProvider;
import org.apache.tuscany.sca.runtime.RuntimeComponent;
import org.apache.tuscany.sca.runtime.RuntimeComponentService;
@@ -50,8 +51,7 @@
}
public String getPhase() {
- // TODO Auto-generated method stub
- return null;
+ return Phase.SERVICE_BINDING_WIREFORMAT;
}
}
Modified: tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCServiceTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCServiceTestCase.java?rev=770874&r1=770873&r2=770874&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCServiceTestCase.java (original)
+++ tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCServiceTestCase.java Sat May 2 00:43:35 2009
@@ -37,7 +37,7 @@
/**
* @version $Rev$ $Date$
*/
-public class JSONRPCServiceTestCase{
+public class JSONRPCServiceTestCase {
private static final String SERVICE_PATH = "/EchoService";
Modified: tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite?rev=770874&r1=770873&r2=770874&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite (original)
+++ tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite Sat May 2 00:43:35 2009
@@ -18,14 +18,16 @@
* under the License.
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
targetNamespace="http://jsonrpc"
xmlns:jsonrpc="http://jsonrpc"
name="JSONRPCBinding">
<service name="EchoService" promote="EchoComponent">
<interface.java interface="echo.Echo"/>
- <tuscany:binding.jsonrpc uri="http://localhost:8085/SCADomain/EchoService"/>
+ <binding.http uri="http://localhost:8085/SCADomain/EchoService">
+ <wireFormat.jsonrpc/>
+ <operationSelector.jsonrpc/>
+ </binding.http>
</service>
<component name="EchoComponent">
Modified: 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=770874&r1=770873&r2=770874&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (original)
+++ tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor Sat May 2 00:43:35 2009
@@ -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
Modified: tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/impl/JSONRPCOperationSelectorProcessorTestCase.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/operationselector/jsonrpc/impl/JSONRPCOperationSelectorProcessorTestCase.java?rev=770874&r1=770873&r2=770874&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/impl/JSONRPCOperationSelectorProcessorTestCase.java (original)
+++ tuscany/branches/sca-java-1.x/modules/binding-http-oasis-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/impl/JSONRPCOperationSelectorProcessorTestCase.java Sat May 2 00:43:35 2009
@@ -51,15 +51,15 @@
*/
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 @@
*/
@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);
Modified: 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=770874&r1=770873&r2=770874&view=diff
==============================================================================
--- 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 (original)
+++ 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 Sat May 2 00:43:35 2009
@@ -51,15 +51,15 @@
*/
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 @@
*/
@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);
Modified: tuscany/branches/sca-java-1.x/modules/binding-http-oasis-runtime/src/test/resources/test.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-http-oasis-runtime/src/test/resources/test.composite?rev=770874&r1=770873&r2=770874&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/binding-http-oasis-runtime/src/test/resources/test.composite (original)
+++ tuscany/branches/sca-java-1.x/modules/binding-http-oasis-runtime/src/test/resources/test.composite Sat May 2 00:43:35 2009
@@ -26,21 +26,21 @@
<component name="ResourceServiceComponent">
<tuscany:implementation.resource location="content"/>
<service name="Resource">
- <binding.http uri="http://localhost:8085/webcontent"/>
+ <tuscany:binding.http uri="http://localhost:8085/webcontent"/>
</service>
</component>
<component name="HTTPServiceComponent">
<implementation.java class="org.apache.tuscany.sca.binding.http.TestServiceImpl"/>
<service name="Servlet">
- <binding.http uri="http://localhost:8085/httpservice"/>
+ <tuscany:binding.http uri="http://localhost:8085/httpservice"/>
</service>
</component>
<component name="HTTPGetComponent">
<implementation.java class="org.apache.tuscany.sca.binding.http.TestGetImpl"/>
<service name="TestGetImpl">
- <binding.http uri="http://localhost:8085/httpget"/>
+ <tuscany:binding.http uri="http://localhost:8085/httpget"/>
</service>
</component>
Modified: tuscany/branches/sca-java-1.x/modules/binding-http-oasis-runtime/src/test/resources/testCache.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-http-oasis-runtime/src/test/resources/testCache.composite?rev=770874&r1=770873&r2=770874&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/binding-http-oasis-runtime/src/test/resources/testCache.composite (original)
+++ tuscany/branches/sca-java-1.x/modules/binding-http-oasis-runtime/src/test/resources/testCache.composite Sat May 2 00:43:35 2009
@@ -26,7 +26,7 @@
<component name="HTTPBindingComponent">
<implementation.java class="org.apache.tuscany.sca.binding.http.TestBindingCacheImpl"/>
<service name="TestBindingCacheImpl">
- <binding.http uri="http://localhost:8085/httpbinding"/>
+ <tuscany:binding.http uri="http://localhost:8085/httpbinding"/>
</service>
</component>
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=770874&r1=770873&r2=770874&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 Sat May 2 00:43:35 2009
@@ -48,7 +48,7 @@
public class HTTPBindingProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<HTTPBinding> {
private static final String BINDING_HTTP = "binding.http";
- private static final QName BINDING_HTTP_QNAME = new QName(Constants.SCA10_NS, BINDING_HTTP);
+ private static final QName BINDING_HTTP_QNAME = new QName(Constants.SCA10_TUSCANY_NS, BINDING_HTTP);
private static final String NAME = "name";
private static final String URI = "uri";
@@ -158,7 +158,7 @@
*/
private void error(String message, Object model, Object... messageParameters) {
if (monitor != null) {
- Problem problem = new ProblemImpl(this.getClass().getName(), "impl-bpel-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
+ Problem problem = new ProblemImpl(this.getClass().getName(), "binding-http-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
monitor.problem(problem);
}
}
Modified: tuscany/branches/sca-java-1.x/modules/binding-http-oasis/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/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=770874&r1=770873&r2=770874&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/binding-http-oasis/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (original)
+++ tuscany/branches/sca-java-1.x/modules/binding-http-oasis/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor Sat May 2 00:43:35 2009
@@ -16,4 +16,4 @@
# under the License.
# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.binding.http.xml.HTTPBindingProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#binding.http,model=org.apache.tuscany.sca.binding.http.HTTPBinding,factory=org.apache.tuscany.sca.binding.http.HTTPBindingFactory
+org.apache.tuscany.sca.binding.http.xml.HTTPBindingProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#binding.http,model=org.apache.tuscany.sca.binding.http.HTTPBinding,factory=org.apache.tuscany.sca.binding.http.HTTPBindingFactory
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=770874&r1=770873&r2=770874&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 Sat May 2 00:43:35 2009
@@ -46,7 +46,7 @@
* @version $Rev$ $Date$
*/
public class HTTPBindingProcessorTestCase {
- 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 final String XML = "<ns1:binding.http xmlns:ns1=\"http://tuscany.apache.org/xmlns/sca/1.0\" name=\"name\" uri=\"uri\" />";
private static XMLInputFactory inputFactory;
private static XMLOutputFactory outputFactory;