geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vamsic...@apache.org
Subject svn commit: r579354 - in /geronimo/plugins/tuscany/trunk: ./ geronimo-tuscany-http-jetty/src/main/java/org/apache/geronimo/tuscany/http/jetty/ geronimo-tuscany-http-tomcat/src/main/java/org/apache/geronimo/tuscany/http/tomcat/ tuscany-jetty/ tuscany-je...
Date Tue, 25 Sep 2007 19:14:14 GMT
Author: vamsic007
Date: Tue Sep 25 12:14:11 2007
New Revision: 579354

URL: http://svn.apache.org/viewvc?rev=579354&view=rev
Log:
Switch to 1.0-incubating version of Tuscany SCA.
 o sca-api renamed to tuscany-sca-api
 o tuscany-distributed renamed to tuscany-node
 o tuscany-binding-jms is not in SCA 1.0-incubating.
 o Added getContextPath() to ServletHost implementation

Modified:
    geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-jetty/src/main/java/org/apache/geronimo/tuscany/http/jetty/GeronimoServletHost.java
    geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-tomcat/src/main/java/org/apache/geronimo/tuscany/http/tomcat/GeronimoServletHost.java
    geronimo/plugins/tuscany/trunk/pom.xml
    geronimo/plugins/tuscany/trunk/tuscany-jetty/pom.xml
    geronimo/plugins/tuscany/trunk/tuscany-jetty/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/plugins/tuscany/trunk/tuscany-tomcat/pom.xml
    geronimo/plugins/tuscany/trunk/tuscany-tomcat/src/main/resources/META-INF/geronimo-plugin.xml

Modified: geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-jetty/src/main/java/org/apache/geronimo/tuscany/http/jetty/GeronimoServletHost.java
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-jetty/src/main/java/org/apache/geronimo/tuscany/http/jetty/GeronimoServletHost.java?rev=579354&r1=579353&r2=579354&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-jetty/src/main/java/org/apache/geronimo/tuscany/http/jetty/GeronimoServletHost.java
(original)
+++ geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-jetty/src/main/java/org/apache/geronimo/tuscany/http/jetty/GeronimoServletHost.java
Tue Sep 25 12:14:11 2007
@@ -338,4 +338,8 @@
     public Servlet getServletMapping(String suri) {
         return null;
     }
+    
+    public String getContextPath() {
+    	return "/tuscany";
+    }
 }

Modified: geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-tomcat/src/main/java/org/apache/geronimo/tuscany/http/tomcat/GeronimoServletHost.java
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-tomcat/src/main/java/org/apache/geronimo/tuscany/http/tomcat/GeronimoServletHost.java?rev=579354&r1=579353&r2=579354&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-tomcat/src/main/java/org/apache/geronimo/tuscany/http/tomcat/GeronimoServletHost.java
(original)
+++ geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-tomcat/src/main/java/org/apache/geronimo/tuscany/http/tomcat/GeronimoServletHost.java
Tue Sep 25 12:14:11 2007
@@ -217,4 +217,8 @@
     public Servlet getServletMapping(String suri) {
         return null;
     }
+    
+    public String getContextPath() {
+    	return "/tuscany";
+    }
 }

Modified: geronimo/plugins/tuscany/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/pom.xml?rev=579354&r1=579353&r2=579354&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/pom.xml (original)
+++ geronimo/plugins/tuscany/trunk/pom.xml Tue Sep 25 12:14:11 2007
@@ -57,7 +57,7 @@
 
         <geronimoSchemaVersion>1.2</geronimoSchemaVersion>
         <geronimoVersion>2.0.1</geronimoVersion>
-        <tuscanyVersion>1.0-incubating-SNAPSHOT</tuscanyVersion>
+        <tuscanyVersion>1.0-incubating</tuscanyVersion>
         <tuscanySdoVersion>1.0-incubating</tuscanySdoVersion>
         <tuscanyDasVersion>1.0-incubating-SNAPSHOT</tuscanyDasVersion>
     </properties>
@@ -315,11 +315,6 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>sca-api</artifactId>
-                <version>${tuscanyVersion}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-assembly</artifactId>
                 <version>${tuscanyVersion}</version>
             </dependency>
@@ -338,11 +333,11 @@
                 <artifactId>tuscany-binding-feed</artifactId>
                 <version>${tuscanyVersion}</version>
             </dependency>
-            <dependency>
+            <!--dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-binding-jms</artifactId>
                 <version>${tuscanyVersion}</version>
-            </dependency>
+            </dependency-->
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-binding-jsonrpc</artifactId>
@@ -415,11 +410,6 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-distributed</artifactId>
-                <version>${tuscanyVersion}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-extension-helper</artifactId>
                 <version>${tuscanyVersion}</version>
             </dependency>
@@ -480,12 +470,22 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
+                <artifactId>tuscany-node</artifactId>
+                <version>${tuscanyVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-policy</artifactId>
                 <version>${tuscanyVersion}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-policy-xml</artifactId>
+                <version>${tuscanyVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tuscany.sca</groupId>
+                <artifactId>tuscany-sca-api</artifactId>
                 <version>${tuscanyVersion}</version>
             </dependency>
             <dependency>

Modified: geronimo/plugins/tuscany/trunk/tuscany-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/tuscany-jetty/pom.xml?rev=579354&r1=579353&r2=579354&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/tuscany-jetty/pom.xml (original)
+++ geronimo/plugins/tuscany/trunk/tuscany-jetty/pom.xml Tue Sep 25 12:14:11 2007
@@ -177,10 +177,6 @@
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>sca-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
         </dependency>
         <dependency>
@@ -195,10 +191,10 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-feed</artifactId>
         </dependency>
-        <dependency>
+        <!--dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jms</artifactId>
-        </dependency>
+        </dependency-->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc</artifactId>
@@ -257,10 +253,6 @@
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distributed</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extension-helper</artifactId>
         </dependency>
         <dependency>
@@ -309,11 +301,19 @@
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sdo</groupId>

Modified: geronimo/plugins/tuscany/trunk/tuscany-jetty/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/tuscany-jetty/src/main/resources/META-INF/geronimo-plugin.xml?rev=579354&r1=579353&r2=579354&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/tuscany-jetty/src/main/resources/META-INF/geronimo-plugin.xml
(original)
+++ geronimo/plugins/tuscany/trunk/tuscany-jetty/src/main/resources/META-INF/geronimo-plugin.xml
Tue Sep 25 12:14:11 2007
@@ -73,12 +73,11 @@
     <dependency>org.apache.neethi/neethi/2.0/jar</dependency>
 
     <dependency>org.apache.tuscany.das/tuscany-das-rdb/${tuscanyDasVersion}/jar</dependency>
-    <dependency>org.apache.tuscany.sca/sca-api/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-assembly/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-assembly-xml/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-binding-ejb/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-binding-feed/${tuscanyVersion}/jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-binding-jms/${tuscanyVersion}/jar</dependency>
+    <!--dependency>org.apache.tuscany.sca/tuscany-binding-jms/${tuscanyVersion}/jar</dependency-->
     <dependency>org.apache.tuscany.sca/tuscany-binding-jsonrpc/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-binding-rmi/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-binding-sca/${tuscanyVersion}</dependency>
@@ -93,7 +92,6 @@
     <dependency>org.apache.tuscany.sca/tuscany-core-spi/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-databinding/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-databinding-axiom/${tuscanyVersion}/jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-distributed/${tuscanyVersion}</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-extension-helper/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-host-embedded/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-host-http/${tuscanyVersion}/jar</dependency>
@@ -106,8 +104,10 @@
     <dependency>org.apache.tuscany.sca/tuscany-interface-java-xml/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-interface-wsdl/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-interface-wsdl-xml/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-node/${tuscanyVersion}</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-policy/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-policy-xml/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-sca-api/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sdo/tuscany-sdo-impl/${tuscanySdoVersion}/jar</dependency>
 
     <dependency>org.apache.ws.commons.axiom/axiom-api/1.2.5/jar</dependency>

Modified: geronimo/plugins/tuscany/trunk/tuscany-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/tuscany-tomcat/pom.xml?rev=579354&r1=579353&r2=579354&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/tuscany-tomcat/pom.xml (original)
+++ geronimo/plugins/tuscany/trunk/tuscany-tomcat/pom.xml Tue Sep 25 12:14:11 2007
@@ -177,10 +177,6 @@
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>sca-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
         </dependency>
         <dependency>
@@ -195,10 +191,10 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-feed</artifactId>
         </dependency>
-        <dependency>
+        <!--dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jms</artifactId>
-        </dependency>
+        </dependency-->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc</artifactId>
@@ -257,10 +253,6 @@
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distributed</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extension-helper</artifactId>
         </dependency>
         <dependency>
@@ -309,11 +301,19 @@
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sdo</groupId>

Modified: geronimo/plugins/tuscany/trunk/tuscany-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/tuscany-tomcat/src/main/resources/META-INF/geronimo-plugin.xml?rev=579354&r1=579353&r2=579354&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/tuscany-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
(original)
+++ geronimo/plugins/tuscany/trunk/tuscany-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
Tue Sep 25 12:14:11 2007
@@ -73,12 +73,11 @@
     <dependency>org.apache.neethi/neethi/2.0/jar</dependency>
 
     <dependency>org.apache.tuscany.das/tuscany-das-rdb/${tuscanyDasVersion}/jar</dependency>
-    <dependency>org.apache.tuscany.sca/sca-api/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-assembly/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-assembly-xml/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-binding-ejb/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-binding-feed/${tuscanyVersion}/jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-binding-jms/${tuscanyVersion}/jar</dependency>
+    <!--dependency>org.apache.tuscany.sca/tuscany-binding-jms/${tuscanyVersion}/jar</dependency-->
     <dependency>org.apache.tuscany.sca/tuscany-binding-jsonrpc/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-binding-rmi/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-binding-sca/${tuscanyVersion}</dependency>
@@ -93,7 +92,6 @@
     <dependency>org.apache.tuscany.sca/tuscany-core-spi/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-databinding/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-databinding-axiom/${tuscanyVersion}/jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-distributed/${tuscanyVersion}</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-extension-helper/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-host-embedded/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-host-http/${tuscanyVersion}/jar</dependency>
@@ -106,8 +104,10 @@
     <dependency>org.apache.tuscany.sca/tuscany-interface-java-xml/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-interface-wsdl/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-interface-wsdl-xml/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-node/${tuscanyVersion}</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-policy/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-policy-xml/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-sca-api/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sdo/tuscany-sdo-impl/${tuscanySdoVersion}/jar</dependency>
 
     <dependency>org.apache.ws.commons.axiom/axiom-api/1.2.5/jar</dependency>



Mime
View raw message