Porting javascript extensibility from 1.x

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

3 files changed, 32 insertions, 9 deletions

diff --git a/java/sca/modules/web-javascript-dojo/META-INF/MANIFEST.MF b/java/sca/modules/web-javascript-dojo/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..72e50d6c58
--- /dev/null
+++ b/java/sca/modules/web-javascript-dojo/META-INF/MANIFEST.MF
@@ -0,0 +1,20 @@
+Manifest-Version: 1.0

+Tool: Bnd-0.0.357

+Bundle-Name: Apache Tuscany SCA Web JavaScript (DOJO)

+Created-By: 1.6.0_15 (Apple Inc.)

+Bundle-Vendor: The Apache Software Foundation

+Bundle-Version: 2.0.0

+Bnd-LastModified: 1258084980430

+Bundle-ManifestVersion: 2

+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

+Bundle-Description: Apache Tuscany SCA Web JavaScript

+Import-Package: javax.xml.namespace,

+ org.apache.tuscany.sca.assembly;version="2.0.0",

+ org.apache.tuscany.sca.assembly.xml;version="2.0.0",

+ org.apache.tuscany.sca.core;version="2.0.0",

+ org.apache.tuscany.sca.extensibility,

+ org.apache.tuscany.sca.monitor;version="2.0.0",

+ org.apache.tuscany.sca.runtime;version="2.0.0"

+Bundle-SymbolicName: org.apache.tuscany.sca.core.web.javascript.dojo

+Bundle-DocURL: http://www.apache.org/

+

diff --git a/java/sca/modules/web-javascript-dojo/pom.xml b/java/sca/modules/web-javascript-dojo/pom.xml
index 47460d3005..3986c1d760 100644
--- a/java/sca/modules/web-javascript-dojo/pom.xml
+++ b/java/sca/modules/web-javascript-dojo/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,19 +33,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.4</version> <!-- to keep compatible with older servlet containers -->
+            <version>2.5</version> <!-- to keep compatible with older servlet containers -->
             <scope>provided</scope>
         </dependency>
 
diff --git a/java/sca/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoModuleActivator.java b/java/sca/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoModuleActivator.java
index 987ef466fc..ba4ddc4b2c 100644
--- a/java/sca/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoModuleActivator.java
+++ b/java/sca/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoModuleActivator.java
@@ -34,12 +34,16 @@ public class DojoModuleActivator implements ModuleActivator {
 
     private static final String tuscanyBaseUri = URI.create("/tuscany").toString();
     private static final String tuscanyUri = URI.create("/tuscany/*").toString();
-
+    
     private ServletHost servletHost;
 
-    public void start(ExtensionPointRegistry registry) {
+    public DojoModuleActivator(ExtensionPointRegistry registry) {
         ServletHostExtensionPoint servletHosts = registry.getExtensionPoint(ServletHostExtensionPoint.class);
-        this.servletHost = servletHosts.getServletHosts().get(0);
+        
+        this.servletHost = servletHosts.getServletHosts().get(0);        
+    }
+    
+    public void start() {
         
         if (servletHost == null) {
             throw new IllegalStateException("Can't find ServletHost reference !");
@@ -67,7 +71,7 @@ public class DojoModuleActivator implements ModuleActivator {
         
     }
 
-    public void stop(ExtensionPointRegistry registry) {
+    public void stop() {
         Servlet servlet = servletHost.getServletMapping(dojoBaseUri);
         if(servlet != null) {
             servletHost.removeServletMapping(dojoBaseUri);
@@ -80,5 +84,4 @@ public class DojoModuleActivator implements ModuleActivator {
         servletHost = null;
 
     }
-
 }