geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vamsic...@apache.org
Subject svn commit: r559099 [3/7] - in /geronimo/sandbox/tuscany-integration: ./ geronimo-tuscany/ geronimo-tuscany/configs/ geronimo-tuscany/configs/src/main/resources/META-INF/ geronimo-tuscany/configs/src/plan/ geronimo-tuscany/modules/ geronimo-tuscany/mod...
Date Tue, 24 Jul 2007 16:49:09 GMT
Propchange: geronimo/sandbox/tuscany-integration/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/tuscany-integration/LICENSE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/tuscany-integration/LICENSE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/sandbox/tuscany-integration/README.TXT
URL: http://svn.apache.org/viewvc/geronimo/sandbox/tuscany-integration/README.TXT?view=diff&rev=559099&r1=559098&r2=559099
==============================================================================
--- geronimo/sandbox/tuscany-integration/README.TXT (original)
+++ geronimo/sandbox/tuscany-integration/README.TXT Tue Jul 24 09:49:03 2007
@@ -1,7 +1,7 @@
-1. Checkout the source to a directory of your choice.  Call it <g_t_dir>
-2. Change directory to <g_t_dir>
+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>\configs\target\tuscany-plugin-1.0.car"
+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/

Modified: geronimo/sandbox/tuscany-integration/geronimo-tuscany/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/tuscany-integration/geronimo-tuscany/configs/pom.xml?view=diff&rev=559099&r1=559098&r2=559099
==============================================================================
--- geronimo/sandbox/tuscany-integration/geronimo-tuscany/configs/pom.xml (original)
+++ geronimo/sandbox/tuscany-integration/geronimo-tuscany/configs/pom.xml Tue Jul 24 09:49:03 2007
@@ -16,34 +16,69 @@
     <dependencies>
      
         <dependency>
-            <groupId>geronimo</groupId>
+            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>2.0-SNAPSHOT</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-j2ee-server</artifactId>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-server</artifactId>
             <version>2.0-SNAPSHOT</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-j2ee-deployer</artifactId>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-deployer</artifactId>
             <version>2.0-SNAPSHOT</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
-
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>server-security-config</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>transaction</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jasper</artifactId>                
+            <version>2.0-SNAPSHOT</version>
+            <type>car</type>
+            <scope>provided</scope>
+         </dependency>                
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>webservices-common</artifactId>                
+            <version>2.0-SNAPSHOT</version>
+            <type>car</type>
+            <scope>provided</scope>
+         </dependency>                
+        <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>coyote</artifactId>                
+            <version>6.0.13</version>
+            <type>jar</type>
+            <scope>provided</scope>
+         </dependency>                
     </dependencies>
     <build>
 
-        <plugins>                      
+        <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>car-maven-plugin</artifactId>
+                <version>2.0-SNAPSHOT</version>
                 <extensions>true</extensions> 
                 <configuration>
                     <deploymentConfigs>

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=559099&r1=559098&r2=559099
==============================================================================
--- 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 Tue Jul 24 09:49:03 2007
@@ -32,50 +32,101 @@
     <prerequisite>
         <id>org.apache.geronimo.configs/rmi-naming//car</id>        
         <description>
-            This deployer will work for both jetty and tomcat binaries
+            This deployer will work for tomcat binaries
         </description>
     </prerequisite>
-    <dependency>org.apache.geronimo.configs/rmi-naming//car</dependency>
-    <dependency>org.apache.tuscany/commonj-api//jar</dependency>
-    <dependency>org.apache.tuscany/sca-api//jar</dependency>
-    <dependency>stax/stax-api//jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-assembly//jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-assembly-xml//jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-contribution//jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-contribution-impl//jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-core//jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-core-databinding//jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-core-spi//jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-databinding//jar</dependency> 
-    <dependency>org.apache.tuscany.sca/tuscany-host-embedded//jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-host-http//jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-host-webapp//jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-implementation-java//jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-implementation-java-runtime//jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-implementation-java-xml//jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-interface//jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-interface-java//jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-interface-java-runtime//jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-interface-java-xml//jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-interface-wsdl//jar</dependency>       
-    <dependency>org.apache.tuscany.sca/tuscany-interface-wsdl-runtime//jar</dependency>    
-    <dependency>org.apache.tuscany.sca/tuscany-interface-wsdl-xml//jar</dependency>   
-    <dependency>org.apache.tuscany.sca/tuscany-policy//jar</dependency>     
-    <dependency>wsdl4j/wsdl4j//jar</dependency>
-    <dependency>org.codehaus.woodstox/wstx-asl//jar</dependency>
-    <dependency>org.apache.ws.commons.schema/XmlSchema//jar</dependency>
-    <dependency>org.eclipse.emf/common//jar</dependency>
-    <dependency>org.eclipse.emf/ecore//jar</dependency>
-    <dependency>org.eclipse.emf/ecore-change//jar</dependency>
-    <dependency>org.eclipse.emf/ecore-xmi//jar</dependency>
-    <dependency>log4j/log4j//jar</dependency>
-    <dependency>commonj/sdo-api-r2.1/1.0-incubating-SNAPSHOT/jar</dependency>
-    <dependency>org.apache.tuscany.das/tuscany-das-rdb/1.0-incubating-SNAPSHOT/jar</dependency>
-    <dependency>org.apache.tuscany.sdo/tuscany-sdo-impl/1.0-incubating-SNAPSHOT/jar</dependency>
-    <dependency>org.eclipse.xsd/xsd//jar</dependency>                             
-    <dependency>org.apache.geronimo.configs/geronimo-gbean-deployer//jar</dependency>    
+        <dependency>org.apache.geronimo.configs/rmi-naming/2.0-SNAPSHOT/car</dependency>
+        <dependency>org.apache.geronimo.configs/tomcat6/2.0-SNAPSHOT/car</dependency>
+        <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.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>      
+        <dependency>org.apache.ws.commons.axiom/axiom-impl/SNAPSHOT/jar</dependency>      
+        <dependency>org.apache.ws.commons.schema/XmlSchema/1.3.1/jar</dependency>      
+        <dependency>commons-logging/commons-logging/1.0.4/jar</dependency>      
+        <dependency>commons-httpclient/commons-httpclient/3.0.1/jar</dependency>      
+        <dependency>commons-codec/commons-codec/1.3/jar</dependency>      
+        <dependency>org.apache.xmlbeans/xmlbeans/2.3.0/jar</dependency>      
+        <dependency>jaxen/jaxen/1.1-beta-11/jar</dependency>      
+        <dependency>annogen/annogen/0.1.0/jar</dependency>
+        <dependency>xml-resolver/xml-resolver/1.1/jar</dependency>      
+        <dependency>org.apache.neethi/neethi/2.0/jar</dependency>      
+        <dependency>com.sun.xml.ws/jaxws-tools/2.0/jar</dependency>      
+        <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>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-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-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-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/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>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>                  
+        <dependency>org.eclipse.emf/common/2.1.0/jar</dependency>                  
+        <dependency>org.eclipse.emf/ecore/2.2.2/jar</dependency>
+        <dependency>org.eclipse.emf/ecore-change/2.2.2/jar</dependency>                   
+        <dependency>org.eclipse.emf/ecore-xmi/2.2.2/jar</dependency>
+        <dependency>log4j/log4j/1.2.14/jar</dependency>
+        <dependency>commonj/sdo-api-r2.1/1.0-incubating-SNAPSHOT/jar</dependency>
+        <dependency>commons-fileupload/commons-fileupload/1.1.1/jar</dependency>
+        <dependency>org.apache.tuscany.das/tuscany-das-rdb/1.0-incubating-SNAPSHOT/jar</dependency>                  
+        <dependency>org.apache.tuscany.sdo/tuscany-sdo-impl/1.0-incubating-SNAPSHOT/jar</dependency>           
+        <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://mirrors.ibiblio.org/pub/mirrors/maven2/</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>
 </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=559099&r1=559098&r2=559099
==============================================================================
--- geronimo/sandbox/tuscany-integration/geronimo-tuscany/configs/src/plan/plan.xml (original)
+++ geronimo/sandbox/tuscany-integration/geronimo-tuscany/configs/src/plan/plan.xml Tue Jul 24 09:49:03 2007
@@ -1,301 +1,612 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-  <environment>
-    <moduleId>
-      <groupId>org.apache.geronimo.configs</groupId>
-      <artifactId>tuscany-plugin</artifactId>
-      <version>1.0</version>
-      <type>car</type>
-    </moduleId>
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>rmi-naming</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <type>car</type>
-      </dependency>     
-      <dependency>
-        <groupId>org.apache.tuscany</groupId>
-        <artifactId>commonj-api</artifactId>
-        <version>1.0-incubating-SNAPSHOT</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>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency> 
-      <dependency>
-        <groupId>stax</groupId>
-        <artifactId>stax-api</artifactId>
-        <version>1.0.1</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency> 
-      <dependency>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-assembly</artifactId>
-        <version>1.0-incubating-SNAPSHOT</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>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency> 
-      <dependency>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-contribution</artifactId>
-        <version>1.0-incubating-SNAPSHOT</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>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency> 
-      <dependency>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-core</artifactId>
-        <version>1.0-incubating-SNAPSHOT</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>
-        <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>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency> 
-      <dependency>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-databinding</artifactId>
-        <version>1.0-incubating-SNAPSHOT</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>
-        <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>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency> 
-      <dependency>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-host-webapp</artifactId>
-        <version>1.0-incubating-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency> 
-      <dependency>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-implementation-java</artifactId>
-        <version>1.0-incubating-SNAPSHOT</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>
-        <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>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency> 
-      <dependency>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-interface</artifactId>
-        <version>1.0-incubating-SNAPSHOT</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>
-        <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>
-        <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>
-        <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>
-        <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>
-        <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>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency> 
-      <dependency>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-policy</artifactId>
-        <version>1.0-incubating-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency> 
-      <dependency>
-        <groupId>wsdl4j</groupId>
-        <artifactId>wsdl4j</artifactId>
-        <version>1.6.1</version>
-<!-- unable to find 1.6.2 in any repo -->
-        <type>jar</type>
-        <import>classes</import>
-      </dependency> 
-      <dependency>
-        <groupId>org.codehaus.woodstox</groupId>
-        <artifactId>wstx-asl</artifactId>
-        <version>3.2.0</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency> 
-      <dependency>
-        <groupId>org.apache.ws.commons.schema</groupId>
-        <artifactId>XmlSchema</artifactId>
-        <version>1.3.1</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>                               
-      <dependency>
-        <groupId>org.eclipse.emf</groupId>
-        <artifactId>common</artifactId>
-        <version>2.1.0</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>                         
-      <dependency>
-        <groupId>org.eclipse.emf</groupId>
-        <artifactId>ecore</artifactId>
-        <version>2.2.2</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>                         
-      <dependency>
-        <groupId>org.eclipse.emf</groupId>
-        <artifactId>ecore-change</artifactId>        
-	<version>2.2.2</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>                         
-      <dependency>
-        <groupId>org.eclipse.emf</groupId>
-        <artifactId>ecore-xmi</artifactId>        
-	<version>2.2.2</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>                         
-      <dependency>
-        <groupId>log4j</groupId>
-        <artifactId>log4j</artifactId>
-     	  <version>1.2.14</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>                         
-      <dependency>
-        <groupId>commonj</groupId>
-        <artifactId>sdo-api-r2.1</artifactId>        
-        <version>1.0-incubating-SNAPSHOT</version>
-        <type>jar</type>        
-        <import>classes</import>
-      </dependency>                         
-      <dependency>
-        <groupId>org.apache.tuscany.das</groupId>
-        <artifactId>tuscany-das-rdb</artifactId>
-        <version>1.0-incubating-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>                         
-      <dependency>
-        <groupId>org.apache.tuscany.sdo</groupId>
-        <artifactId>tuscany-sdo-impl</artifactId>        
-        <version>1.0-incubating-SNAPSHOT</version>
-        <type>jar</type>
-        <import>classes</import>
-      </dependency>                         
-      <dependency>
-        <groupId>org.eclipse.xsd</groupId>
-        <artifactId>xsd</artifactId>
-        <version>2.1.1</version>
-        <type>jar</type>
-        <import>classes</import>
-       </dependency>       
-          <dependency>
+    <environment>
+        <moduleId>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <artifactId>tuscany-plugin</artifactId>
+            <version>1.0</version>
             <type>car</type>
-          </dependency>      
-    </dependencies>
-    <hidden-classes/>
-    <non-overridable-classes/>    
-  </environment>
-      <gbean name="TuscanyBuilder" class="org.apache.geronimo.tuscany.TuscanyBuilder">
-          <reference name="Repository"/>          
-          <attribute name="serverInfoQuery">?name=ServerInfo</attribute>
-          <xml-attribute name="defaultEnvironment">
-              <environment>
-                  <dependencies>
-                      <dependency>
-                          <groupId>org.apache.geronimo.configs</groupId>
-                          <artifactId>tuscany-plugin</artifactId>
-                          <type>car</type>
-                      </dependency>
-                  </dependencies>
-              </environment>
-          </xml-attribute>
-      </gbean>
+        </moduleId>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>rmi-naming</artifactId>
+                <version>2.0-SNAPSHOT</version>
+                <type>car</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>tomcat6</artifactId>
+                <version>2.0-SNAPSHOT</version>
+                <type>car</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>jasper</artifactId>
+                <version>2.0-SNAPSHOT</version>
+                <type>car</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-axis2</artifactId>
+                <version>2.0-SNAPSHOT</version>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-j2ee-schema</artifactId>
+                <version>2.0-SNAPSHOT</version>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.axis2</groupId>
+                <artifactId>axis2-java2wsdl</artifactId>
+                <version>SNAPSHOT</version>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.axis2</groupId>
+                <artifactId>axis2-kernel</artifactId>
+                <version>SNAPSHOT</version>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.axis2</groupId>
+                <artifactId>axis2-adb</artifactId>
+                <version>SNAPSHOT</version>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.axis2</groupId>
+                <artifactId>axis2-jaxws</artifactId>
+                <version>SNAPSHOT</version>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.axis2</groupId>
+                <artifactId>axis2-jaxws-api</artifactId>
+                <version>SNAPSHOT</version>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.axis2</groupId>
+                <artifactId>axis2-metadata</artifactId>
+                <version>SNAPSHOT</version>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.axis2</groupId>
+                <artifactId>axis2-saaj</artifactId>
+                <version>SNAPSHOT</version>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpcore</artifactId>
+                <version>4.0-alpha5</version>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.ws.commons.axiom</groupId>
+                <artifactId>axiom-api</artifactId>
+                <version>SNAPSHOT</version>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.ws.commons.axiom</groupId>
+                <artifactId>axiom-dom</artifactId>
+                <version>SNAPSHOT</version>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.ws.commons.axiom</groupId>
+                <artifactId>axiom-impl</artifactId>
+                <version>SNAPSHOT</version>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.ws.commons.schema</groupId>
+                <artifactId>XmlSchema</artifactId>
+                <version>1.3.1</version>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
+                <version>1.0.4</version>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>commons-httpclient</groupId>
+                <artifactId>commons-httpclient</artifactId>
+                <version>3.0.1</version>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>commons-codec</groupId>
+                <artifactId>commons-codec</artifactId>
+                <version>1.3</version>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.xmlbeans</groupId>
+                <artifactId>xmlbeans</artifactId>
+                <version>2.3.0</version>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>jaxen</groupId>
+                <artifactId>jaxen</artifactId>
+                <version>1.1-beta-11</version>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>annogen</groupId>
+                <artifactId>annogen</artifactId>
+                <version>0.1.0</version>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>xml-resolver</groupId>
+                <artifactId>xml-resolver</artifactId>
+                <version>1.1</version>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.neethi</groupId>
+                <artifactId>neethi</artifactId>
+                <version>2.0</version>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>com.sun.xml.ws</groupId>
+                <artifactId>jaxws-tools</artifactId>
+                <version>2.0</version>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>com.sun.xml.ws</groupId>
+                <artifactId>jaxws-rt</artifactId>
+                <version>2.0</version>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>com.sun.xml.bind</groupId>
+                <artifactId>jaxb-xjc</artifactId>
+                <version>2.0.5</version>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>backport-util-concurrent</groupId>
+                <artifactId>backport-util-concurrent</artifactId>
+                <version>2.2</version>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tuscany</groupId>
+                <artifactId>commonj-api</artifactId>
+                <version>1.0-incubating-SNAPSHOT</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>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>stax</groupId>
+                <artifactId>stax-api</artifactId>
+                <version>1.0.1</version>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tuscany.sca</groupId>
+                <artifactId>tuscany-assembly</artifactId>
+                <version>1.0-incubating-SNAPSHOT</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>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tuscany.sca</groupId>
+                <artifactId>tuscany-contribution</artifactId>
+                <version>1.0-incubating-SNAPSHOT</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>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tuscany.sca</groupId>
+                <artifactId>tuscany-core</artifactId>
+                <version>1.0-incubating-SNAPSHOT</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>
+                <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>
+                <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>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.tuscany.sca</groupId>
+                <artifactId>tuscany-databinding</artifactId>
+                <version>1.0-incubating-SNAPSHOT</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>
+                <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>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tuscany.sca</groupId>
+                <artifactId>tuscany-host-geronimo</artifactId>
+                <version>1.0-incubating-SNAPSHOT</version>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tuscany.sca</groupId>
+                <artifactId>tuscany-implementation-java</artifactId>
+                <version>1.0-incubating-SNAPSHOT</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>
+                <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>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tuscany.sca</groupId>
+                <artifactId>tuscany-interface</artifactId>
+                <version>1.0-incubating-SNAPSHOT</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>
+                <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>
+                <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>
+                <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>
+                <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>
+                <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>
+                <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>
+                <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>
+                <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>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tuscany.sca</groupId>
+                <artifactId>tuscany-policy</artifactId>
+                <version>1.0-incubating-SNAPSHOT</version>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tuscany.sca</groupId>
+                <artifactId>geronimo-host-rmi</artifactId>
+                <version>1.0-incubating-SNAPSHOT</version>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <!-- ********************************************************-->
+            <dependency>
+                <groupId>org.apache.tuscany.sca</groupId>
+                <artifactId>tuscany-binding-feed</artifactId>
+                <version>1.0-incubating-SNAPSHOT</version>
+                <type>jar</type>
+                <import>classes</import>
+            </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>
+                <groupId>org.apache.tuscany.sca</groupId>
+                <artifactId>tuscany-binding-jsonrpc</artifactId>
+                <version>1.0-incubating-SNAPSHOT</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>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tuscany.sca</groupId>
+                <artifactId>tuscany-binding-sca</artifactId>
+                <version>1.0-incubating-SNAPSHOT</version>
+                <type>jar</type>
+                <import>classes</import>
+            </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-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>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+
+            <!-- ********************************************************-->
+            <dependency>
+                <groupId>wsdl4j</groupId>
+                <artifactId>wsdl4j</artifactId>
+                <version>1.6.1</version>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>org.codehaus.woodstox</groupId>
+                <artifactId>wstx-asl</artifactId>
+                <version>3.2.0</version>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.ws.commons.schema</groupId>
+                <artifactId>XmlSchema</artifactId>
+                <version>1.3.1</version>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.emf</groupId>
+                <artifactId>common</artifactId>
+                <version>2.1.0</version>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.emf</groupId>
+                <artifactId>ecore</artifactId>
+                <version>2.2.2</version>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.emf</groupId>
+                <artifactId>ecore-change</artifactId>
+                <version>2.2.2</version>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.emf</groupId>
+                <artifactId>ecore-xmi</artifactId>
+                <version>2.2.2</version>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>log4j</groupId>
+                <artifactId>log4j</artifactId>
+                <version>1.2.14</version>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>commonj</groupId>
+                <artifactId>sdo-api-r2.1</artifactId>
+                <version>1.0-incubating-SNAPSHOT</version>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>commons-fileupload</groupId>
+                <artifactId>commons-fileupload</artifactId>
+                <version>1.1.1</version>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tuscany.das</groupId>
+                <artifactId>tuscany-das-rdb</artifactId>
+                <version>1.0-incubating-SNAPSHOT</version>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tuscany.sdo</groupId>
+                <artifactId>tuscany-sdo-impl</artifactId>
+                <version>1.0-incubating-SNAPSHOT</version>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.xsd</groupId>
+                <artifactId>xsd</artifactId>
+                <version>2.1.1</version>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>geronimo-gbean-deployer</artifactId>
+                <version>2.0-SNAPSHOT</version>
+                <type>car</type>
+            </dependency>
+        </dependencies>
+        <hidden-classes>
+            <filter>org.apache.axis</filter>
+        </hidden-classes>
+        <non-overridable-classes />
+    </environment>
+    <!-- <gbean name="ConfigDependencyGBean" class="org.apache.geronimo.tuscany.ConfigDependencyGBean"/> -->
+    <gbean name="TuscanyBuilder"
+        class="org.apache.geronimo.tuscany.TuscanyBuilder">
+        <reference name="Repository" />
+        <attribute name="serverInfoQuery">?name=ServerInfo</attribute>
+        <attribute name="embeddedSCADomainQuery">?name=GeronimoSCADomain</attribute>
+        <xml-attribute name="defaultEnvironment">
+            <environment>
+                <dependencies>
+                    <!--<dependency>
+                        <groupId>org.apache.geronimo.configs</groupId>
+                        <artifactId>rmi-naming</artifactId>
+                        <type>car</type>
+                        </dependency>-->
+                    <dependency>
+                        <groupId>org.apache.geronimo.configs</groupId>
+                        <artifactId>tuscany-plugin</artifactId>
+                        <type>car</type>
+                    </dependency>
+                </dependencies>
+            </environment>
+        </xml-attribute>
+    </gbean>
+    <gbean name="GeronimoSCADomain" class="org.apache.geronimo.tuscany.EmbeddedSCADomainGBean">
+        <attribute name="domainUri">http://localhost:8080/</attribute>
+    </gbean>
 </module>

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=559099&r1=559098&r2=559099
==============================================================================
--- geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/pom.xml (original)
+++ geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/pom.xml Tue Jul 24 09:49:03 2007
@@ -65,9 +65,9 @@
         <version>2.0-SNAPSHOT</version>            
       </dependency>                          
       <dependency>
-        <groupId>xmlbeans</groupId>
-        <artifactId>xbean</artifactId>
-        <version>2.0.0</version>
+        <groupId>org.apache.xmlbeans</groupId>
+        <artifactId>xmlbeans</artifactId>
+        <version>2.3.0</version>
       </dependency>
       <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
@@ -95,7 +95,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
-                <version>2.0.1-SNAPSHOT</version>
+                <version>2.3.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
@@ -105,11 +105,11 @@
                 </executions>
                 <configuration>
                     <download>true</download>
-                    <sourceSchemas>geronimo-tuscany-0.3.xsd</sourceSchemas>
+                    <!-- <sourceSchemas>geronimo-tuscany-0.3.xsd</sourceSchemas>
                     <schemaDirectory>src/main/schema</schemaDirectory>
                     <xmlConfigs>
                         <xmlConfig implementation="java.io.File">src/main/schema/xmlconfig.xml</xmlConfig>
-                    </xmlConfigs>
+                    </xmlConfigs> -->
                 </configuration>
             </plugin>
             <plugin>

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=559099&r1=559098&r2=559099
==============================================================================
--- 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 Tue Jul 24 09:49:03 2007
@@ -18,6 +18,8 @@
  */
 package org.apache.geronimo.tuscany;
 
+import java.net.URL;
+
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
@@ -27,110 +29,176 @@
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.system.serverinfo.ServerInfo;
+import org.apache.tuscany.sca.assembly.Component;
+import org.apache.tuscany.sca.assembly.Composite;
+import org.apache.tuscany.sca.contribution.Contribution;
+import org.apache.tuscany.sca.contribution.DeployedArtifact;
+import org.apache.tuscany.sca.contribution.resolver.impl.ModelResolverImpl;
 import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.host.embedded.impl.ReallySmallRuntime;
+import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
 
 
 public class EmbeddedRuntimeGBean implements GBeanLifecycle, SCADomainInterface {
-	
-	private ClassLoader classLoader;
-	
-	
-	private SCADomain scaDomain;
-	private ServerInfo serverInfo;
-	private AbstractName abstractName;
-	private String domainURI;
-	private String jarFileName;
-	private String jndiName;
-	private InitialContext ctx;
-//	private static final String jndiPath = "ger:/";
-	
-	public EmbeddedRuntimeGBean(ClassLoader classLoader, ServerInfo serverInfo, AbstractName abstractName, String domainURI, String jndiName){
-		this.classLoader = Thread.currentThread().getContextClassLoader();
-		this.jndiName = jndiName;	    
-	    this.serverInfo = serverInfo;
-	    this.abstractName = abstractName;
-	    this.domainURI = domainURI;	    
-	    try {
-			ctx = new InitialContext();
-		} catch (NamingException e) {
-			throw new IllegalStateException("JNDI Name service is not properly initialized");
-		}
-	    
-	}
-	
-	public EmbeddedRuntimeGBean(){
-		this.classLoader = null;			    
-	    this.serverInfo = null;
-	    this.abstractName = null;
-	    this.domainURI = null;
-	    this.jndiName = "";
-	    try {
-			ctx = new InitialContext();
-		} catch (NamingException e) {
-			throw new IllegalStateException("JNDI Name service is not properly initialized");
-		}
-	}
+    private ClassLoader classLoader;
+    private EmbeddedSCADomainGBean embeddedSCADomainRef;
+    private boolean useEmbeddedDomain = true;
+    private Contribution contribution;
+    private String contributionRoot;
+    
+    
+    private SCADomain scaDomain;
+    private ServerInfo serverInfo;
+    private AbstractName abstractName;
+    private String domainURI;
+    private String jarFileName;
+    private String jndiName;
+    private InitialContext ctx;
+//    private static final String jndiPath = "ger:/";
+    
+    public EmbeddedRuntimeGBean(EmbeddedSCADomainGBean embeddedSCADomainRef, ClassLoader classLoader, ServerInfo serverInfo, AbstractName abstractName, String domainURI, String jndiName){
+        this.embeddedSCADomainRef = embeddedSCADomainRef;
+        this.classLoader = Thread.currentThread().getContextClassLoader();
+        this.jndiName = jndiName;        
+        this.serverInfo = serverInfo;
+        this.abstractName = abstractName;
+        this.domainURI = domainURI;        
+        try {
+            ctx = new InitialContext();
+        } catch (NamingException e) {
+            throw new IllegalStateException("JNDI Name service is not properly initialized");
+        }
+        
+    }
+    
+    public EmbeddedRuntimeGBean(){
+        this.classLoader = null;                
+        this.serverInfo = null;
+        this.abstractName = null;
+        this.domainURI = null;
+        this.jndiName = "";
+        try {
+            ctx = new InitialContext();
+        } catch (NamingException e) {
+            throw new IllegalStateException("JNDI Name service is not properly initialized");
+        }
+    }
       
-	public void doStart() throws Exception {
-        String contributionRoot = null;
+    public void doStart() throws Exception {
         try {
-        	contributionRoot = SCADomainHelper.getLocation(serverInfo, abstractName, jarFileName);
-        	scaDomain = SCADomain.newInstance(domainURI, contributionRoot, SCADomainHelper.getDeployableComposites(classLoader, serverInfo, abstractName, jarFileName));                        
+            contributionRoot = SCADomainHelper.getLocation(serverInfo, abstractName, jarFileName);
+            if(useEmbeddedDomain){    
+                scaDomain = embeddedSCADomainRef.getScaDomain();
+                EmbeddedSCADomain eScaDomain = (EmbeddedSCADomain)scaDomain;
+                ModelResolverImpl modelResolver = new ModelResolverImpl(classLoader);
+                contribution = eScaDomain.getContributionService().contribute(contributionRoot, new URL(contributionRoot), modelResolver, false);
+                
+                // Add composites
+                for (DeployedArtifact artifact : contribution.getArtifacts()) {
+                    if (artifact.getModel() instanceof Composite) {
+                        Composite composite = (Composite)artifact.getModel();
+                        eScaDomain.getDomainCompositeHelper().addComposite(composite);
+                    }
+                }
+                
+                // Activate domain
+                eScaDomain.getDomainCompositeHelper().activateDomain();
+                
+                // Start all the components
+                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()));
+                        }
+                    }
+                }
+                scaDomain = eScaDomain;
+            } else {
+                String[] composites = SCADomainHelper.getDeployableComposites(classLoader, serverInfo, abstractName, jarFileName);
+                scaDomain = SCADomain.newInstance(domainURI, contributionRoot, composites);
+            }
             ctx.bind(jndiName, scaDomain);
         } catch (Throwable e) {
-        	throw new Exception(e);
+            throw new Exception(e);
         }
-	}
+    }
 
-	public void doStop() throws Exception {
-		if (scaDomain != null) {
-            scaDomain.close();
+    public void doStop() throws Exception {
+        if (scaDomain != null) {
+            if(!useEmbeddedDomain){    
+                scaDomain.close();
+            } else {
+                EmbeddedSCADomain eScaDomain = (EmbeddedSCADomain)scaDomain;
+                eScaDomain.getContributionService().remove(contributionRoot);
+
+                // Stop all the components
+                for (DeployedArtifact artifact : contribution.getArtifacts()) {
+                    if (artifact.getModel() instanceof Composite) {
+                        Composite composite = (Composite)artifact.getModel();
+                        for(Component component: composite.getComponents()) {
+                            eScaDomain.getDomainCompositeHelper().stopComponent(eScaDomain.getDomainCompositeHelper().getComponent(component.getName()));
+                        }
+                    }
+                }
+                
+                // Remove composites
+                for (DeployedArtifact artifact : contribution.getArtifacts()) {
+                    if (artifact.getModel() instanceof Composite) {
+                        Composite composite = (Composite)artifact.getModel();
+                        eScaDomain.getDomainCompositeHelper().removeComposite(composite);
+                    }
+                }
+            }
             ctx.unbind(jndiName);
-        }		
-	}
+        }        
+    }
 
-	public void doFail() {
-		if (scaDomain != null) {
+    public void doFail() {
+        if (scaDomain != null) {
             scaDomain.close();
             try {
-				ctx.unbind(jndiName);
-			} catch (NamingException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-        }
-	}
-
-	 public static final GBeanInfo GBEAN_INFO;
-	    static {
-	        GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(EmbeddedRuntimeGBean.class,NameFactory.GERONIMO_SERVICE);
-	        infoFactory.addAttribute("classLoader", ClassLoader.class, false);
-	        infoFactory.addAttribute("abstractName", AbstractName.class, false);
-	        infoFactory.addAttribute("domainURI", String.class, true, true);
-	        infoFactory.addAttribute("jarFileName", String.class, true, true);
-	        infoFactory.addReference("serverInfo", ServerInfo.class);	     	        
-	        infoFactory.addAttribute("SCADomain", "org.apache.tuscany.sca.host.embedded.SCADomain", false, true);
-	        infoFactory.addAttribute("jndiName", String.class, false, true);
-	        infoFactory.addInterface(SCADomainInterface.class);
-	        infoFactory.setConstructor(new String[]{"classLoader","serverInfo","abstractName","domainURI","jndiName"});
-	        GBEAN_INFO = infoFactory.getBeanInfo();
-	    }
-
-	    public static GBeanInfo getGBeanInfo() {
-	        return GBEAN_INFO;
-	    }
-
-		public SCADomain getScaDomain() {
-			return scaDomain;
-		}
-
-		public String getJarFileName() {
-			return jarFileName;
-		}
-
-		public void setJarFileName(String jarFileName) {
-			this.jarFileName = jarFileName;
-		}	
+                ctx.unbind(jndiName);
+            } catch (NamingException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+        }
+    }
+
+     public static final GBeanInfo GBEAN_INFO;
+        static {
+            GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(EmbeddedRuntimeGBean.class,NameFactory.GERONIMO_SERVICE);
+            infoFactory.addAttribute("classLoader", ClassLoader.class, false);
+            infoFactory.addAttribute("abstractName", AbstractName.class, false);
+            infoFactory.addAttribute("domainURI", String.class, true, true);
+            infoFactory.addAttribute("jarFileName", String.class, true, true);
+            infoFactory.addReference("serverInfo", ServerInfo.class);
+            infoFactory.addReference("embeddedSCADomainRef", EmbeddedSCADomainGBean.class);
+            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.addInterface(SCADomainInterface.class);
+            infoFactory.setConstructor(new String[]{"embeddedSCADomainRef", "classLoader","serverInfo","abstractName","domainURI","jndiName"});
+            GBEAN_INFO = infoFactory.getBeanInfo();
+        }
 
+        public static GBeanInfo getGBeanInfo() {
+            return GBEAN_INFO;
+        }
+
+        public SCADomain getScaDomain() {
+            return scaDomain;
+        }
+
+        public String getJarFileName() {
+            return jarFileName;
+        }
+
+        public void setJarFileName(String jarFileName) {
+            this.jarFileName = jarFileName;
+        }    
+
+        public void setUseEmbeddedDomain(boolean useEmbeddedDomain) {
+            this.useEmbeddedDomain = useEmbeddedDomain;
+        }
 }

Added: geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/EmbeddedSCADomainGBean.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/EmbeddedSCADomainGBean.java?view=auto&rev=559099
==============================================================================
--- geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/EmbeddedSCADomainGBean.java (added)
+++ geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/EmbeddedSCADomainGBean.java Tue Jul 24 09:49:03 2007
@@ -0,0 +1,64 @@
+package org.apache.geronimo.tuscany;
+
+import org.apache.geronimo.gbean.AbstractName;
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.gbean.GBeanLifecycle;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
+
+public class EmbeddedSCADomainGBean implements GBeanLifecycle, SCADomainInterface{
+    
+    private AbstractName abstractName;
+    private EmbeddedSCADomain scaDomain;
+    private String domainUri;
+    private ClassLoader runtimeClassLoader;
+    
+    public EmbeddedSCADomainGBean(AbstractName abstractName, ClassLoader runtimeClassLoader, String domainUri) {
+        this.abstractName = abstractName;
+        this.runtimeClassLoader = runtimeClassLoader == null ? SCADomain.class.getClassLoader() : runtimeClassLoader;
+        this.domainUri = domainUri;
+    }
+
+    public EmbeddedSCADomainGBean() {
+        
+    }
+    public void doFail() {
+        // TODO Auto-generated method stub
+        
+    }
+
+    public void doStart() throws Exception {
+        // TODO Auto-generated method stub
+        scaDomain = new EmbeddedSCADomain(runtimeClassLoader, domainUri);
+        scaDomain.start();
+    }
+
+    public void doStop() throws Exception {
+        // TODO Auto-generated method stub
+        scaDomain.stop();
+        scaDomain = null;
+        
+    }
+    
+    public SCADomain getScaDomain() {
+        return scaDomain;
+    }
+
+    public static final GBeanInfo GBEAN_INFO;
+    
+    static {
+        GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(EmbeddedSCADomainGBean.class, NameFactory.GERONIMO_SERVICE);
+        infoFactory.addAttribute("abstractName", AbstractName.class, false);
+        infoFactory.addAttribute("runtimeClassLoader", ClassLoader.class, false);
+        infoFactory.addAttribute("domainUri", String.class, true, true);
+        infoFactory.addInterface(SCADomainInterface.class);
+        infoFactory.setConstructor(new String[]{"abstractName", "runtimeClassLoader", "domainUri"});
+        GBEAN_INFO = infoFactory.getBeanInfo();
+    }
+    
+    public static GBeanInfo getGBeanInfo() {
+        return GBEAN_INFO;
+    }
+}

Propchange: geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/EmbeddedSCADomainGBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/EmbeddedSCADomainGBean.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/EmbeddedSCADomainGBean.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

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=559099&r1=559098&r2=559099
==============================================================================
--- 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 Tue Jul 24 09:49:03 2007
@@ -76,14 +76,16 @@
     private final ConfigurationManager configurationManager;    
     private final ClassLoader classLoader;    
     private final AbstractNameQuery serverInfoQuery;
+    private final AbstractNameQuery embeddedSCADomainQuery;
     
-    public TuscanyBuilder(Environment defaultEnvironment, Collection repositories, Kernel kernel, ClassLoader classLoader, AbstractNameQuery serverInfoQuery) {
+    public TuscanyBuilder(Environment defaultEnvironment, Collection repositories, Kernel kernel, ClassLoader classLoader, AbstractNameQuery serverInfoQuery, AbstractNameQuery embeddedSCADomainQuery) {
         this.defaultEnvironment = defaultEnvironment;
         this.repositories = repositories;        
         naming = kernel.getNaming();
         configurationManager = ConfigurationUtil.getConfigurationManager(kernel);
         this.classLoader = classLoader;        
         this.serverInfoQuery = serverInfoQuery;
+        this.embeddedSCADomainQuery = embeddedSCADomainQuery;
     }
     
     public TuscanyBuilder(){
@@ -93,7 +95,7 @@
         configurationManager = null;
         this.classLoader = null;        
         this.serverInfoQuery = null;
-    	
+        this.embeddedSCADomainQuery = null;
     }
 
     public Object getDeploymentPlan(File planFile, JarFile jarFile, ModuleIDBuilder idBuilder) throws DeploymentException {
@@ -304,6 +306,7 @@
         AbstractName moduleName = naming.createRootName(parentModule, parentModule.toString(), "ServiceModule");
         AbstractName abstractName = naming.createChildName(moduleName, domainURI, "GBean");
         GBeanData data = new GBeanData(abstractName, gBeanInfo);        
+        data.setReferencePattern("embeddedSCADomainRef", embeddedSCADomainQuery);
         data.setReferencePattern("serverInfo", serverInfoQuery);
         data.setAttribute("domainURI", domainURI);
         data.setAttribute("jarFileName",jarFileName);
@@ -319,10 +322,11 @@
         infoFactory.addInterface(ConfigurationBuilder.class);
         infoFactory.addAttribute("defaultEnvironment", Environment.class, true);        
         infoFactory.addAttribute("serverInfoQuery", AbstractNameQuery.class, true, true);
+        infoFactory.addAttribute("embeddedSCADomainQuery", AbstractNameQuery.class, true, true);
         infoFactory.addAttribute("kernel", Kernel.class, false, false);
         infoFactory.addAttribute("classLoader",ClassLoader.class,false);
         infoFactory.addReference("Repository", Repository.class, "Repository");
-        infoFactory.setConstructor(new String[]{"defaultEnvironment", "Repository", "kernel", "classLoader", "serverInfoQuery"});
+        infoFactory.setConstructor(new String[]{"defaultEnvironment", "Repository", "kernel", "classLoader", "serverInfoQuery", "embeddedSCADomainQuery"});
 
         GBEAN_INFO = infoFactory.getBeanInfo();
     }

Added: geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/xsd/geronimo-tuscany-0.3.xsd
URL: http://svn.apache.org/viewvc/geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/xsd/geronimo-tuscany-0.3.xsd?view=auto&rev=559099
==============================================================================
--- geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/xsd/geronimo-tuscany-0.3.xsd (added)
+++ geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/xsd/geronimo-tuscany-0.3.xsd Tue Jul 24 09:49:03 2007
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright 2004 The Apache Software Foundation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<xs:schema
+        targetNamespace="http://geronimo.apache.org/xml/ns/plugins/tuscany-0.3"
+        xmlns:tuscany="http://geronimo.apache.org/xml/ns/plugins/tuscany-0.3"
+        xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2"
+        xmlns:xs="http://www.w3.org/2001/XMLSchema"
+        elementFormDefault="qualified"
+        attributeFormDefault="unqualified"
+        >
+
+    <xs:annotation>
+        <xs:documentation>
+            Schema for a Tuscany Service.
+        </xs:documentation>
+    </xs:annotation>
+
+    <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.2" schemaLocation="/C:/geronimo-tomcat6-jee5-2.0-SNAPSHOT/schema/geronimo-module-1.2.xsd"/>
+
+    <!--   Top-level element is composites   -->
+
+    <xs:element name="sca-domain" type="tuscany:scaDomainType">
+        <xs:annotation>
+            <xs:documentation>
+                Corresponds to an SCADomain in Apache Tuscany. An SCA Domain represents a 
+                complete runtime configuration.
+            </xs:documentation>
+        </xs:annotation>
+    </xs:element>
+
+    <xs:complexType name="scaDomainType">
+        <xs:sequence>
+            <xs:element ref="sys:environment"/>
+            <xs:element name="domainURI" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>
+                        A unique URI used to identify the Tuscany SCADomain that 
+                        is associated with this application. All the composites found
+                        during deployment will be added to this domain. As of now it is assumed
+                        that the SCADomain will be in the same geronimo instance.
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="jndi-name" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>
+                        The name to be used to bind the sca-domain in jndi
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>            
+        </xs:sequence>
+    </xs:complexType>
+</xs:schema>
+

Propchange: geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/xsd/geronimo-tuscany-0.3.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/xsd/geronimo-tuscany-0.3.xsd
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/xsd/geronimo-tuscany-0.3.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/xsdconfig/xmlconfig.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/xsdconfig/xmlconfig.xml?view=auto&rev=559099
==============================================================================
--- geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/xsdconfig/xmlconfig.xml (added)
+++ geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/xsdconfig/xmlconfig.xml Tue Jul 24 09:49:03 2007
@@ -0,0 +1,5 @@
+<xb:config xmlns:xb="http://xml.apache.org/xmlbeans/2004/02/xbean/config">    
+        <xb:namespace uri="http://geronimo.apache.org/xml/ns/plugins/tuscany-0.3">        
+                <xb:package>org.apache.geronimo.tuscany.xmlbeans</xb:package>    
+        </xb:namespace>
+</xb:config>
\ No newline at end of file

Propchange: geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/xsdconfig/xmlconfig.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/xsdconfig/xmlconfig.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/xsdconfig/xmlconfig.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

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=559099&r1=559098&r2=559099
==============================================================================
--- geronimo/sandbox/tuscany-integration/geronimo-tuscany/pom.xml (original)
+++ geronimo/sandbox/tuscany-integration/geronimo-tuscany/pom.xml Tue Jul 24 09:49:03 2007
@@ -9,7 +9,18 @@
     <artifactId>tuscany</artifactId>
     <packaging>pom</packaging>
     <version>1.0</version>
-    <name>Tuscany Plugin for Geronimo</name>
+    <name>Tuscany Plugin</name>
+	<url>http://geronimo.apache.org</url>
+	<description>
+        Tuscany Plugin for Geronimo.
+    </description>
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/sandbox/tuscany-integration</connection>
+        <developerConnection>  scm:svn:https://svn.apache.org/repos/asf/geronimo/sandbox/tuscany-integration
+		</developerConnection>
+        <url>http://svn.apache.org/viewvc/geronimo/sandbox/tuscany-integration</url>
+    </scm>
+	
     <properties>
         <geronimoVersion>2.0-SNAPSHOT</geronimoVersion> 
     </properties>
@@ -18,7 +29,34 @@
         <module>configs</module>
     </modules>
 
+	<distributionManagement>
+    <!--  <repository>
+      <id>repo</id>
+      <name>Repository Name</name>
+      <url>scp://host/path/to/repo</url>
+    </repository> -->
+  
+  <snapshotRepository>
+    <id>temp-m2-repo</id>
+    <name>Temporary repo</name>
+    <url>scp://people.apache.org/home/manugeorge/public_html/repository/</url>
+	<layout>legacy</layout>
+  </snapshotRepository>
+</distributionManagement>
+	
     <repositories>
+        <repository>
+            <id>ws.zones</id>
+            <name>ws.zones</name>
+            <url>http://ws.zones.apache.org/repository/</url>
+            <layout>default</layout>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+        </repository>
          <repository>
             <id>apache-snapshots</id>
             <name>Apache Snapshots Repository</name>
@@ -70,6 +108,19 @@
                 <enabled>true</enabled>
             </releases>
         </repository>
+        <repository>
+            <id>temp-repo</id>
+            <name>Temp M2 Repository</name>
+            <url>http://people.apache.org/~manugeorge/repository/</url>
+            <layout>default</layout>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+        </repository>
+
     </repositories>
 
     



Mime
View raw message