summaryrefslogtreecommitdiffstats
path: root/branches/sca-java-1.x
diff options
context:
space:
mode:
authorlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2009-05-12 22:31:24 +0000
committerlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2009-05-12 22:31:24 +0000
commit2df4afe6c40136c4d4728d7b363634aa9a3b09c9 (patch)
tree179fd2a8b1f5c154d2523b3c6d2521a301ae7f9d /branches/sca-java-1.x
parent61d422f2b296236ca5c160ab91d49bb82382197f (diff)
Renaming binding-http-new-jsonrpc* to binding-http-jsonrpc*
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@774117 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r--branches/sca-java-1.x/modules/binding-http-jsonrpc-runtime/LICENSE (renamed from branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/LICENSE)0
-rw-r--r--branches/sca-java-1.x/modules/binding-http-jsonrpc-runtime/NOTICE (renamed from branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/NOTICE)0
-rw-r--r--branches/sca-java-1.x/modules/binding-http-jsonrpc-runtime/pom.xml (renamed from branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/pom.xml)4
-rw-r--r--branches/sca-java-1.x/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/provider/JSONRPCOperationSelectorInterceptor.java (renamed from branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/provider/JSONRPCOperationSelectorInterceptor.java)0
-rw-r--r--branches/sca-java-1.x/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/provider/JSONRPCOperationSelectorProviderFactory.java (renamed from branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/provider/JSONRPCOperationSelectorProviderFactory.java)0
-rw-r--r--branches/sca-java-1.x/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/provider/JSONRPCOperationSelectorServiceProvider.java (renamed from branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/provider/JSONRPCOperationSelectorServiceProvider.java)0
-rw-r--r--branches/sca-java-1.x/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatInterceptor.java (renamed from branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatInterceptor.java)0
-rw-r--r--branches/sca-java-1.x/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatProviderFactory.java (renamed from branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatProviderFactory.java)0
-rw-r--r--branches/sca-java-1.x/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatReferenceProvider.java (renamed from branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatReferenceProvider.java)0
-rw-r--r--branches/sca-java-1.x/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatServiceProvider.java (renamed from branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatServiceProvider.java)0
-rw-r--r--branches/sca-java-1.x/modules/binding-http-jsonrpc-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.OperationSelectorProviderFactory (renamed from branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.OperationSelectorProviderFactory)0
-rw-r--r--branches/sca-java-1.x/modules/binding-http-jsonrpc-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.WireFormatProviderFactory (renamed from branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.WireFormatProviderFactory)0
-rw-r--r--branches/sca-java-1.x/modules/binding-http-jsonrpc/LICENSE (renamed from branches/sca-java-1.x/modules/binding-http-new-jsonrpc/LICENSE)0
-rw-r--r--branches/sca-java-1.x/modules/binding-http-jsonrpc/NOTICE (renamed from branches/sca-java-1.x/modules/binding-http-new-jsonrpc/NOTICE)0
-rw-r--r--branches/sca-java-1.x/modules/binding-http-jsonrpc/pom.xml (renamed from branches/sca-java-1.x/modules/binding-http-new-jsonrpc/pom.xml)4
-rw-r--r--branches/sca-java-1.x/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/JSONRPCOperationSelector.java (renamed from branches/sca-java-1.x/modules/binding-http-new-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/JSONRPCOperationSelector.java)0
-rw-r--r--branches/sca-java-1.x/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/JSONRPCOperationSelectorFactory.java (renamed from branches/sca-java-1.x/modules/binding-http-new-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/JSONRPCOperationSelectorFactory.java)0
-rw-r--r--branches/sca-java-1.x/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/impl/JSONRPCOperationSelectorFactoryImpl.java (renamed from branches/sca-java-1.x/modules/binding-http-new-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/impl/JSONRPCOperationSelectorFactoryImpl.java)0
-rw-r--r--branches/sca-java-1.x/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/impl/JSONRPCOperationSelectorImpl.java (renamed from branches/sca-java-1.x/modules/binding-http-new-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/impl/JSONRPCOperationSelectorImpl.java)0
-rw-r--r--branches/sca-java-1.x/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCWireFormat.java (renamed from branches/sca-java-1.x/modules/binding-http-new-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCWireFormat.java)0
-rw-r--r--branches/sca-java-1.x/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCWireFormatFactory.java (renamed from branches/sca-java-1.x/modules/binding-http-new-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCWireFormatFactory.java)0
-rw-r--r--branches/sca-java-1.x/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatFactoryImpl.java (renamed from branches/sca-java-1.x/modules/binding-http-new-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatFactoryImpl.java)0
-rw-r--r--branches/sca-java-1.x/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatImpl.java (renamed from branches/sca-java-1.x/modules/binding-http-new-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatImpl.java)0
-rw-r--r--branches/sca-java-1.x/modules/binding-http-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.operationselector.jsonrpc.JSONRPCOperationSelectorFactory (renamed from branches/sca-java-1.x/modules/binding-http-new-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.operationselector.jsonrpc.JSONRPCOperationSelectorFactory)0
-rw-r--r--branches/sca-java-1.x/modules/binding-http-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.wireformat.jsonrpc.JSONRPCWireFormatFactory (renamed from branches/sca-java-1.x/modules/binding-http-new-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.wireformat.jsonrpc.JSONRPCWireFormatFactory)0
-rw-r--r--branches/sca-java-1.x/modules/binding-http-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from branches/sca-java-1.x/modules/binding-http-new-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor)0
-rw-r--r--branches/sca-java-1.x/modules/binding-http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/impl/JSONRPCOperationSelectorProcessorTestCase.java (renamed from branches/sca-java-1.x/modules/binding-http-new-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/impl/JSONRPCOperationSelectorProcessorTestCase.java)0
-rw-r--r--branches/sca-java-1.x/modules/binding-http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatProcessorTestCase.java (renamed from branches/sca-java-1.x/modules/binding-http-new-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatProcessorTestCase.java)0
-rw-r--r--branches/sca-java-1.x/modules/pom.xml6
29 files changed, 6 insertions, 8 deletions
diff --git a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/LICENSE b/branches/sca-java-1.x/modules/binding-http-jsonrpc-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/LICENSE
+++ b/branches/sca-java-1.x/modules/binding-http-jsonrpc-runtime/LICENSE
diff --git a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/NOTICE b/branches/sca-java-1.x/modules/binding-http-jsonrpc-runtime/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/NOTICE
+++ b/branches/sca-java-1.x/modules/binding-http-jsonrpc-runtime/NOTICE
diff --git a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/pom.xml b/branches/sca-java-1.x/modules/binding-http-jsonrpc-runtime/pom.xml
index 7ee8d8bf1f..32dc4dc7dd 100644
--- a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/pom.xml
+++ b/branches/sca-java-1.x/modules/binding-http-jsonrpc-runtime/pom.xml
@@ -26,7 +26,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>tuscany-binding-http-new-jsonrpc-runtime</artifactId>
+ <artifactId>tuscany-binding-http-jsonrpc-runtime</artifactId>
<name>Apache Tuscany SCA HTTP Binding JSON-RPC Runtime</name>
<dependencies>
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-http-new-jsonrpc</artifactId>
+ <artifactId>tuscany-binding-http-jsonrpc</artifactId>
<version>1.6-SNAPSHOT</version>
</dependency>
diff --git a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/provider/JSONRPCOperationSelectorInterceptor.java b/branches/sca-java-1.x/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/provider/JSONRPCOperationSelectorInterceptor.java
index fb7c009aac..fb7c009aac 100644
--- a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/provider/JSONRPCOperationSelectorInterceptor.java
+++ b/branches/sca-java-1.x/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/provider/JSONRPCOperationSelectorInterceptor.java
diff --git a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/provider/JSONRPCOperationSelectorProviderFactory.java b/branches/sca-java-1.x/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/provider/JSONRPCOperationSelectorProviderFactory.java
index 4fcc933d1b..4fcc933d1b 100644
--- a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/provider/JSONRPCOperationSelectorProviderFactory.java
+++ b/branches/sca-java-1.x/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/provider/JSONRPCOperationSelectorProviderFactory.java
diff --git a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/provider/JSONRPCOperationSelectorServiceProvider.java b/branches/sca-java-1.x/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/provider/JSONRPCOperationSelectorServiceProvider.java
index d3591fe5f3..d3591fe5f3 100644
--- a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/provider/JSONRPCOperationSelectorServiceProvider.java
+++ b/branches/sca-java-1.x/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/provider/JSONRPCOperationSelectorServiceProvider.java
diff --git a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatInterceptor.java b/branches/sca-java-1.x/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatInterceptor.java
index c93aa38613..c93aa38613 100644
--- a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatInterceptor.java
+++ b/branches/sca-java-1.x/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatInterceptor.java
diff --git a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatProviderFactory.java b/branches/sca-java-1.x/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatProviderFactory.java
index 71ba4c913b..71ba4c913b 100644
--- a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatProviderFactory.java
+++ b/branches/sca-java-1.x/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatProviderFactory.java
diff --git a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatReferenceProvider.java b/branches/sca-java-1.x/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatReferenceProvider.java
index 5e1151dc95..5e1151dc95 100644
--- a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatReferenceProvider.java
+++ b/branches/sca-java-1.x/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatReferenceProvider.java
diff --git a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatServiceProvider.java b/branches/sca-java-1.x/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatServiceProvider.java
index a5d15f7f27..a5d15f7f27 100644
--- a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatServiceProvider.java
+++ b/branches/sca-java-1.x/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatServiceProvider.java
diff --git a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.OperationSelectorProviderFactory b/branches/sca-java-1.x/modules/binding-http-jsonrpc-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.OperationSelectorProviderFactory
index 61ee00271b..61ee00271b 100644
--- a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.OperationSelectorProviderFactory
+++ b/branches/sca-java-1.x/modules/binding-http-jsonrpc-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.OperationSelectorProviderFactory
diff --git a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.WireFormatProviderFactory b/branches/sca-java-1.x/modules/binding-http-jsonrpc-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.WireFormatProviderFactory
index 9b7d686ddd..9b7d686ddd 100644
--- a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.WireFormatProviderFactory
+++ b/branches/sca-java-1.x/modules/binding-http-jsonrpc-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.WireFormatProviderFactory
diff --git a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc/LICENSE b/branches/sca-java-1.x/modules/binding-http-jsonrpc/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc/LICENSE
+++ b/branches/sca-java-1.x/modules/binding-http-jsonrpc/LICENSE
diff --git a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc/NOTICE b/branches/sca-java-1.x/modules/binding-http-jsonrpc/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc/NOTICE
+++ b/branches/sca-java-1.x/modules/binding-http-jsonrpc/NOTICE
diff --git a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc/pom.xml b/branches/sca-java-1.x/modules/binding-http-jsonrpc/pom.xml
index bed0fd5eb9..ee0e8dfcf1 100644
--- a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc/pom.xml
+++ b/branches/sca-java-1.x/modules/binding-http-jsonrpc/pom.xml
@@ -26,7 +26,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>tuscany-binding-http-new-jsonrpc</artifactId>
+ <artifactId>tuscany-binding-http-jsonrpc</artifactId>
<name>Apache Tuscany SCA HTTP Binding JSON-RPC Model</name>
<dependencies>
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-http-new</artifactId>
+ <artifactId>tuscany-binding-http</artifactId>
<version>1.6-SNAPSHOT</version>
</dependency>
diff --git a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/JSONRPCOperationSelector.java b/branches/sca-java-1.x/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/JSONRPCOperationSelector.java
index 3a203312b2..3a203312b2 100644
--- a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/JSONRPCOperationSelector.java
+++ b/branches/sca-java-1.x/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/JSONRPCOperationSelector.java
diff --git a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/JSONRPCOperationSelectorFactory.java b/branches/sca-java-1.x/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/JSONRPCOperationSelectorFactory.java
index 89e9924c5f..89e9924c5f 100644
--- a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/JSONRPCOperationSelectorFactory.java
+++ b/branches/sca-java-1.x/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/JSONRPCOperationSelectorFactory.java
diff --git a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/impl/JSONRPCOperationSelectorFactoryImpl.java b/branches/sca-java-1.x/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/impl/JSONRPCOperationSelectorFactoryImpl.java
index 807de0302f..807de0302f 100644
--- a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/impl/JSONRPCOperationSelectorFactoryImpl.java
+++ b/branches/sca-java-1.x/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/impl/JSONRPCOperationSelectorFactoryImpl.java
diff --git a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/impl/JSONRPCOperationSelectorImpl.java b/branches/sca-java-1.x/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/impl/JSONRPCOperationSelectorImpl.java
index 475d4dc0a1..475d4dc0a1 100644
--- a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/impl/JSONRPCOperationSelectorImpl.java
+++ b/branches/sca-java-1.x/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/impl/JSONRPCOperationSelectorImpl.java
diff --git a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCWireFormat.java b/branches/sca-java-1.x/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCWireFormat.java
index 749119b215..749119b215 100644
--- a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCWireFormat.java
+++ b/branches/sca-java-1.x/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCWireFormat.java
diff --git a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCWireFormatFactory.java b/branches/sca-java-1.x/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCWireFormatFactory.java
index 2ae24142a4..2ae24142a4 100644
--- a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCWireFormatFactory.java
+++ b/branches/sca-java-1.x/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCWireFormatFactory.java
diff --git a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatFactoryImpl.java b/branches/sca-java-1.x/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatFactoryImpl.java
index 21705736b0..21705736b0 100644
--- a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatFactoryImpl.java
+++ b/branches/sca-java-1.x/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatFactoryImpl.java
diff --git a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatImpl.java b/branches/sca-java-1.x/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatImpl.java
index 2fdbfc3e52..2fdbfc3e52 100644
--- a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatImpl.java
+++ b/branches/sca-java-1.x/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatImpl.java
diff --git a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.operationselector.jsonrpc.JSONRPCOperationSelectorFactory b/branches/sca-java-1.x/modules/binding-http-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.operationselector.jsonrpc.JSONRPCOperationSelectorFactory
index 76203fbc11..76203fbc11 100644
--- a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.operationselector.jsonrpc.JSONRPCOperationSelectorFactory
+++ b/branches/sca-java-1.x/modules/binding-http-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.operationselector.jsonrpc.JSONRPCOperationSelectorFactory
diff --git a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.wireformat.jsonrpc.JSONRPCWireFormatFactory b/branches/sca-java-1.x/modules/binding-http-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.wireformat.jsonrpc.JSONRPCWireFormatFactory
index 3f72dd5a67..3f72dd5a67 100644
--- a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.wireformat.jsonrpc.JSONRPCWireFormatFactory
+++ b/branches/sca-java-1.x/modules/binding-http-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.wireformat.jsonrpc.JSONRPCWireFormatFactory
diff --git a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/branches/sca-java-1.x/modules/binding-http-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 17a340c06c..17a340c06c 100644
--- a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/branches/sca-java-1.x/modules/binding-http-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/impl/JSONRPCOperationSelectorProcessorTestCase.java b/branches/sca-java-1.x/modules/binding-http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/impl/JSONRPCOperationSelectorProcessorTestCase.java
index f86f580cf6..f86f580cf6 100644
--- a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/impl/JSONRPCOperationSelectorProcessorTestCase.java
+++ b/branches/sca-java-1.x/modules/binding-http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/impl/JSONRPCOperationSelectorProcessorTestCase.java
diff --git a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatProcessorTestCase.java b/branches/sca-java-1.x/modules/binding-http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatProcessorTestCase.java
index 8d08f2a450..8d08f2a450 100644
--- a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatProcessorTestCase.java
+++ b/branches/sca-java-1.x/modules/binding-http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatProcessorTestCase.java
diff --git a/branches/sca-java-1.x/modules/pom.xml b/branches/sca-java-1.x/modules/pom.xml
index e575a4ad99..497978a363 100644
--- a/branches/sca-java-1.x/modules/pom.xml
+++ b/branches/sca-java-1.x/modules/pom.xml
@@ -61,10 +61,8 @@
<module>binding-gdata-runtime</module>
<module>binding-http</module>
<module>binding-http-runtime</module>
- <module>binding-http-new</module>
- <module>binding-http-new-runtime</module>
- <module>binding-http-new-jsonrpc</module>
- <module>binding-http-new-jsonrpc-runtime</module>
+ <module>binding-http-jsonrpc</module>
+ <module>binding-http-jsonrpc-runtime</module>
<module>binding-jms</module>
<module>binding-jms-runtime</module>
<module>binding-jms-policy</module>