Refactoring javascript extension points packages to follow the same naming pattern used by it's modules.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@761842 13f79535-47bb-0310-9956-ffa450edef68

29 files changed, 31 insertions, 31 deletions

diff --git a/branches/sca-java-1.x/modules/binding-atom-js-dojo/src/main/java/org/apache/tuscany/sca/binding/atom/js/dojo/AtomBindingJavascriptProxyFactoryImpl.java b/branches/sca-java-1.x/modules/binding-atom-js-dojo/src/main/java/org/apache/tuscany/sca/binding/atom/js/dojo/AtomBindingJavascriptProxyFactoryImpl.java
index 1242eef49c..050ef91767 100644
--- a/branches/sca-java-1.x/modules/binding-atom-js-dojo/src/main/java/org/apache/tuscany/sca/binding/atom/js/dojo/AtomBindingJavascriptProxyFactoryImpl.java
+++ b/branches/sca-java-1.x/modules/binding-atom-js-dojo/src/main/java/org/apache/tuscany/sca/binding/atom/js/dojo/AtomBindingJavascriptProxyFactoryImpl.java
@@ -28,7 +28,7 @@ import javax.xml.namespace.QName;
 import org.apache.tuscany.sca.assembly.Binding;
 import org.apache.tuscany.sca.assembly.ComponentReference;
 import org.apache.tuscany.sca.binding.atom.AtomBinding;
-import org.apache.tuscany.sca.core.web.JavascriptProxyFactory;
+import org.apache.tuscany.sca.web.javascript.JavascriptProxyFactory;
 
 public class AtomBindingJavascriptProxyFactoryImpl implements JavascriptProxyFactory {
     private static final QName NAME = new QName("http://tuscany.apache.org/xmlns/sca/1.0", "binding.atom");
diff --git a/branches/sca-java-1.x/modules/binding-atom-js-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.web.JavascriptProxyFactory b/branches/sca-java-1.x/modules/binding-atom-js-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.JavascriptProxyFactory
index 80a63e76ee..80a63e76ee 100644
--- a/branches/sca-java-1.x/modules/binding-atom-js-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.web.JavascriptProxyFactory
+++ b/branches/sca-java-1.x/modules/binding-atom-js-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.JavascriptProxyFactory
diff --git a/branches/sca-java-1.x/modules/binding-atom-js/src/main/java/org/apache/tuscany/sca/binding/atom/js/AtomBindingJavascriptProxyFactoryImpl.java b/branches/sca-java-1.x/modules/binding-atom-js/src/main/java/org/apache/tuscany/sca/binding/atom/js/AtomBindingJavascriptProxyFactoryImpl.java
index 6b0170d2ce..6e2ce1895a 100644
--- a/branches/sca-java-1.x/modules/binding-atom-js/src/main/java/org/apache/tuscany/sca/binding/atom/js/AtomBindingJavascriptProxyFactoryImpl.java
+++ b/branches/sca-java-1.x/modules/binding-atom-js/src/main/java/org/apache/tuscany/sca/binding/atom/js/AtomBindingJavascriptProxyFactoryImpl.java
@@ -28,7 +28,7 @@ import javax.xml.namespace.QName;
 import org.apache.tuscany.sca.assembly.Binding;
 import org.apache.tuscany.sca.assembly.ComponentReference;
 import org.apache.tuscany.sca.binding.atom.AtomBinding;
-import org.apache.tuscany.sca.core.web.JavascriptProxyFactory;
+import org.apache.tuscany.sca.web.javascript.JavascriptProxyFactory;
 
 public class AtomBindingJavascriptProxyFactoryImpl implements JavascriptProxyFactory {
     private static final QName NAME = new QName("http://tuscany.apache.org/xmlns/sca/1.0", "binding.atom");
diff --git a/branches/sca-java-1.x/modules/binding-atom-js/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.web.JavascriptProxyFactory b/branches/sca-java-1.x/modules/binding-atom-js/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.JavascriptProxyFactory
index 5ee927e586..5ee927e586 100644
--- a/branches/sca-java-1.x/modules/binding-atom-js/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.web.JavascriptProxyFactory
+++ b/branches/sca-java-1.x/modules/binding-atom-js/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.JavascriptProxyFactory
diff --git a/branches/sca-java-1.x/modules/binding-jsonrpc-js-dojo/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/js/dojo/JSONRPCBindingJavascriptProxyFactoryImpl.java b/branches/sca-java-1.x/modules/binding-jsonrpc-js-dojo/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/js/dojo/JSONRPCBindingJavascriptProxyFactoryImpl.java
index 8b048f5532..4fe32cff6d 100644
--- a/branches/sca-java-1.x/modules/binding-jsonrpc-js-dojo/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/js/dojo/JSONRPCBindingJavascriptProxyFactoryImpl.java
+++ b/branches/sca-java-1.x/modules/binding-jsonrpc-js-dojo/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/js/dojo/JSONRPCBindingJavascriptProxyFactoryImpl.java
@@ -28,7 +28,7 @@ import javax.xml.namespace.QName;
 import org.apache.tuscany.sca.assembly.Binding;
 import org.apache.tuscany.sca.assembly.ComponentReference;
 import org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBinding;
-import org.apache.tuscany.sca.core.web.JavascriptProxyFactory;
+import org.apache.tuscany.sca.web.javascript.JavascriptProxyFactory;
 
 public class JSONRPCBindingJavascriptProxyFactoryImpl implements JavascriptProxyFactory {
     private static final QName NAME = new QName("http://tuscany.apache.org/xmlns/sca/1.0", "binding.jsonrpc");
diff --git a/branches/sca-java-1.x/modules/binding-jsonrpc-js-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.web.JavascriptProxyFactory b/branches/sca-java-1.x/modules/binding-jsonrpc-js-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.JavascriptProxyFactory
index 90a9e0a9d8..90a9e0a9d8 100644
--- a/branches/sca-java-1.x/modules/binding-jsonrpc-js-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.web.JavascriptProxyFactory
+++ b/branches/sca-java-1.x/modules/binding-jsonrpc-js-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.JavascriptProxyFactory
diff --git a/branches/sca-java-1.x/modules/binding-jsonrpc-js/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/js/JSONRPCBindingJavascriptProxyFactoryImpl.java b/branches/sca-java-1.x/modules/binding-jsonrpc-js/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/js/JSONRPCBindingJavascriptProxyFactoryImpl.java
index a396fe3bbf..b0fd4d9556 100644
--- a/branches/sca-java-1.x/modules/binding-jsonrpc-js/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/js/JSONRPCBindingJavascriptProxyFactoryImpl.java
+++ b/branches/sca-java-1.x/modules/binding-jsonrpc-js/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/js/JSONRPCBindingJavascriptProxyFactoryImpl.java
@@ -28,7 +28,7 @@ import javax.xml.namespace.QName;
 import org.apache.tuscany.sca.assembly.Binding;
 import org.apache.tuscany.sca.assembly.ComponentReference;
 import org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBinding;
-import org.apache.tuscany.sca.core.web.JavascriptProxyFactory;
+import org.apache.tuscany.sca.web.javascript.JavascriptProxyFactory;
 
 public class JSONRPCBindingJavascriptProxyFactoryImpl implements JavascriptProxyFactory {
     private static final QName NAME = new QName("http://tuscany.apache.org/xmlns/sca/1.0", "binding.jsonrpc");
diff --git a/branches/sca-java-1.x/modules/binding-jsonrpc-js/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.web.JavascriptProxyFactory b/branches/sca-java-1.x/modules/binding-jsonrpc-js/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.JavascriptProxyFactory
index 812afe568a..812afe568a 100644
--- a/branches/sca-java-1.x/modules/binding-jsonrpc-js/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.web.JavascriptProxyFactory
+++ b/branches/sca-java-1.x/modules/binding-jsonrpc-js/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.JavascriptProxyFactory
diff --git a/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/src/main/java/org/apache/tuscany/sca/implementation/widget/dojo/DojoJavaScriptComponentGeneratorImpl.java b/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/src/main/java/org/apache/tuscany/sca/implementation/widget/dojo/DojoJavaScriptComponentGeneratorImpl.java
index 275794e8e8..e89fd2c0e7 100644
--- a/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/src/main/java/org/apache/tuscany/sca/implementation/widget/dojo/DojoJavaScriptComponentGeneratorImpl.java
+++ b/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/src/main/java/org/apache/tuscany/sca/implementation/widget/dojo/DojoJavaScriptComponentGeneratorImpl.java
@@ -31,10 +31,10 @@ import org.apache.tuscany.sca.assembly.Binding;
 import org.apache.tuscany.sca.assembly.ComponentProperty;
 import org.apache.tuscany.sca.assembly.ComponentReference;
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.web.ComponentJavaScriptGenerator;
-import org.apache.tuscany.sca.core.web.JavascriptProxyFactory;
-import org.apache.tuscany.sca.core.web.JavascriptProxyFactoryExtensionPoint;
 import org.apache.tuscany.sca.runtime.RuntimeComponent;
+import org.apache.tuscany.sca.web.javascript.ComponentJavaScriptGenerator;
+import org.apache.tuscany.sca.web.javascript.JavascriptProxyFactory;
+import org.apache.tuscany.sca.web.javascript.JavascriptProxyFactoryExtensionPoint;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
diff --git a/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.web.ComponentJavaScriptGenerator b/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.ComponentJavaScriptGenerator
index 3f503c24ee..3f503c24ee 100644
--- a/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.web.ComponentJavaScriptGenerator
+++ b/branches/sca-java-1.x/modules/implementation-widget-runtime-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.ComponentJavaScriptGenerator
diff --git a/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/main/java/org/apache/tuscany/sca/implementation/widget/tuscany/TuscanyJavaScriptComponentGeneratorImpl.java b/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/main/java/org/apache/tuscany/sca/implementation/widget/tuscany/TuscanyJavaScriptComponentGeneratorImpl.java
index c6ecfd3620..56ba596fca 100644
--- a/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/main/java/org/apache/tuscany/sca/implementation/widget/tuscany/TuscanyJavaScriptComponentGeneratorImpl.java
+++ b/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/main/java/org/apache/tuscany/sca/implementation/widget/tuscany/TuscanyJavaScriptComponentGeneratorImpl.java
@@ -31,10 +31,10 @@ import org.apache.tuscany.sca.assembly.Binding;
 import org.apache.tuscany.sca.assembly.ComponentProperty;
 import org.apache.tuscany.sca.assembly.ComponentReference;
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.web.ComponentJavaScriptGenerator;
-import org.apache.tuscany.sca.core.web.JavascriptProxyFactory;
-import org.apache.tuscany.sca.core.web.JavascriptProxyFactoryExtensionPoint;
 import org.apache.tuscany.sca.runtime.RuntimeComponent;
+import org.apache.tuscany.sca.web.javascript.ComponentJavaScriptGenerator;
+import org.apache.tuscany.sca.web.javascript.JavascriptProxyFactory;
+import org.apache.tuscany.sca.web.javascript.JavascriptProxyFactoryExtensionPoint;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
diff --git a/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.web.ComponentJavaScriptGenerator b/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.ComponentJavaScriptGenerator
index b98b940b47..b98b940b47 100644
--- a/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.web.ComponentJavaScriptGenerator
+++ b/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.ComponentJavaScriptGenerator
diff --git a/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetComponentScriptGenerator.java b/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetComponentScriptGenerator.java
index 40039f74c2..33db45c7cd 100644
--- a/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetComponentScriptGenerator.java
+++ b/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetComponentScriptGenerator.java
@@ -32,16 +32,16 @@ import java.util.Map;
 import org.apache.tuscany.sca.assembly.Binding;
 import org.apache.tuscany.sca.assembly.ComponentProperty;
 import org.apache.tuscany.sca.assembly.ComponentReference;
-import org.apache.tuscany.sca.core.web.JavascriptProxyFactory;
-import org.apache.tuscany.sca.core.web.JavascriptProxyFactoryExtensionPoint;
 import org.apache.tuscany.sca.runtime.RuntimeComponent;
+import org.apache.tuscany.sca.web.javascript.JavascriptProxyFactory;
+import org.apache.tuscany.sca.web.javascript.JavascriptProxyFactoryExtensionPoint;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
 /**
  * This helper class concatenates the necessary JavaScript client code into a
  * single JavaScript per component
- * @version $Rev: 665897 $ $Date: 2008-06-09 14:31:03 -0700 (Mon, 09 Jun 2008) $
+ * @version $Rev$ $Date$
  */
 public class WidgetComponentScriptGenerator {
     
diff --git a/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetComponentScriptServlet.java b/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetComponentScriptServlet.java
index 45cb86bf4d..a28e014b2e 100644
--- a/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetComponentScriptServlet.java
+++ b/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetComponentScriptServlet.java
@@ -27,8 +27,8 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.tuscany.sca.core.web.ComponentJavaScriptGenerator;
 import org.apache.tuscany.sca.runtime.RuntimeComponent;
+import org.apache.tuscany.sca.web.javascript.ComponentJavaScriptGenerator;
 
 
 /**
diff --git a/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java b/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java
index b6b7ae907b..28a1f6d1db 100644
--- a/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java
+++ b/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java
@@ -27,10 +27,10 @@ import java.io.PrintWriter;
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import org.apache.tuscany.sca.core.web.ComponentJavaScriptGenerator;
 import org.apache.tuscany.sca.invocation.Invoker;
 import org.apache.tuscany.sca.invocation.Message;
 import org.apache.tuscany.sca.runtime.RuntimeComponent;
+import org.apache.tuscany.sca.web.javascript.ComponentJavaScriptGenerator;
 
 
 /**
diff --git a/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java b/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java
index 81341ac1d6..6b76a924dd 100644
--- a/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java
+++ b/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java
@@ -23,7 +23,6 @@ import java.net.URI;
 import javax.servlet.Servlet;
 
 import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.core.web.ComponentJavaScriptGenerator;
 import org.apache.tuscany.sca.host.http.ServletHost;
 import org.apache.tuscany.sca.implementation.widget.WidgetImplementation;
 import org.apache.tuscany.sca.interfacedef.Operation;
@@ -31,6 +30,7 @@ import org.apache.tuscany.sca.invocation.Invoker;
 import org.apache.tuscany.sca.provider.ImplementationProvider;
 import org.apache.tuscany.sca.runtime.RuntimeComponent;
 import org.apache.tuscany.sca.runtime.RuntimeComponentService;
+import org.apache.tuscany.sca.web.javascript.ComponentJavaScriptGenerator;
 
 
 /**
diff --git a/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java b/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java
index f31e42a0ed..aaf09f062d 100644
--- a/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java
+++ b/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java
@@ -19,14 +19,14 @@
 package org.apache.tuscany.sca.implementation.widget.provider;
 
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.web.ComponentJavaScriptGenerator;
-import org.apache.tuscany.sca.core.web.ComponentJavaScriptGeneratorExtensionPoint;
 import org.apache.tuscany.sca.host.http.ServletHost;
 import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint;
 import org.apache.tuscany.sca.implementation.widget.WidgetImplementation;
 import org.apache.tuscany.sca.provider.ImplementationProvider;
 import org.apache.tuscany.sca.provider.ImplementationProviderFactory;
 import org.apache.tuscany.sca.runtime.RuntimeComponent;
+import org.apache.tuscany.sca.web.javascript.ComponentJavaScriptGenerator;
+import org.apache.tuscany.sca.web.javascript.ComponentJavaScriptGeneratorExtensionPoint;
 
 /**
  * The model representing a resource implementation in an SCA assembly model.
diff --git a/branches/sca-java-1.x/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/core/web/dojo/DojoModuleActivator.java b/branches/sca-java-1.x/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoModuleActivator.java
index 40cb459a03..5337b870d8 100644
--- a/branches/sca-java-1.x/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/core/web/dojo/DojoModuleActivator.java
+++ b/branches/sca-java-1.x/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoModuleActivator.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.core.web.dojo;
+package org.apache.tuscany.sca.web.javascript.dojo;
 
 import java.net.URI;
 
diff --git a/branches/sca-java-1.x/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/core/web/dojo/DojoResourceServlet.java b/branches/sca-java-1.x/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoResourceServlet.java
index ce037283f6..86d04a05b5 100644
--- a/branches/sca-java-1.x/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/core/web/dojo/DojoResourceServlet.java
+++ b/branches/sca-java-1.x/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoResourceServlet.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.core.web.dojo;
+package org.apache.tuscany.sca.web.javascript.dojo;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/branches/sca-java-1.x/modules/web-javascript-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/branches/sca-java-1.x/modules/web-javascript-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index cddc129c57..b703bc5b3a 100644
--- a/branches/sca-java-1.x/modules/web-javascript-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/branches/sca-java-1.x/modules/web-javascript-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 # Implementation class for the ModuleActivator
-org.apache.tuscany.sca.core.web.dojo.DojoModuleActivator
+org.apache.tuscany.sca.web.javascript.dojo.DojoModuleActivator
diff --git a/branches/sca-java-1.x/modules/web-javascript/src/main/java/org/apache/tuscany/sca/core/web/ComponentJavaScriptGenerator.java b/branches/sca-java-1.x/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/ComponentJavaScriptGenerator.java
index 2f9ba42bc4..adfe449912 100644
--- a/branches/sca-java-1.x/modules/web-javascript/src/main/java/org/apache/tuscany/sca/core/web/ComponentJavaScriptGenerator.java
+++ b/branches/sca-java-1.x/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/ComponentJavaScriptGenerator.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.core.web;
+package org.apache.tuscany.sca.web.javascript;
 
 import java.io.IOException;
 import java.io.PrintWriter;
diff --git a/branches/sca-java-1.x/modules/web-javascript/src/main/java/org/apache/tuscany/sca/core/web/ComponentJavaScriptGeneratorExtensionPoint.java b/branches/sca-java-1.x/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/ComponentJavaScriptGeneratorExtensionPoint.java
index c2cba59362..ac160d7d1a 100644
--- a/branches/sca-java-1.x/modules/web-javascript/src/main/java/org/apache/tuscany/sca/core/web/ComponentJavaScriptGeneratorExtensionPoint.java
+++ b/branches/sca-java-1.x/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/ComponentJavaScriptGeneratorExtensionPoint.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.core.web;
+package org.apache.tuscany.sca.web.javascript;
 
 import java.util.List;
 
diff --git a/branches/sca-java-1.x/modules/web-javascript/src/main/java/org/apache/tuscany/sca/core/web/DefaultComponentJavaScriptGeneratorExtensionPoint.java b/branches/sca-java-1.x/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/DefaultComponentJavaScriptGeneratorExtensionPoint.java
index 121baba47b..043a46b951 100644
--- a/branches/sca-java-1.x/modules/web-javascript/src/main/java/org/apache/tuscany/sca/core/web/DefaultComponentJavaScriptGeneratorExtensionPoint.java
+++ b/branches/sca-java-1.x/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/DefaultComponentJavaScriptGeneratorExtensionPoint.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.core.web;
+package org.apache.tuscany.sca.web.javascript;
 
 import java.io.IOException;
 import java.lang.reflect.Constructor;
@@ -73,7 +73,7 @@ public class DefaultComponentJavaScriptGeneratorExtensionPoint implements Compon
     */
     private void error(String message, Object model, Exception ex) {
         if (monitor != null) {
-            Problem problem = new ProblemImpl(this.getClass().getName(), "core-web-validation-messages", Severity.ERROR, model, message, ex);
+            Problem problem = new ProblemImpl(this.getClass().getName(), "web-javascript-validation-messages", Severity.ERROR, model, message, ex);
             monitor.problem(problem);
         }        
     }
diff --git a/branches/sca-java-1.x/modules/web-javascript/src/main/java/org/apache/tuscany/sca/core/web/DefaultJavascriptProxyFactoryExtensionPoint.java b/branches/sca-java-1.x/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/DefaultJavascriptProxyFactoryExtensionPoint.java
index 1c6097834f..dc3de744ee 100644
--- a/branches/sca-java-1.x/modules/web-javascript/src/main/java/org/apache/tuscany/sca/core/web/DefaultJavascriptProxyFactoryExtensionPoint.java
+++ b/branches/sca-java-1.x/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/DefaultJavascriptProxyFactoryExtensionPoint.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.core.web;
+package org.apache.tuscany.sca.web.javascript;
 
 import java.io.IOException;
 import java.lang.reflect.Constructor;
@@ -68,7 +68,7 @@ public class DefaultJavascriptProxyFactoryExtensionPoint implements JavascriptPr
     */
     private void error(String message, Object model, Exception ex) {
         if (monitor != null) {
-            Problem problem = new ProblemImpl(this.getClass().getName(), "core-web-validation-messages", Severity.ERROR, model, message, ex);
+            Problem problem = new ProblemImpl(this.getClass().getName(), "web-javascript-validation-messages", Severity.ERROR, model, message, ex);
             monitor.problem(problem);
         }        
     }
diff --git a/branches/sca-java-1.x/modules/web-javascript/src/main/java/org/apache/tuscany/sca/core/web/JavascriptProxyFactory.java b/branches/sca-java-1.x/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/JavascriptProxyFactory.java
index daac7925bd..10455ef764 100644
--- a/branches/sca-java-1.x/modules/web-javascript/src/main/java/org/apache/tuscany/sca/core/web/JavascriptProxyFactory.java
+++ b/branches/sca-java-1.x/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/JavascriptProxyFactory.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.core.web;
+package org.apache.tuscany.sca.web.javascript;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/branches/sca-java-1.x/modules/web-javascript/src/main/java/org/apache/tuscany/sca/core/web/JavascriptProxyFactoryExtensionPoint.java b/branches/sca-java-1.x/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/JavascriptProxyFactoryExtensionPoint.java
index c396a02b30..bf0e6e0526 100644
--- a/branches/sca-java-1.x/modules/web-javascript/src/main/java/org/apache/tuscany/sca/core/web/JavascriptProxyFactoryExtensionPoint.java
+++ b/branches/sca-java-1.x/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/JavascriptProxyFactoryExtensionPoint.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.core.web;
+package org.apache.tuscany.sca.web.javascript;
 
 import javax.xml.namespace.QName;
 
diff --git a/branches/sca-java-1.x/modules/web-javascript/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.web.JavascriptProxyFactoryExtensionPoint b/branches/sca-java-1.x/modules/web-javascript/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.ComponentJavaScriptGeneratorExtensionPoint
index 81328476cc..6a28e3481d 100644
--- a/branches/sca-java-1.x/modules/web-javascript/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.web.JavascriptProxyFactoryExtensionPoint
+++ b/branches/sca-java-1.x/modules/web-javascript/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.ComponentJavaScriptGeneratorExtensionPoint
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License. 
 
-org.apache.tuscany.sca.core.web.DefaultJavascriptProxyFactoryExtensionPoint
+org.apache.tuscany.sca.web.javascript.DefaultComponentJavaScriptGeneratorExtensionPoint
diff --git a/branches/sca-java-1.x/modules/web-javascript/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.web.ComponentJavaScriptGeneratorExtensionPoint b/branches/sca-java-1.x/modules/web-javascript/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.JavascriptProxyFactoryExtensionPoint
index cfe4491670..95a7cecd2b 100644
--- a/branches/sca-java-1.x/modules/web-javascript/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.web.ComponentJavaScriptGeneratorExtensionPoint
+++ b/branches/sca-java-1.x/modules/web-javascript/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.JavascriptProxyFactoryExtensionPoint
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License. 
 
-org.apache.tuscany.sca.core.web.DefaultComponentJavaScriptGeneratorExtensionPoint
+org.apache.tuscany.sca.web.javascript.DefaultJavascriptProxyFactoryExtensionPoint
diff --git a/branches/sca-java-1.x/modules/web-javascript/src/main/resources/core-web-validation-messages.properties b/branches/sca-java-1.x/modules/web-javascript/src/main/resources/web-javascript-validation-messages.properties
index dbc7317653..dbc7317653 100644
--- a/branches/sca-java-1.x/modules/web-javascript/src/main/resources/core-web-validation-messages.properties
+++ b/branches/sca-java-1.x/modules/web-javascript/src/main/resources/web-javascript-validation-messages.properties