geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vamsic...@apache.org
Subject svn commit: r559533 - in /geronimo/sandbox/tuscany-integration: ./ geronimo-tuscany/ geronimo-tuscany/configs/src/main/resources/META-INF/ geronimo-tuscany/configs/src/plan/ geronimo-tuscany/modules/ geronimo-tuscany/modules/src/main/java/org/apache/ge...
Date Wed, 25 Jul 2007 17:43:09 GMT
Author: vamsic007
Date: Wed Jul 25 10:43:08 2007
New Revision: 559533

URL: http://svn.apache.org/viewvc?view=rev&rev=559533
Log:
Fixed problems in GeronimoServletHost

Added:
    geronimo/sandbox/tuscany-integration/miscellaneous/
    geronimo/sandbox/tuscany-integration/miscellaneous/additional-jars.zip   (with props)
    geronimo/sandbox/tuscany-integration/samples/helloWorld-ws.jar   (with props)
Modified:
    geronimo/sandbox/tuscany-integration/README.TXT
    geronimo/sandbox/tuscany-integration/geronimo-tuscany/configs/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/sandbox/tuscany-integration/geronimo-tuscany/configs/src/plan/plan.xml
    geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/pom.xml
    geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/EmbeddedRuntimeGBean.java
    geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/TuscanyBuilder.java
    geronimo/sandbox/tuscany-integration/geronimo-tuscany/pom.xml
    geronimo/sandbox/tuscany-integration/modules/tuscany-http-geronimo/src/main/java/org/apache/tuscany/sca/http/geronimo/GeronimoServletHost.java

Modified: geronimo/sandbox/tuscany-integration/README.TXT
URL: http://svn.apache.org/viewvc/geronimo/sandbox/tuscany-integration/README.TXT?view=diff&rev=559533&r1=559532&r2=559533
==============================================================================
--- geronimo/sandbox/tuscany-integration/README.TXT (original)
+++ geronimo/sandbox/tuscany-integration/README.TXT Wed Jul 25 10:43:08 2007
@@ -1,7 +1,8 @@
 1. Checkout the source from http://svn.apache.org/repos/asf/geronimo/sandbox/tuscany-integration to a directory of your choice.  Call it <g_t_dir>
 2. Change directory to <g_t_dir>\geronimo-tuscany
 3. Build using "mvn clean install"
-4. Deploy the plugin using "deploy.bat install-plugin <g_t_dir>\geronimo-tuscany\configs\target\tuscany-plugin-1.0.car"
-5. Deploy <g_t_dir>\samples\standalone.jar
-6. Deploy <g_t_dir>\samples\calculatorClient.war
-7. Access http://localhost:8080/calculatorClient/
\ No newline at end of file
+4. Install Geronimo 2.0 Tomat Distribution.  The installation directory will be referred to as <g2.0_dir>.
+5. Unzip <g_t_dir>\miscellaneous\additional-jars.zip to <g2.0_dir>\repository
+6. Deploy the plugin using "deploy.bat install-plugin <g_t_dir>\geronimo-tuscany\configs\target\tuscany-plugin-1.0.car"
+7. Deploy <g_t_dir>\samples\helloWorld-ws.jar
+8. Access HelloWorldService at web service URL http://localhost:8080/hello/HelloWorldService
\ No newline at end of file

Modified: geronimo/sandbox/tuscany-integration/geronimo-tuscany/configs/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/tuscany-integration/geronimo-tuscany/configs/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=559533&r1=559532&r2=559533
==============================================================================
--- geronimo/sandbox/tuscany-integration/geronimo-tuscany/configs/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/sandbox/tuscany-integration/geronimo-tuscany/configs/src/main/resources/META-INF/geronimo-plugin.xml Wed Jul 25 10:43:08 2007
@@ -40,13 +40,13 @@
         <dependency>org.apache.geronimo.configs/jasper/2.0-SNAPSHOT/car</dependency>
         <dependency>org.apache.geronimo.modules/geronimo-axis2/2.0-SNAPSHOT/jar</dependency>
         <dependency>org.apache.geronimo.modules/geronimo-j2ee-schema/2.0-SNAPSHOT/jar</dependency>
-        <dependency>axis2/axis2-java2wsdl/1.2/jar</dependency>
-        <dependency>axis2/axis2-kernel/1.2/jar</dependency>
-        <dependency>axis2/axis2-adb/1.2/jar</dependency>            
-        <dependency>axis2/axis2-jaxws/1.2/jar</dependency>
-        <dependency>axis2/axis2-jaxws-api/1.2/jar</dependency>
-        <dependency>axis2/axis2-metadata/1.2/jar</dependency>            
-        <dependency>axis2/axis2-saaj/1.2/jar</dependency>      
+        <dependency>org.apache.axis2/axis2-java2wsdl/1.2/jar</dependency>
+        <dependency>org.apache.axis2/axis2-kernel/1.2/jar</dependency>
+        <dependency>org.apache.axis2/axis2-adb/1.2/jar</dependency>            
+        <dependency>org.apache.axis2/axis2-jaxws/1.2/jar</dependency>
+        <dependency>org.apache.axis2/axis2-jaxws-api/1.2/jar</dependency>
+        <dependency>org.apache.axis2/axis2-metadata/1.2/jar</dependency>            
+        <dependency>org.apache.axis2/axis2-saaj/1.2/jar</dependency>      
         <dependency>org.apache.httpcomponents/httpcore/4.0-alpha5/jar</dependency>      
         <dependency>org.apache.ws.commons.axiom/axiom-api/SNAPSHOT/jar</dependency>      
         <dependency>org.apache.ws.commons.axiom/axiom-dom/SNAPSHOT/jar</dependency>      
@@ -64,45 +64,45 @@
         <dependency>com.sun.xml.ws/jaxws-rt/2.0/jar</dependency>      
         <dependency>com.sun.xml.bind/jaxb-xjc/2.0.5/jar</dependency>      
         <dependency>backport-util-concurrent/backport-util-concurrent/2.2/jar</dependency>      
-        <dependency>org.apache.tuscany/commonj-api/1.0-incubating-SNAPSHOT/jar</dependency>      
-        <dependency>org.apache.tuscany.sca/sca-api/1.0-incubating-SNAPSHOT/jar</dependency>      
+        <dependency>org.apache.tuscany/commonj-api/0.91-incubating/jar</dependency>      
+        <dependency>org.apache.tuscany.sca/sca-api/0.91-incubating/jar</dependency>      
         <dependency>stax/stax-api/1.0.1/jar</dependency>      
-        <dependency>org.apache.tuscany.sca/tuscany-assembly/1.0-incubating-SNAPSHOT/jar</dependency>      
-        <dependency>org.apache.tuscany.sca/tuscany-assembly-xml/1.0-incubating-SNAPSHOT/jar</dependency>      
-        <dependency>org.apache.tuscany.sca/tuscany-contribution/1.0-incubating-SNAPSHOT/jar</dependency>      
-        <dependency>org.apache.tuscany.sca/tuscany-contribution-impl/1.0-incubating-SNAPSHOT/ja</dependency>     
-        <dependency>org.apache.tuscany.sca/tuscany-core/1.0-incubating-SNAPSHOT/jar</dependency>      
-        <dependency>org.apache.tuscany.sca/tuscany-core-databinding/1.0-incubating-SNAPSHOT/jar</dependency>      
+        <dependency>org.apache.tuscany.sca/tuscany-assembly/0.91-incubating/jar</dependency>      
+        <dependency>org.apache.tuscany.sca/tuscany-assembly-xml/0.91-incubating/jar</dependency>      
+        <dependency>org.apache.tuscany.sca/tuscany-contribution/0.91-incubating/jar</dependency>      
+        <dependency>org.apache.tuscany.sca/tuscany-contribution-impl/0.91-incubating/ja</dependency>     
+        <dependency>org.apache.tuscany.sca/tuscany-core/0.91-incubating/jar</dependency>      
+        <dependency>org.apache.tuscany.sca/tuscany-core-databinding/0.91-incubating/jar</dependency>      
         <dependency>org.apache.tuscany.sca/tuscany-core-spi/1.0-incubating-SNAPSHOT/jar</dependency>      
-        <dependency>org.apache.tuscany.sca/tuscany-databinding-axiom/1.0-incubating-SNAPSHOT/jar</dependency>      
-        <dependency>org.apache.tuscany.sca/tuscany-databinding/1.0-incubating-SNAPSHOT/jar</dependency>      
+        <dependency>org.apache.tuscany.sca/tuscany-databinding-axiom/0.91-incubating/jar</dependency>      
+        <dependency>org.apache.tuscany.sca/tuscany-databinding/0.91-incubating/jar</dependency>      
         <dependency>org.apache.tuscany.sca/tuscany-host-embedded/1.0-incubating-SNAPSHOT/jar</dependency>
-        <dependency>org.apache.tuscany.sca/tuscany-host-http/1.0-incubating-SNAPSHOT/jar</dependency>      
+        <dependency>org.apache.tuscany.sca/tuscany-policy/0.91-incubating/jar</dependency>
+        <dependency>org.apache.tuscany.sca/tuscany-host-http/0.91-incubating/jar</dependency>      
         <dependency>org.apache.tuscany.sca/tuscany-host-geronimo/1.0-incubating-SNAPSHOT/jar</dependency>      
-        <dependency>org.apache.tuscany.sca/tuscany-implementation-java/1.0-incubating-SNAPSHOT/jar</dependency>      
-        <dependency>org.apache.tuscany.sca/tuscany-implementation-java-runtime/1.0-incubating-SNAPSHOT/jar</dependency>      
-        <dependency>org.apache.tuscany.sca/tuscany-implementation-java-xml/1.0-incubating-SNAPSHOT/jar</dependency>      
-        <dependency>org.apache.tuscany.sca/tuscany-interface/1.0-incubating-SNAPSHOT/jar</dependency>      
-        <dependency>org.apache.tuscany.sca/tuscany-interface-java/1.0-incubating-SNAPSHOT/jar</dependency>      
-        <dependency>org.apache.tuscany.sca/tuscany-interface-java-runtime/1.0-incubating-SNAPSHOT/jar</dependency>      
-        <dependency>org.apache.tuscany.sca/tuscany-interface-java-xml/1.0-incubating-SNAPSHOT/jar</dependency>      
-        <dependency>org.apache.tuscany.sca/tuscany-binding-ws/1.0-incubating-SNAPSHOT/jar</dependency>      
-        <dependency>org.apache.tuscany.sca/tuscany-binding-ws-axis2/1.0-incubating-SNAPSHOT/jar</dependency>
-        <dependency>org.apache.tuscany.sca/tuscany-binding-ws-xml/1.0-incubating-SNAPSHOT/jar</dependency>
-        <dependency>org.apache.tuscany.sca/tuscany-interface-wsdl/1.0-incubating-SNAPSHOT/jar</dependency>      
-        <dependency>org.apache.tuscany.sca/tuscany-interface-wsdl-runtime/1.0-incubating-SNAPSHOT/jar</dependency>      
-        <dependency>org.apache.tuscany.sca/tuscany-interface-wsdl-xml/1.0-incubating-SNAPSHOT/jar</dependency>      
-        <dependency>org.apache.tuscany.sca/tuscany-policy/1.0-incubating-SNAPSHOT/jar</dependency>      
+        <dependency>org.apache.tuscany.sca/tuscany-implementation-java/0.91-incubating/jar</dependency>      
+        <dependency>org.apache.tuscany.sca/tuscany-implementation-java-runtime/0.91-incubating/jar</dependency>      
+        <dependency>org.apache.tuscany.sca/tuscany-implementation-java-xml/0.91-incubating/jar</dependency>      
+        <dependency>org.apache.tuscany.sca/tuscany-interface/0.91-incubating/jar</dependency>      
+        <dependency>org.apache.tuscany.sca/tuscany-interface-java/0.91-incubating/jar</dependency>      
+        <dependency>org.apache.tuscany.sca/tuscany-interface-java-runtime/0.91-incubating/jar</dependency>      
+        <dependency>org.apache.tuscany.sca/tuscany-interface-java-xml/0.91-incubating/jar</dependency>      
+        <dependency>org.apache.tuscany.sca/tuscany-binding-ws/0.91-incubating/jar</dependency>      
+        <dependency>org.apache.tuscany.sca/tuscany-binding-ws-axis2/0.91-incubating/jar</dependency>
+        <dependency>org.apache.tuscany.sca/tuscany-binding-ws-xml/0.91-incubating/jar</dependency>
+        <dependency>org.apache.tuscany.sca/tuscany-interface-wsdl/0.91-incubating/jar</dependency>      
+        <dependency>org.apache.tuscany.sca/tuscany-interface-wsdl-runtime/0.91-incubating/jar</dependency>      
+        <dependency>org.apache.tuscany.sca/tuscany-interface-wsdl-xml/0.91-incubating/jar</dependency>      
+        <dependency>org.apache.tuscany.sca/tuscany-policy/0.91-incubating/jar</dependency>      
         <dependency>org.apache.tuscany.sca/geronimo-host-rmi/1.0-incubating-SNAPSHOT/jar</dependency>          
-        <dependency>org.apache.tuscany.sca/tuscany-binding-ejb/1.0-incubating-SNAPSHOT/jar</dependency>                      
-        <dependency>org.apache.tuscany.sca/tuscany-binding-feed/1.0-incubating-SNAPSHOT/jar</dependency>                      
-        <dependency>org.apache.tuscany.sca/tuscany-binding-jms/1.0-incubating-SNAPSHOT/jar</dependency>
-        <dependency>org.apache.tuscany.sca/tuscany-binding-jsonrpc/1.0-incubating-SNAPSHOT/jar</dependency>
-        <dependency>org.apache.tuscany.sca/tuscany-binding-rmi/1.0-incubating-SNAPSHOT/jar</dependency>
-        <dependency>org.apache.tuscany.sca/tuscany-binding-sca/1.0-incubating-SNAPSHOT/jar</dependency>
-        <dependency>org.apache.tuscany.sca/tuscany-distributed/1.0-incubating-SNAPSHOT/jar</dependency>
-        <dependency>org.apache.tuscany.sca/tuscany-distributed/1.0-incubating-SNAPSHOT/jar</dependency>
-        <dependency>org.apache.tuscany.sca/tuscany-extension-helper/1.0-incubating-SNAPSHOT/jar</dependency>        
+        <dependency>org.apache.tuscany.sca/tuscany-binding-ejb/0.91-incubating/jar</dependency>                      
+        <dependency>org.apache.tuscany.sca/tuscany-binding-feed/0.91-incubating/jar</dependency>                      
+        <dependency>org.apache.tuscany.sca/tuscany-binding-jms/0.91-incubating/jar</dependency>
+        <dependency>org.apache.tuscany.sca/tuscany-binding-jsonrpc/0.91-incubating/jar</dependency>
+        <dependency>org.apache.tuscany.sca/tuscany-binding-rmi/0.91-incubating/jar</dependency>
+        <dependency>org.apache.tuscany.sca/tuscany-binding-sca/1.0-incubating-SNAPSHOT</dependency>
+        <dependency>org.apache.tuscany.sca/tuscany-distributed/1.0-incubating-SNAPSHOT</dependency>
+        <dependency>org.apache.tuscany.sca/tuscany-extension-helper/0.91-incubating/jar</dependency>        
         <dependency>wsdl4j/wsdl4j/1.6.1/jar</dependency>      
         <dependency>org.codehaus.woodstox/wstx-asl/3.2.0/jar</dependency>                  
         <dependency>org.apache.ws.commons.schema/XmlSchema/1.3.1/jar</dependency>                  
@@ -118,15 +118,17 @@
         <dependency>org.eclipse.xsd/xsd/2.1.1/jar</dependency>                    
         <dependency>org.apache.geronimo.configs/geronimo-gbean-deployer//car</dependency>  
 
-    <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>          
+    <source-repository>http://repo1.maven.org/maven2</source-repository> 
 
-    <source-repository>http://mirrors.ibiblio.org/pub/mirrors/maven2/</source-repository>
+    <source-repository>http://people.apache.org/repo/m2-snapshot-repository</source-repository>          
 
-    <source-repository>http://ftp.ussg.iu.edu/eclipse/modeling/emf/emf/maven2/</source-repository>
+    <source-repository>http://people.apache.org/repo/m2-incubating-repository</source-repository> 
 
-    <source-repository>http://repository.codehaus.org/</source-repository>
+    <source-repository>http://ftp.ussg.iu.edu/eclipse/modeling/emf/emf/maven2</source-repository>
+
+    <source-repository>http://repository.codehaus.org</source-repository>
 
     <source-repository>http://people.apache.org/~manugeorge/repository</source-repository>
 
-    <source-repository>http://ws.zones.apache.org/repository/</source-repository>
+    <source-repository>http://ws.zones.apache.org/repository</source-repository>
 </geronimo-plugin>

Modified: geronimo/sandbox/tuscany-integration/geronimo-tuscany/configs/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/tuscany-integration/geronimo-tuscany/configs/src/plan/plan.xml?view=diff&rev=559533&r1=559532&r2=559533
==============================================================================
--- geronimo/sandbox/tuscany-integration/geronimo-tuscany/configs/src/plan/plan.xml (original)
+++ geronimo/sandbox/tuscany-integration/geronimo-tuscany/configs/src/plan/plan.xml Wed Jul 25 10:43:08 2007
@@ -43,49 +43,49 @@
             <dependency>
                 <groupId>org.apache.axis2</groupId>
                 <artifactId>axis2-java2wsdl</artifactId>
-                <version>SNAPSHOT</version>
+                <version>1.2</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.axis2</groupId>
                 <artifactId>axis2-kernel</artifactId>
-                <version>SNAPSHOT</version>
+                <version>1.2</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.axis2</groupId>
                 <artifactId>axis2-adb</artifactId>
-                <version>SNAPSHOT</version>
+                <version>1.2</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.axis2</groupId>
                 <artifactId>axis2-jaxws</artifactId>
-                <version>SNAPSHOT</version>
+                <version>1.2</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.axis2</groupId>
                 <artifactId>axis2-jaxws-api</artifactId>
-                <version>SNAPSHOT</version>
+                <version>1.2</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.axis2</groupId>
                 <artifactId>axis2-metadata</artifactId>
-                <version>SNAPSHOT</version>
+                <version>1.2</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.axis2</groupId>
                 <artifactId>axis2-saaj</artifactId>
-                <version>SNAPSHOT</version>
+                <version>1.2</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
@@ -211,14 +211,14 @@
             <dependency>
                 <groupId>org.apache.tuscany</groupId>
                 <artifactId>commonj-api</artifactId>
-                <version>1.0-incubating-SNAPSHOT</version>
+                <version>0.91-incubating</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>sca-api</artifactId>
-                <version>1.0-incubating-SNAPSHOT</version>
+                <version>0.91-incubating</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
@@ -232,56 +232,56 @@
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-assembly</artifactId>
-                <version>1.0-incubating-SNAPSHOT</version>
+                <version>0.91-incubating</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-assembly-xml</artifactId>
-                <version>1.0-incubating-SNAPSHOT</version>
+                <version>0.91-incubating</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-contribution</artifactId>
-                <version>1.0-incubating-SNAPSHOT</version>
+                <version>0.91-incubating</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-contribution-impl</artifactId>
-                <version>1.0-incubating-SNAPSHOT</version>
+                <version>0.91-incubating</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-core</artifactId>
-                <version>1.0-incubating-SNAPSHOT</version>
+                <version>0.91-incubating</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-core-databinding</artifactId>
-                <version>1.0-incubating-SNAPSHOT</version>
+                <version>0.91-incubating</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-core-spi</artifactId>
-                <version>1.0-incubating-SNAPSHOT</version>
+                <version>0.91-incubating</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-databinding-axiom</artifactId>
-                <version>1.0-incubating-SNAPSHOT</version>
+                <version>0.91-incubating</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
@@ -289,21 +289,28 @@
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-databinding</artifactId>
-                <version>1.0-incubating-SNAPSHOT</version>
+                <version>0.91-incubating</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-host-embedded</artifactId>
-                <version>1.0-incubating-SNAPSHOT</version>
+                <version>0.91-incubating</version>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tuscany.sca</groupId>
+                <artifactId>tuscany-policy</artifactId>
+                <version>0.91-incubating</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-host-http</artifactId>
-                <version>1.0-incubating-SNAPSHOT</version>
+                <version>0.91-incubating</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
@@ -317,100 +324,98 @@
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-implementation-java</artifactId>
-                <version>1.0-incubating-SNAPSHOT</version>
+                <version>0.91-incubating</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>
-                    tuscany-implementation-java-runtime
-                </artifactId>
-                <version>1.0-incubating-SNAPSHOT</version>
+                <artifactId>tuscany-implementation-java-runtime</artifactId>
+                <version>0.91-incubating</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-implementation-java-xml</artifactId>
-                <version>1.0-incubating-SNAPSHOT</version>
+                <version>0.91-incubating</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-interface</artifactId>
-                <version>1.0-incubating-SNAPSHOT</version>
+                <version>0.91-incubating</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-interface-java</artifactId>
-                <version>1.0-incubating-SNAPSHOT</version>
+                <version>0.91-incubating</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-interface-java-runtime</artifactId>
-                <version>1.0-incubating-SNAPSHOT</version>
+                <version>0.91-incubating</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-interface-java-xml</artifactId>
-                <version>1.0-incubating-SNAPSHOT</version>
+                <version>0.91-incubating</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-binding-ws</artifactId>
-                <version>1.0-incubating-SNAPSHOT</version>
+                <version>0.91-incubating</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-binding-ws-axis2</artifactId>
-                <version>1.0-incubating-SNAPSHOT</version>
+                <version>0.91-incubating</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-binding-ws-xml</artifactId>
-                <version>1.0-incubating-SNAPSHOT</version>
+                <version>0.91-incubating</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-interface-wsdl</artifactId>
-                <version>1.0-incubating-SNAPSHOT</version>
+                <version>0.91-incubating</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-interface-wsdl-runtime</artifactId>
-                <version>1.0-incubating-SNAPSHOT</version>
+                <version>0.91-incubating</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-interface-wsdl-xml</artifactId>
-                <version>1.0-incubating-SNAPSHOT</version>
+                <version>0.91-incubating</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-policy</artifactId>
-                <version>1.0-incubating-SNAPSHOT</version>
+                <version>0.91-incubating</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
@@ -425,28 +430,28 @@
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-binding-feed</artifactId>
-                <version>1.0-incubating-SNAPSHOT</version>
+                <version>0.91-incubating</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
-            <dependency>
+            <!--<dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-binding-jms</artifactId>
                 <version>1.0-incubating-SNAPSHOT</version>
                 <type>jar</type>
                 <import>classes</import>
-            </dependency>
+            </dependency>-->
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-binding-jsonrpc</artifactId>
-                <version>1.0-incubating-SNAPSHOT</version>
+                <version>0.91-incubating</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-binding-rmi</artifactId>
-                <version>1.0-incubating-SNAPSHOT</version>
+                <version>0.91-incubating</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
@@ -466,15 +471,8 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-distributed</artifactId>
-                <version>1.0-incubating-SNAPSHOT</version>
-                <type>jar</type>
-                <import>classes</import>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-extension-helper</artifactId>
-                <version>1.0-incubating-SNAPSHOT</version>
+                <version>0.91-incubating</version>
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
@@ -589,6 +587,8 @@
         <reference name="Repository" />
         <attribute name="serverInfoQuery">?name=ServerInfo</attribute>
         <attribute name="embeddedSCADomainQuery">?name=GeronimoSCADomain</attribute>
+        <attribute name="useEmbeddedDomain">true</attribute>
+        <attribute name="startOtherComponents">false</attribute>
         <xml-attribute name="defaultEnvironment">
             <environment>
                 <dependencies>

Modified: geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/pom.xml?view=diff&rev=559533&r1=559532&r2=559533
==============================================================================
--- geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/pom.xml (original)
+++ geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/pom.xml Wed Jul 25 10:43:08 2007
@@ -50,13 +50,33 @@
       </dependency>                    
       <dependency>
         <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-policy</artifactId>        
+        <version>0.91-incubating</version>            
+      </dependency>                    
+      <dependency>
+        <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>sca-api</artifactId>        
-        <version>1.0-incubating-SNAPSHOT</version>            
+        <version>0.91-incubating</version>            
       </dependency>                    
       <dependency>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-core</artifactId>        
-        <version>1.0-incubating-SNAPSHOT</version>            
+        <version>0.91-incubating</version>            
+      </dependency>                    
+      <dependency>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-assembly</artifactId>        
+        <version>0.91-incubating</version>            
+      </dependency>                    
+      <dependency>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-contribution</artifactId>        
+        <version>0.91-incubating</version>            
+      </dependency>                    
+      <dependency>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-contribution-impl</artifactId>        
+        <version>0.91-incubating</version>            
       </dependency>                    
       
       <dependency>

Modified: geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/EmbeddedRuntimeGBean.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/EmbeddedRuntimeGBean.java?view=diff&rev=559533&r1=559532&r2=559533
==============================================================================
--- geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/EmbeddedRuntimeGBean.java (original)
+++ geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/EmbeddedRuntimeGBean.java Wed Jul 25 10:43:08 2007
@@ -19,6 +19,8 @@
 package org.apache.geronimo.tuscany;
 
 import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
 
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
@@ -42,6 +44,7 @@
     private ClassLoader classLoader;
     private EmbeddedSCADomainGBean embeddedSCADomainRef;
     private boolean useEmbeddedDomain = true;
+    private boolean startOtherComponents = true; // TODO: Added as a hack. Eliminate this when EmbeddedSCADomain is fixed.
     private Contribution contribution;
     private String contributionRoot;
     
@@ -90,6 +93,8 @@
                 scaDomain = embeddedSCADomainRef.getScaDomain();
                 EmbeddedSCADomain eScaDomain = (EmbeddedSCADomain)scaDomain;
                 ModelResolverImpl modelResolver = new ModelResolverImpl(classLoader);
+                
+                // Add contribution
                 contribution = eScaDomain.getContributionService().contribute(contributionRoot, new URL(contributionRoot), modelResolver, false);
                 
                 // Add composites
@@ -104,11 +109,29 @@
                 eScaDomain.getDomainCompositeHelper().activateDomain();
                 
                 // Start all the components
+                List<String> startedComponents = new ArrayList<String>();
                 for (DeployedArtifact artifact : contribution.getArtifacts()) {
                     if (artifact.getModel() instanceof Composite) {
                         Composite composite = (Composite)artifact.getModel();
                         for(Component component: composite.getComponents()) {
                             eScaDomain.getDomainCompositeHelper().startComponent(eScaDomain.getDomainCompositeHelper().getComponent(component.getName()));
+                            startedComponents.add(component.getName());
+                        }
+                    }
+                }
+                
+                // Start other components
+                // TODO: Eliminate this when EmbeddedSCADomain is fixed.  This is added as a hack as adding a new contribution is rendering the already existing services in the domain unusable
+                if(startOtherComponents) {
+                    for(String componentName: eScaDomain.getDomainCompositeHelper().getComponentNames()) {
+                        if(startedComponents.contains(componentName)) {
+                            continue;
+                        }
+                        try{
+                            eScaDomain.getDomainCompositeHelper().startComponent(eScaDomain.getDomainCompositeHelper().getComponent(componentName));
+                        } catch(Throwable t) {
+                            // TODO: Anything else but ignore ??
+                            Throwable cause = t.getCause();
                         }
                     }
                 }
@@ -129,6 +152,8 @@
                 scaDomain.close();
             } else {
                 EmbeddedSCADomain eScaDomain = (EmbeddedSCADomain)scaDomain;
+                
+                // Remove contribution
                 eScaDomain.getContributionService().remove(contributionRoot);
 
                 // Stop all the components
@@ -177,6 +202,7 @@
             infoFactory.addAttribute("SCADomain", "org.apache.tuscany.sca.host.embedded.SCADomain", false, true);
             infoFactory.addAttribute("jndiName", String.class, false, true);
             infoFactory.addAttribute("useEmbeddedDomain", boolean.class, true, true);
+            infoFactory.addAttribute("startOtherComponents", boolean.class, true, true);
             infoFactory.addInterface(SCADomainInterface.class);
             infoFactory.setConstructor(new String[]{"embeddedSCADomainRef", "classLoader","serverInfo","abstractName","domainURI","jndiName"});
             GBEAN_INFO = infoFactory.getBeanInfo();
@@ -200,5 +226,9 @@
 
         public void setUseEmbeddedDomain(boolean useEmbeddedDomain) {
             this.useEmbeddedDomain = useEmbeddedDomain;
+        }
+
+        public void setStartOtherComponents(boolean startOtherComponents) {
+            this.startOtherComponents = startOtherComponents;
         }
 }

Modified: geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/TuscanyBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/TuscanyBuilder.java?view=diff&rev=559533&r1=559532&r2=559533
==============================================================================
--- geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/TuscanyBuilder.java (original)
+++ geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/TuscanyBuilder.java Wed Jul 25 10:43:08 2007
@@ -77,6 +77,8 @@
     private final ClassLoader classLoader;    
     private final AbstractNameQuery serverInfoQuery;
     private final AbstractNameQuery embeddedSCADomainQuery;
+    private boolean useEmbeddedDomain = true;
+    private boolean startOtherComponents = true;
     
     public TuscanyBuilder(Environment defaultEnvironment, Collection repositories, Kernel kernel, ClassLoader classLoader, AbstractNameQuery serverInfoQuery, AbstractNameQuery embeddedSCADomainQuery) {
         this.defaultEnvironment = defaultEnvironment;
@@ -308,12 +310,22 @@
         GBeanData data = new GBeanData(abstractName, gBeanInfo);        
         data.setReferencePattern("embeddedSCADomainRef", embeddedSCADomainQuery);
         data.setReferencePattern("serverInfo", serverInfoQuery);
+        data.setAttribute("useEmbeddedDomain", useEmbeddedDomain);
+        data.setAttribute("startOtherComponents", startOtherComponents);
         data.setAttribute("domainURI", domainURI);
         data.setAttribute("jarFileName",jarFileName);
         data.setAttribute("jndiName",jndiName);
         return data;
     }    
-        
+
+    public void setUseEmbeddedDomain(boolean useEmbeddedDomain) {
+        this.useEmbeddedDomain = useEmbeddedDomain;
+    }
+
+    public void setStartOtherComponents(boolean startOtherComponents) {
+        this.startOtherComponents = startOtherComponents;
+    }
+    
     public static final GBeanInfo GBEAN_INFO;
 
     static {
@@ -323,6 +335,8 @@
         infoFactory.addAttribute("defaultEnvironment", Environment.class, true);        
         infoFactory.addAttribute("serverInfoQuery", AbstractNameQuery.class, true, true);
         infoFactory.addAttribute("embeddedSCADomainQuery", AbstractNameQuery.class, true, true);
+        infoFactory.addAttribute("useEmbeddedDomain", boolean.class, true, true);
+        infoFactory.addAttribute("startOtherComponents", boolean.class, true, true);
         infoFactory.addAttribute("kernel", Kernel.class, false, false);
         infoFactory.addAttribute("classLoader",ClassLoader.class,false);
         infoFactory.addReference("Repository", Repository.class, "Repository");

Modified: geronimo/sandbox/tuscany-integration/geronimo-tuscany/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/tuscany-integration/geronimo-tuscany/pom.xml?view=diff&rev=559533&r1=559532&r2=559533
==============================================================================
--- geronimo/sandbox/tuscany-integration/geronimo-tuscany/pom.xml (original)
+++ geronimo/sandbox/tuscany-integration/geronimo-tuscany/pom.xml Wed Jul 25 10:43:08 2007
@@ -45,10 +45,22 @@
 </distributionManagement>
 	
     <repositories>
+         <repository>
+            <id>apache-incubating</id>
+            <name>Apache Incubating Repository</name>
+            <url>http://people.apache.org/repo/m2-incubating-repository</url>
+            <layout>default</layout>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+        </repository>
         <repository>
             <id>ws.zones</id>
             <name>ws.zones</name>
-            <url>http://ws.zones.apache.org/repository/</url>
+            <url>http://ws.zones.apache.org/repository</url>
             <layout>default</layout>
             <snapshots>
                 <enabled>true</enabled>
@@ -75,7 +87,7 @@
         <repository>
             <id>tomcat-m2-repo</id>
             <name>Codehaus M2 Repository</name>
-            <url>http://repository.codehaus.org/</url>
+            <url>http://repository.codehaus.org</url>
             <layout>default</layout>
             <snapshots>
                 <enabled>false</enabled>
@@ -84,10 +96,10 @@
                 <enabled>true</enabled>
             </releases>
         </repository>
-        <repository>
-            <id>ussg-maven-repo</id>
-            <name>USSG M2 Repository</name>
-            <url>http://ftp.ussg.iu.edu/eclipse/modeling/emf/emf/maven2/</url>
+       <!--repository>
+            <id>ibiblio-m2-repo</id>
+            <name>iBiblio M2 Repository</name>
+            <url>http://mirrors.ibiblio.org/pub/mirrors/maven2</url>
             <layout>default</layout>
             <snapshots>
                 <enabled>false</enabled>
@@ -95,29 +107,29 @@
             <releases>
                 <enabled>true</enabled>
             </releases>
-        </repository>
+        </repository-->
         <repository>
-            <id>ibiblio-m2-repo</id>
-            <name>iBiblio M2 Repository</name>
-            <url>http://mirrors.ibiblio.org/pub/mirrors/maven2/</url>
+            <id>temp-repo</id>
+            <name>Temp M2 Repository</name>
+            <url>http://people.apache.org/~manugeorge/repository</url>
             <layout>default</layout>
             <snapshots>
-                <enabled>false</enabled>
+                <enabled>true</enabled>
             </snapshots>
             <releases>
-                <enabled>true</enabled>
+                <enabled>false</enabled>
             </releases>
         </repository>
         <repository>
-            <id>temp-repo</id>
-            <name>Temp M2 Repository</name>
-            <url>http://people.apache.org/~manugeorge/repository/</url>
+            <id>ussg-maven-repo</id>
+            <name>USSG M2 Repository</name>
+            <url>http://ftp.ussg.iu.edu/eclipse/modeling/emf/emf/maven2</url>
             <layout>default</layout>
             <snapshots>
-                <enabled>true</enabled>
+                <enabled>false</enabled>
             </snapshots>
             <releases>
-                <enabled>false</enabled>
+                <enabled>true</enabled>
             </releases>
         </repository>
 
@@ -165,12 +177,12 @@
       <dependency>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>sca-api</artifactId>        
-        <version>1.0-incubating-SNAPSHOT</version>            
+        <version>0.91-incubating</version>            
       </dependency>                    
       <dependency>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-core</artifactId>        
-        <version>1.0-incubating-SNAPSHOT</version>            
+        <version>0.91-incubating</version>            
       </dependency>                    
       
       <dependency>

Added: geronimo/sandbox/tuscany-integration/miscellaneous/additional-jars.zip
URL: http://svn.apache.org/viewvc/geronimo/sandbox/tuscany-integration/miscellaneous/additional-jars.zip?view=auto&rev=559533
==============================================================================
Binary file - no diff available.

Propchange: geronimo/sandbox/tuscany-integration/miscellaneous/additional-jars.zip
------------------------------------------------------------------------------
    svn:mime-type = application/zip

Modified: geronimo/sandbox/tuscany-integration/modules/tuscany-http-geronimo/src/main/java/org/apache/tuscany/sca/http/geronimo/GeronimoServletHost.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/tuscany-integration/modules/tuscany-http-geronimo/src/main/java/org/apache/tuscany/sca/http/geronimo/GeronimoServletHost.java?view=diff&rev=559533&r1=559532&r2=559533
==============================================================================
--- geronimo/sandbox/tuscany-integration/modules/tuscany-http-geronimo/src/main/java/org/apache/tuscany/sca/http/geronimo/GeronimoServletHost.java (original)
+++ geronimo/sandbox/tuscany-integration/modules/tuscany-http-geronimo/src/main/java/org/apache/tuscany/sca/http/geronimo/GeronimoServletHost.java Wed Jul 25 10:43:08 2007
@@ -45,6 +45,7 @@
 import org.apache.geronimo.kernel.InternalKernelException;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.KernelRegistry;
+import org.apache.geronimo.kernel.proxy.GeronimoManagedBean;
 import org.apache.geronimo.management.geronimo.NetworkConnector;
 import org.apache.geronimo.tomcat.ObjectRetriever;
 import org.apache.geronimo.tomcat.TomcatContainer;
@@ -116,8 +117,9 @@
         if (port == -1) {
             port = DEFAULT_PORT;
         }
-        for(int i=0;i<connectors.length;i++){
-            if(port == connectors[0].getPort())    {
+        for(int i=0;i<connectors.length; i++){
+            GeronimoManagedBean gmbean = (GeronimoManagedBean)connectors[i];
+            if(gmbean.getStateInstance().isRunning() && port == connectors[i].getPort())    {
                 validport = true;
                 break;
             }

Added: geronimo/sandbox/tuscany-integration/samples/helloWorld-ws.jar
URL: http://svn.apache.org/viewvc/geronimo/sandbox/tuscany-integration/samples/helloWorld-ws.jar?view=auto&rev=559533
==============================================================================
Binary file - no diff available.

Propchange: geronimo/sandbox/tuscany-integration/samples/helloWorld-ws.jar
------------------------------------------------------------------------------
    svn:mime-type = application/java-archive



Mime
View raw message