geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vamsic...@apache.org
Subject svn commit: r570584 - in /geronimo/plugins/tuscany/trunk: ./ geronimo-tuscany-http-jetty/ geronimo-tuscany-http-tomcat/ geronimo-tuscany-http-tomcat/src/main/java/org/apache/geronimo/tuscany/http/tomcat/ geronimo-tuscany/ geronimo-tuscany/src/main/java...
Date Tue, 28 Aug 2007 22:10:17 GMT
Author: vamsic007
Date: Tue Aug 28 15:10:16 2007
New Revision: 570584

URL: http://svn.apache.org/viewvc?rev=570584&view=rev
Log:
Fixed formatting + relocated one dependency.

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

Modified: geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-jetty/pom.xml?rev=570584&r1=570583&r2=570584&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-jetty/pom.xml (original)
+++ geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-jetty/pom.xml Tue Aug 28 15:10:16 2007
@@ -19,72 +19,72 @@
 <!-- $Rev$ $Date$ -->
 
 <project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.apache.geronimo.plugins</groupId>
-		<artifactId>tuscany-parent</artifactId>
-		<version>1.0-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>tuscany-parent</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
 
-	<artifactId>geronimo-tuscany-http-jetty</artifactId>
-	<name>Geronimo Plugins :: Tuscany Servlet Host for Geronimo Jetty</name>
+    <artifactId>geronimo-tuscany-http-jetty</artifactId>
+    <name>Geronimo Plugins :: Tuscany Servlet Host for Geronimo Jetty</name>
 
-	<dependencies>
-	    <!--  Geronimo dependencies -->
-		<dependency>
-			<groupId>org.apache.geronimo.components</groupId>
-			<artifactId>geronimo-transaction</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.geronimo.modules</groupId>
-			<artifactId>geronimo-j2ee</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.geronimo.modules</groupId>
-			<artifactId>geronimo-naming</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.geronimo.modules</groupId>
-			<artifactId>geronimo-jetty6</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.geronimo.modules</groupId>
-			<artifactId>geronimo-kernel</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-servlet_2.5_spec</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.mortbay.jetty</groupId>
-			<artifactId>jetty</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.mortbay.jetty</groupId>
-			<artifactId>jetty-util</artifactId>
-		</dependency>
+    <dependencies>
+        <!--  Geronimo dependencies -->
+        <dependency>
+            <groupId>org.apache.geronimo.components</groupId>
+            <artifactId>geronimo-transaction</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-j2ee</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-naming</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-jetty6</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty-util</artifactId>
+        </dependency>
 
         <!-- Tuscany dependencies -->
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-host-http</artifactId>
-		</dependency>
-	</dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-http</artifactId>
+        </dependency>
+    </dependencies>
 
-	<build>
-		<resources>
-			<resource>
-				<directory>src/main/resources</directory>
-				<filtering>true</filtering>
-			</resource>
-		</resources>
-		<testResources>
-			<testResource>
-				<directory>src/test/resources</directory>
-			</testResource>
-		</testResources>
-	</build>
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <testResources>
+            <testResource>
+                <directory>src/test/resources</directory>
+            </testResource>
+        </testResources>
+    </build>
 </project>
 
 

Modified: geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-tomcat/pom.xml?rev=570584&r1=570583&r2=570584&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-tomcat/pom.xml (original)
+++ geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-tomcat/pom.xml Tue Aug 28 15:10:16 2007
@@ -19,59 +19,59 @@
 <!-- $Rev$ $Date$ -->
 
 <project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.apache.geronimo.plugins</groupId>
-		<artifactId>tuscany-parent</artifactId>
-		<version>1.0-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>tuscany-parent</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
 
-	<artifactId>geronimo-tuscany-http-tomcat</artifactId>
-	<name>Geronimo Plugins :: Tuscany Servlet Host for Geronimo Tomcat</name>
+    <artifactId>geronimo-tuscany-http-tomcat</artifactId>
+    <name>Geronimo Plugins :: Tuscany Servlet Host for Geronimo Tomcat</name>
 
-	<dependencies>
-	    <!-- Geronimo dependencies -->
-		<dependency>
-			<groupId>org.apache.geronimo.modules</groupId>
-			<artifactId>geronimo-kernel</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.geronimo.modules</groupId>
-			<artifactId>geronimo-tomcat6</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tomcat</groupId>
-			<artifactId>catalina</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tomcat</groupId>
-			<artifactId>coyote</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-servlet_2.5_spec</artifactId>
-		</dependency>
+    <dependencies>
+        <!-- Geronimo dependencies -->
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-tomcat6</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>catalina</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>coyote</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+        </dependency>
 
         <!-- Tuscany dependencies -->
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-host-http</artifactId>
-		</dependency>
-	</dependencies>
-	<build>
-		<resources>
-			<resource>
-				<directory>src/main/resources</directory>
-				<filtering>true</filtering>
-			</resource>
-		</resources>
-		<testResources>
-			<testResource>
-				<directory>src/test/resources</directory>
-			</testResource>
-		</testResources>
-	</build>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-http</artifactId>
+        </dependency>
+    </dependencies>
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <testResources>
+            <testResource>
+                <directory>src/test/resources</directory>
+            </testResource>
+        </testResources>
+    </build>
 </project>
 
 

Modified: geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-tomcat/src/main/java/org/apache/geronimo/tuscany/http/tomcat/GeronimoServletHost.java
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-tomcat/src/main/java/org/apache/geronimo/tuscany/http/tomcat/GeronimoServletHost.java?rev=570584&r1=570583&r2=570584&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-tomcat/src/main/java/org/apache/geronimo/tuscany/http/tomcat/GeronimoServletHost.java (original)
+++ geronimo/plugins/tuscany/trunk/geronimo-tuscany-http-tomcat/src/main/java/org/apache/geronimo/tuscany/http/tomcat/GeronimoServletHost.java Tue Aug 28 15:10:16 2007
@@ -118,9 +118,9 @@
         String contextPath = SEPARATOR + (path.indexOf(SEPARATOR) != -1 ? path.substring(0,path.indexOf(SEPARATOR)) : path);
         String mapping = path.indexOf(SEPARATOR) != -1 ? path.substring(path.indexOf(SEPARATOR)) : SEPARATOR;
         if(mapping.equals(SEPARATOR)) {
-        	// For url's of kind http://localhost/servicename, use context path "/".
-        	mapping = contextPath;
-        	contextPath = SEPARATOR;
+            // For url's of kind http://localhost/servicename, use context path "/".
+            mapping = contextPath;
+            contextPath = SEPARATOR;
         }
         String virtualServer = engine.getDefaultHost();
         host = engine.findChild(virtualServer);
@@ -187,9 +187,9 @@
         String contextPath = SEPARATOR + (path.indexOf(SEPARATOR) != -1 ? path.substring(0,path.indexOf(SEPARATOR)) : path);
         String mapping = path.indexOf(SEPARATOR) != -1 ? path.substring(path.indexOf(SEPARATOR)) : SEPARATOR;              
         if(mapping.equals(SEPARATOR)) {
-        	// For url's of kind http://localhost/servicename, use context path "/".
-        	mapping = contextPath;
-        	contextPath = SEPARATOR;
+            // For url's of kind http://localhost/servicename, use context path "/".
+            mapping = contextPath;
+            contextPath = SEPARATOR;
         }
         Context context = ((StandardHost)host).map(contextPath);        
         Container container = context.findChild(mapping);

Modified: geronimo/plugins/tuscany/trunk/geronimo-tuscany/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/geronimo-tuscany/pom.xml?rev=570584&r1=570583&r2=570584&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/geronimo-tuscany/pom.xml (original)
+++ geronimo/plugins/tuscany/trunk/geronimo-tuscany/pom.xml Tue Aug 28 15:10:16 2007
@@ -31,26 +31,26 @@
     <name>Geronimo Plugins :: Tuscany</name>
 
     <dependencies>
-      <!-- Geronimo dependencies -->
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-j2ee</artifactId>        
-      </dependency>                          
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-kernel</artifactId>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-service-builder</artifactId>
-      </dependency>
+        <!-- Geronimo dependencies -->
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-j2ee</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-service-builder</artifactId>
+        </dependency>
 
-      <!-- Tuscany dependencies -->
-      <dependency>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-host-embedded</artifactId>        
-      </dependency>                    
-    </dependencies>    
+        <!-- Tuscany dependencies -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+        </dependency>
+    </dependencies>
 
     <build>
         <resources>

Modified: geronimo/plugins/tuscany/trunk/geronimo-tuscany/src/main/java/org/apache/geronimo/tuscany/TuscanyBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/geronimo-tuscany/src/main/java/org/apache/geronimo/tuscany/TuscanyBuilder.java?rev=570584&r1=570583&r2=570584&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/geronimo-tuscany/src/main/java/org/apache/geronimo/tuscany/TuscanyBuilder.java (original)
+++ geronimo/plugins/tuscany/trunk/geronimo-tuscany/src/main/java/org/apache/geronimo/tuscany/TuscanyBuilder.java Tue Aug 28 15:10:16 2007
@@ -204,7 +204,7 @@
     }    
 
     public void setTuscanyGroupId(String tuscanyGroupId) {
-    	this.tuscanyGroupId = tuscanyGroupId;
+        this.tuscanyGroupId = tuscanyGroupId;
     }
 
     public static final GBeanInfo GBEAN_INFO;

Modified: geronimo/plugins/tuscany/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/pom.xml?rev=570584&r1=570583&r2=570584&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/pom.xml (original)
+++ geronimo/plugins/tuscany/trunk/pom.xml Tue Aug 28 15:10:16 2007
@@ -56,236 +56,236 @@
         <version>1.0-SNAPSHOT</version>
 
         <geronimoSchemaVersion>1.2</geronimoSchemaVersion>
-        <geronimoVersion>2.0.1</geronimoVersion> 
+        <geronimoVersion>2.0.1</geronimoVersion>
         <tuscanyVersion>1.0-incubating-SNAPSHOT</tuscanyVersion>
     </properties>
 
     <dependencyManagement>
-      <dependencies>
-          <!-- Geronimo dependencies -->
-          <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-j2ee</artifactId>        
-            <version>${geronimoVersion}</version>            
-          </dependency>                          
-          <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-kernel</artifactId>
-            <version>${geronimoVersion}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-deployment</artifactId>
-            <version>${geronimoVersion}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-service-builder</artifactId>
-            <version>${geronimoVersion}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-common</artifactId>
-            <version>${geronimoVersion}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-management</artifactId>
-            <version>${geronimoVersion}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-naming</artifactId>
-            <version>${geronimoVersion}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>car</type>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-server</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>car</type>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-deployer</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>car</type>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>server-security-config</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>car</type>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>transaction</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>car</type>
-          </dependency>        
-          <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jasper</artifactId>                
-            <version>${geronimoVersion}</version>
-            <type>car</type>
-          </dependency>                
-          <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>webservices-common</artifactId>                
-            <version>${geronimoVersion}</version>
-            <type>car</type>
-          </dependency>                
-          <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openejb</artifactId>                
-            <version>${geronimoVersion}</version>
-            <type>car</type>
-          </dependency>                
-          <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>clustering</artifactId>                
-            <version>${geronimoVersion}</version> 
-            <type>car</type>
-          </dependency>           
-          <dependency>
-            <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>car-maven-plugin</artifactId>
-            <version>${geronimoVersion}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-tomcat6</artifactId>
-            <version>${geronimoVersion}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-jetty6</artifactId>
-            <version>${geronimoVersion}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.geronimo.components</groupId>
-            <artifactId>geronimo-transaction</artifactId>
-            <version>${geronimoVersion}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>catalina</artifactId>
-            <version>6.0.13-G543818</version>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>coyote</artifactId>
-            <version>6.0.13</version>
-          </dependency>
-          <dependency>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>jetty</artifactId>
-            <version>6.1.5</version>
-          </dependency>
-          <dependency>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>jetty-util</artifactId>
-            <version>6.1.5</version>
-          </dependency>
-          <dependency>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>jetty-ajp</artifactId>
-            <version>6.1.5</version>
-          </dependency>        
-          <dependency>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>jetty-sslengine</artifactId>
-            <version>6.1.5</version>
-          </dependency>
-          <dependency>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>jetty-util</artifactId>
-            <version>6.1.5</version>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
-            <version>1.1-SNAPSHOT</version>
-          </dependency>
-    
-          <!-- Tuscany Dependencies -->
-          <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>        
-            <version>${tuscanyVersion}</version>            
-          </dependency>                    
-          <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>sca-api</artifactId>        
-            <version>${tuscanyVersion}</version>            
-          </dependency>                    
-          <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core</artifactId>        
-            <version>${tuscanyVersion}</version>            
-          </dependency>                    
-          <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy</artifactId>        
-            <version>${tuscanyVersion}</version>            
-          </dependency>                    
-          <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>        
-            <version>${tuscanyVersion}</version>            
-          </dependency>                    
-          <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution</artifactId>        
-            <version>${tuscanyVersion}</version>            
-          </dependency>                    
-          <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-impl</artifactId>        
-            <version>${tuscanyVersion}</version>            
-          </dependency>
-          <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-http</artifactId>
-            <version>${tuscanyVersion}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>${tuscanyVersion}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core</artifactId>
-            <version>${tuscanyVersion}</version>
-          </dependency>
-          
-          <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-            <version>1.0.1</version>
-          </dependency> 
-          <dependency>
-            <groupId>wsdl4j</groupId>
-            <artifactId>wsdl4j</artifactId>
-            <version>1.6.2</version>
-          </dependency> 
-          <dependency>
-            <groupId>woodstox</groupId>
-            <artifactId>wstx-asl</artifactId>
-            <version>3.2.0</version>
-          </dependency> 
-          <dependency>
-            <groupId>org.apache.ws.commons</groupId>
-            <artifactId>XmlSchema</artifactId>
-            <version>1.1</version>
-          </dependency>                               
-      </dependencies>
+        <dependencies>
+            <!-- Geronimo dependencies -->
+            <dependency>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-j2ee</artifactId>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-kernel</artifactId>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-deployment</artifactId>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-service-builder</artifactId>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-common</artifactId>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-management</artifactId>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-naming</artifactId>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>geronimo-gbean-deployer</artifactId>
+                <version>${geronimoVersion}</version>
+                <type>car</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>j2ee-server</artifactId>
+                <version>${geronimoVersion}</version>
+                <type>car</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>j2ee-deployer</artifactId>
+                <version>${geronimoVersion}</version>
+                <type>car</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>server-security-config</artifactId>
+                <version>${geronimoVersion}</version>
+                <type>car</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>transaction</artifactId>
+                <version>${geronimoVersion}</version>
+                <type>car</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>jasper</artifactId>
+                <version>${geronimoVersion}</version>
+                <type>car</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>webservices-common</artifactId>
+                <version>${geronimoVersion}</version>
+                <type>car</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>openejb</artifactId>
+                <version>${geronimoVersion}</version>
+                <type>car</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>clustering</artifactId>
+                <version>${geronimoVersion}</version>
+                <type>car</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-tomcat6</artifactId>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-jetty6</artifactId>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.components</groupId>
+                <artifactId>geronimo-transaction</artifactId>
+                <version>${geronimoVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tomcat</groupId>
+                <artifactId>catalina</artifactId>
+                <version>6.0.13-G543818</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tomcat</groupId>
+                <artifactId>coyote</artifactId>
+                <version>6.0.13</version>
+            </dependency>
+            <dependency>
+                <groupId>org.mortbay.jetty</groupId>
+                <artifactId>jetty</artifactId>
+                <version>6.1.5</version>
+            </dependency>
+            <dependency>
+                <groupId>org.mortbay.jetty</groupId>
+                <artifactId>jetty-util</artifactId>
+                <version>6.1.5</version>
+            </dependency>
+            <dependency>
+                <groupId>org.mortbay.jetty</groupId>
+                <artifactId>jetty-ajp</artifactId>
+                <version>6.1.5</version>
+            </dependency>
+            <dependency>
+                <groupId>org.mortbay.jetty</groupId>
+                <artifactId>jetty-sslengine</artifactId>
+                <version>6.1.5</version>
+            </dependency>
+            <dependency>
+                <groupId>org.mortbay.jetty</groupId>
+                <artifactId>jetty-util</artifactId>
+                <version>6.1.5</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-servlet_2.5_spec</artifactId>
+                <version>1.1-SNAPSHOT</version>
+            </dependency>
+
+            <!-- Tuscany Dependencies -->
+            <dependency>
+                <groupId>org.apache.tuscany.sca</groupId>
+                <artifactId>tuscany-host-embedded</artifactId>
+                <version>${tuscanyVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tuscany.sca</groupId>
+                <artifactId>sca-api</artifactId>
+                <version>${tuscanyVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tuscany.sca</groupId>
+                <artifactId>tuscany-core</artifactId>
+                <version>${tuscanyVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tuscany.sca</groupId>
+                <artifactId>tuscany-policy</artifactId>
+                <version>${tuscanyVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tuscany.sca</groupId>
+                <artifactId>tuscany-assembly</artifactId>
+                <version>${tuscanyVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tuscany.sca</groupId>
+                <artifactId>tuscany-contribution</artifactId>
+                <version>${tuscanyVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tuscany.sca</groupId>
+                <artifactId>tuscany-contribution-impl</artifactId>
+                <version>${tuscanyVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tuscany.sca</groupId>
+                <artifactId>tuscany-host-http</artifactId>
+                <version>${tuscanyVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tuscany.sca</groupId>
+                <artifactId>tuscany-core-spi</artifactId>
+                <version>${tuscanyVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tuscany.sca</groupId>
+                <artifactId>tuscany-core</artifactId>
+                <version>${tuscanyVersion}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>stax</groupId>
+                <artifactId>stax-api</artifactId>
+                <version>1.0.1</version>
+            </dependency>
+            <dependency>
+                <groupId>wsdl4j</groupId>
+                <artifactId>wsdl4j</artifactId>
+                <version>1.6.2</version>
+            </dependency>
+            <dependency>
+                <groupId>woodstox</groupId>
+                <artifactId>wstx-asl</artifactId>
+                <version>3.2.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.ws.commons</groupId>
+                <artifactId>XmlSchema</artifactId>
+                <version>1.1</version>
+            </dependency>
+        </dependencies>
     </dependencyManagement>
 
     <build>

Modified: geronimo/plugins/tuscany/trunk/tuscany-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/tuscany-jetty/pom.xml?rev=570584&r1=570583&r2=570584&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/tuscany-jetty/pom.xml (original)
+++ geronimo/plugins/tuscany/trunk/tuscany-jetty/pom.xml Tue Aug 28 15:10:16 2007
@@ -32,7 +32,7 @@
     <packaging>car</packaging>
     <name>Geronimo :: Tuscany Plugin for Geronimo Jetty</name>
     <dependencies>
-     
+
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>geronimo-tuscany</artifactId>
@@ -69,54 +69,54 @@
             <artifactId>transaction</artifactId>
             <type>car</type>
             <scope>provided</scope>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jasper</artifactId>                
+            <artifactId>jasper</artifactId>
             <type>car</type>
             <scope>provided</scope>
-        </dependency>                
+        </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>webservices-common</artifactId>                
+            <artifactId>webservices-common</artifactId>
             <type>car</type>
             <scope>provided</scope>
-        </dependency>                
+        </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openejb</artifactId>                
+            <artifactId>openejb</artifactId>
             <type>car</type>
             <scope>provided</scope>
-        </dependency>                
+        </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>clustering</artifactId>                
+            <artifactId>clustering</artifactId>
             <type>car</type>
-			<scope>provided</scope>
-        </dependency>           
-	    <dependency>
-			<groupId>org.mortbay.jetty</groupId>
-			<artifactId>jetty</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty</artifactId>
             <type>jar</type>
-            <scope>provided</scope>			
-	    </dependency>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.mortbay.jetty</groupId>
             <artifactId>jetty-ajp</artifactId>
             <type>jar</type>
-            <scope>provided</scope>						
-        </dependency>		
-		<dependency>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
             <groupId>org.mortbay.jetty</groupId>
             <artifactId>jetty-sslengine</artifactId>
             <type>jar</type>
-            <scope>provided</scope>						
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.mortbay.jetty</groupId>
             <artifactId>jetty-util</artifactId>
             <type>jar</type>
-            <scope>provided</scope>						
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
@@ -147,7 +147,7 @@
                 </configuration>
             </plugin>
         </plugins>
-        
+
         <resources>
             <resource>
                 <directory>${pom.basedir}/src/main/resources</directory>
@@ -155,6 +155,5 @@
             </resource>
         </resources>
     </build>
-  
 </project>
 

Modified: geronimo/plugins/tuscany/trunk/tuscany-jetty/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/tuscany-jetty/src/main/resources/META-INF/geronimo-plugin.xml?rev=570584&r1=570583&r2=570584&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/tuscany-jetty/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/plugins/tuscany/trunk/tuscany-jetty/src/main/resources/META-INF/geronimo-plugin.xml Tue Aug 28 15:10:16 2007
@@ -31,49 +31,49 @@
     <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
     <geronimo-version>${geronimoVersion}</geronimo-version>
     <prerequisite>
-        <id>org.apache.geronimo.configs/rmi-naming//car</id>        
+        <id>org.apache.geronimo.configs/rmi-naming//car</id>
         <description>
             This deployer will work for jetty binaries
         </description>
     </prerequisite>
 
     <dependency>annogen/annogen/0.1.0/jar</dependency>
-    <dependency>backport-util-concurrent/backport-util-concurrent/2.2/jar</dependency>      
-    <dependency>com.sun.xml.bind/jaxb-xjc/2.0.5/jar</dependency>      
-    <dependency>com.sun.xml.ws/jaxws-rt/2.0/jar</dependency>      
-    <dependency>com.sun.xml.ws/jaxws-tools/2.0/jar</dependency>      
+    <dependency>backport-util-concurrent/backport-util-concurrent/2.2/jar</dependency>
+    <dependency>com.sun.xml.bind/jaxb-xjc/2.0.5/jar</dependency>
+    <dependency>com.sun.xml.ws/jaxws-rt/2.0/jar</dependency>
+    <dependency>com.sun.xml.ws/jaxws-tools/2.0/jar</dependency>
     <dependency>commonj/sdo-api-r2.1/1.0-incubating-SNAPSHOT/jar</dependency>
-    <dependency>commons-codec/commons-codec/1.3/jar</dependency>      
+    <dependency>commons-codec/commons-codec/1.3/jar</dependency>
     <dependency>commons-fileupload/commons-fileupload/1.1.1/jar</dependency>
-    <dependency>commons-httpclient/commons-httpclient/3.0.1/jar</dependency>      
-    <dependency>commons-logging/commons-logging/1.0.4/jar</dependency>      
-    <dependency>jaxen/jaxen/1.1-beta-11/jar</dependency>      
+    <dependency>commons-httpclient/commons-httpclient/3.0.1/jar</dependency>
+    <dependency>commons-logging/commons-logging/1.0.4/jar</dependency>
+    <dependency>jaxen/jaxen/1.1-beta-11/jar</dependency>
     <dependency>log4j/log4j/1.2.14/jar</dependency>
-    <dependency>org.apache.axis2/axis2-adb/1.2/jar</dependency>            
+    <dependency>org.apache.axis2/axis2-adb/1.2/jar</dependency>
     <dependency>org.apache.axis2/axis2-java2wsdl/1.2/jar</dependency>
     <dependency>org.apache.axis2/axis2-jaxws-api/1.2/jar</dependency>
     <dependency>org.apache.axis2/axis2-jaxws/1.2/jar</dependency>
     <dependency>org.apache.axis2/axis2-kernel/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.geronimo.configs/geronimo-gbean-deployer//car</dependency>  
+    <dependency>org.apache.axis2/axis2-metadata/1.2/jar</dependency>
+    <dependency>org.apache.axis2/axis2-saaj/1.2/jar</dependency>
+    <dependency>org.apache.geronimo.configs/geronimo-gbean-deployer//car</dependency>
     <dependency>org.apache.geronimo.configs/j2ee-corba-yoko//car</dependency>
     <dependency>org.apache.geronimo.configs/jasper//car</dependency>
     <dependency>org.apache.geronimo.configs/rmi-naming//car</dependency>
     <dependency>org.apache.geronimo.configs/jetty6//car</dependency>
     <dependency>org.apache.geronimo.modules/geronimo-axis2//jar</dependency>
     <dependency>org.apache.geronimo.modules/geronimo-j2ee-schema//jar</dependency>
-    <dependency>org.apache.geronimo.plugins/geronimo-tuscany-http-jetty/1.0-SNAPSHOT/jar</dependency>      
-    <dependency>org.apache.geronimo.specs/geronimo-commonj_1.1_spec/1.0/jar</dependency>      
-    <dependency>org.apache.httpcomponents/httpcore/4.0-alpha5/jar</dependency>      
-    <dependency>org.apache.neethi/neethi/2.0/jar</dependency>      
-    <dependency>org.apache.tuscany.das/tuscany-das-rdb/${tuscanyVersion}/jar</dependency>                  
+    <dependency>org.apache.geronimo.plugins/geronimo-tuscany-http-jetty/1.0-SNAPSHOT/jar</dependency>
+    <dependency>org.apache.geronimo.specs/geronimo-commonj_1.1_spec/1.0/jar</dependency>
+    <dependency>org.apache.httpcomponents/httpcore/4.0-alpha5/jar</dependency>
+    <dependency>org.apache.neethi/neethi/2.0/jar</dependency>
+    <dependency>org.apache.tuscany.das/tuscany-das-rdb/${tuscanyVersion}/jar</dependency>
     
-    <dependency>org.apache.tuscany.sca/sca-api/${tuscanyVersion}/jar</dependency>      
-    <dependency>org.apache.tuscany.sca/tuscany-assembly-xml/${tuscanyVersion}/jar</dependency>      
-    <dependency>org.apache.tuscany.sca/tuscany-assembly/${tuscanyVersion}/jar</dependency>      
-    <dependency>org.apache.tuscany.sca/tuscany-binding-ejb/${tuscanyVersion}/jar</dependency>                      
-    <dependency>org.apache.tuscany.sca/tuscany-binding-feed/${tuscanyVersion}/jar</dependency>                      
+    <dependency>org.apache.tuscany.sca/sca-api/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-assembly-xml/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-assembly/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-binding-ejb/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-binding-feed/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-binding-jms/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-binding-jsonrpc/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-binding-rmi/${tuscanyVersion}/jar</dependency>
@@ -81,42 +81,42 @@
     <dependency>org.apache.tuscany.sca/tuscany-binding-sca/${tuscanyVersion}</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-binding-ws-axis2/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-binding-ws-xml/${tuscanyVersion}/jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-binding-ws/${tuscanyVersion}/jar</dependency>      
-    <dependency>org.apache.tuscany.sca/tuscany-contribution-impl/${tuscanyVersion}/ja</dependency>     
-    <dependency>org.apache.tuscany.sca/tuscany-contribution/${tuscanyVersion}/jar</dependency>      
-    <dependency>org.apache.tuscany.sca/tuscany-core-databinding/${tuscanyVersion}/jar</dependency>      
-    <dependency>org.apache.tuscany.sca/tuscany-core-spi/${tuscanyVersion}/jar</dependency>      
-    <dependency>org.apache.tuscany.sca/tuscany-core/${tuscanyVersion}/jar</dependency>      
-    <dependency>org.apache.tuscany.sca/tuscany-databinding-axiom/${tuscanyVersion}/jar</dependency>      
-    <dependency>org.apache.tuscany.sca/tuscany-databinding/${tuscanyVersion}/jar</dependency>      
+    <dependency>org.apache.tuscany.sca/tuscany-binding-ws/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-contribution-impl/${tuscanyVersion}/ja</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-contribution/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-core-databinding/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-core-spi/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-core/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-databinding-axiom/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-databinding/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-distributed/${tuscanyVersion}</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-extension-helper/${tuscanyVersion}/jar</dependency>        
+    <dependency>org.apache.tuscany.sca/tuscany-extension-helper/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-host-embedded/${tuscanyVersion}/jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-host-http/${tuscanyVersion}/jar</dependency>      
-    <dependency>org.apache.tuscany.sca/tuscany-host-rmi/${tuscanyVersion}/jar</dependency>          
-    <dependency>org.apache.tuscany.sca/tuscany-implementation-java-xml/${tuscanyVersion}/jar</dependency>      
-    <dependency>org.apache.tuscany.sca/tuscany-implementation-java/${tuscanyVersion}/jar</dependency>      
-    <dependency>org.apache.tuscany.sca/tuscany-interface-java-runtime/${tuscanyVersion}/jar</dependency>      
-    <dependency>org.apache.tuscany.sca/tuscany-interface-java-xml/${tuscanyVersion}/jar</dependency>      
-    <dependency>org.apache.tuscany.sca/tuscany-interface-java/${tuscanyVersion}/jar</dependency>      
-    <dependency>org.apache.tuscany.sca/tuscany-interface-wsdl-xml/${tuscanyVersion}/jar</dependency>      
-    <dependency>org.apache.tuscany.sca/tuscany-interface-wsdl/${tuscanyVersion}/jar</dependency>      
-    <dependency>org.apache.tuscany.sca/tuscany-interface/${tuscanyVersion}/jar</dependency>      
+    <dependency>org.apache.tuscany.sca/tuscany-host-http/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-host-rmi/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-implementation-java-xml/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-implementation-java/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-interface-java-runtime/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-interface-java-xml/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-interface-java/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-interface-wsdl-xml/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-interface-wsdl/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-interface/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-policy-xml/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-policy/${tuscanyVersion}/jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-policy/${tuscanyVersion}/jar</dependency>      
-    <dependency>org.apache.tuscany.sdo/tuscany-sdo-impl/${tuscanyVersion}/jar</dependency>           
-    <dependency>org.apache.ws.commons.axiom/axiom-api/1.2.5/jar</dependency>      
-    <dependency>org.apache.ws.commons.axiom/axiom-dom/1.2.5/jar</dependency>      
-    <dependency>org.apache.ws.commons.axiom/axiom-impl/1.2.5/jar</dependency>      
-    <dependency>org.apache.ws.commons.schema/XmlSchema/1.3.1/jar</dependency>      
-    <dependency>org.codehaus.woodstox/wstx-asl/3.2.0/jar</dependency>                  
-    <dependency>stax/stax-api/1.0.1/jar</dependency>      
-    <dependency>wsdl4j/wsdl4j/1.6.1/jar</dependency>      
-    <dependency>xml-resolver/xml-resolver/1.1/jar</dependency>      
+    <dependency>org.apache.tuscany.sca/tuscany-policy/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sdo/tuscany-sdo-impl/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.ws.commons.axiom/axiom-api/1.2.5/jar</dependency>
+    <dependency>org.apache.ws.commons.axiom/axiom-dom/1.2.5/jar</dependency>
+    <dependency>org.apache.ws.commons.axiom/axiom-impl/1.2.5/jar</dependency>
+    <dependency>org.apache.ws.commons.schema/XmlSchema/1.3.1/jar</dependency>
+    <dependency>org.codehaus.woodstox/wstx-asl/3.2.0/jar</dependency>
+    <dependency>stax/stax-api/1.0.1/jar</dependency>
+    <dependency>wsdl4j/wsdl4j/1.6.1/jar</dependency>
+    <dependency>xml-resolver/xml-resolver/1.1/jar</dependency>
 
-    <source-repository>http://repo1.maven.org/maven2/</source-repository> 
-    <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>          
+    <source-repository>http://repo1.maven.org/maven2/</source-repository>
+    <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</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://people.apache.org/~manugeorge/repository/</source-repository>

Modified: geronimo/plugins/tuscany/trunk/tuscany-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/tuscany-jetty/src/plan/plan.xml?rev=570584&r1=570583&r2=570584&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/tuscany-jetty/src/plan/plan.xml (original)
+++ geronimo/plugins/tuscany/trunk/tuscany-jetty/src/plan/plan.xml Tue Aug 28 15:10:16 2007
@@ -197,7 +197,7 @@
                 <artifactId>neethi</artifactId>
                 <version>2.0</version>
                 <type>jar</type>
-               <import>classes</import>
+                <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>com.sun.xml.ws</groupId>
@@ -236,13 +236,6 @@
             </dependency>
 
             <!-- Tuscany SCA -->
-            <!--dependency>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-sca-all</artifactId>        
-                <version>0.99-incubating</version>            
-                <type>jar</type>
-                <import>classes</import>
-            </dependency-->                    
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>sca-api</artifactId>
@@ -251,13 +244,6 @@
                 <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>${tuscanyVersion}</version>
@@ -313,7 +299,6 @@
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
-
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-databinding</artifactId>
@@ -504,7 +489,13 @@
                 <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>wsdl4j</groupId>
                 <artifactId>wsdl4j</artifactId>
@@ -593,4 +584,4 @@
     <gbean name="GeronimoSCADomain" class="org.apache.geronimo.tuscany.EmbeddedSCADomainGBean">
         <attribute name="domainUri">http://localhost:8080/</attribute>
     </gbean>
-</module>
\ No newline at end of file
+</module>

Modified: geronimo/plugins/tuscany/trunk/tuscany-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/tuscany-tomcat/pom.xml?rev=570584&r1=570583&r2=570584&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/tuscany-tomcat/pom.xml (original)
+++ geronimo/plugins/tuscany/trunk/tuscany-tomcat/pom.xml Tue Aug 28 15:10:16 2007
@@ -68,31 +68,31 @@
             <artifactId>transaction</artifactId>
             <type>car</type>
             <scope>provided</scope>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jasper</artifactId>                
+            <artifactId>jasper</artifactId>
             <type>car</type>
             <scope>provided</scope>
-         </dependency>                
+        </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>webservices-common</artifactId>                
+            <artifactId>webservices-common</artifactId>
             <type>car</type>
             <scope>provided</scope>
-         </dependency>                
+        </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openejb</artifactId>                
+            <artifactId>openejb</artifactId>
             <type>car</type>
             <scope>provided</scope>
-         </dependency>                
+        </dependency>
         <dependency>
             <groupId>org.apache.tomcat</groupId>
-            <artifactId>coyote</artifactId>                
+            <artifactId>coyote</artifactId>
             <type>jar</type>
             <scope>provided</scope>
-         </dependency>                
+        </dependency>
     </dependencies>
 
     <build>
@@ -122,7 +122,7 @@
                 </configuration>
             </plugin>
         </plugins>
-        
+
         <resources>
             <resource>
                 <directory>${pom.basedir}/src/main/resources</directory>
@@ -130,6 +130,5 @@
             </resource>
         </resources>
     </build>
-  
 </project>
 

Modified: geronimo/plugins/tuscany/trunk/tuscany-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/tuscany-tomcat/src/main/resources/META-INF/geronimo-plugin.xml?rev=570584&r1=570583&r2=570584&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/tuscany-tomcat/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/plugins/tuscany/trunk/tuscany-tomcat/src/main/resources/META-INF/geronimo-plugin.xml Tue Aug 28 15:10:16 2007
@@ -31,49 +31,49 @@
     <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
     <geronimo-version>${geronimoVersion}</geronimo-version>
     <prerequisite>
-        <id>org.apache.geronimo.configs/rmi-naming//car</id>        
+        <id>org.apache.geronimo.configs/rmi-naming//car</id>
         <description>
             This deployer will work for tomcat binaries
         </description>
     </prerequisite>
 
     <dependency>annogen/annogen/0.1.0/jar</dependency>
-    <dependency>backport-util-concurrent/backport-util-concurrent/2.2/jar</dependency>      
-    <dependency>com.sun.xml.bind/jaxb-xjc/2.0.5/jar</dependency>      
-    <dependency>com.sun.xml.ws/jaxws-rt/2.0/jar</dependency>      
-    <dependency>com.sun.xml.ws/jaxws-tools/2.0/jar</dependency>      
+    <dependency>backport-util-concurrent/backport-util-concurrent/2.2/jar</dependency>
+    <dependency>com.sun.xml.bind/jaxb-xjc/2.0.5/jar</dependency>
+    <dependency>com.sun.xml.ws/jaxws-rt/2.0/jar</dependency>
+    <dependency>com.sun.xml.ws/jaxws-tools/2.0/jar</dependency>
     <dependency>commonj/sdo-api-r2.1/1.0-incubating-SNAPSHOT/jar</dependency>
-    <dependency>commons-codec/commons-codec/1.3/jar</dependency>      
+    <dependency>commons-codec/commons-codec/1.3/jar</dependency>
     <dependency>commons-fileupload/commons-fileupload/1.1.1/jar</dependency>
-    <dependency>commons-httpclient/commons-httpclient/3.0.1/jar</dependency>      
-    <dependency>commons-logging/commons-logging/1.0.4/jar</dependency>      
-    <dependency>jaxen/jaxen/1.1-beta-11/jar</dependency>      
+    <dependency>commons-httpclient/commons-httpclient/3.0.1/jar</dependency>
+    <dependency>commons-logging/commons-logging/1.0.4/jar</dependency>
+    <dependency>jaxen/jaxen/1.1-beta-11/jar</dependency>
     <dependency>log4j/log4j/1.2.14/jar</dependency>
-    <dependency>org.apache.axis2/axis2-adb/1.2/jar</dependency>            
+    <dependency>org.apache.axis2/axis2-adb/1.2/jar</dependency>
     <dependency>org.apache.axis2/axis2-java2wsdl/1.2/jar</dependency>
     <dependency>org.apache.axis2/axis2-jaxws-api/1.2/jar</dependency>
     <dependency>org.apache.axis2/axis2-jaxws/1.2/jar</dependency>
     <dependency>org.apache.axis2/axis2-kernel/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.geronimo.configs/geronimo-gbean-deployer//car</dependency>  
+    <dependency>org.apache.axis2/axis2-metadata/1.2/jar</dependency>
+    <dependency>org.apache.axis2/axis2-saaj/1.2/jar</dependency>
+    <dependency>org.apache.geronimo.configs/geronimo-gbean-deployer//car</dependency>
     <dependency>org.apache.geronimo.configs/j2ee-corba-yoko//car</dependency>
     <dependency>org.apache.geronimo.configs/jasper//car</dependency>
     <dependency>org.apache.geronimo.configs/rmi-naming//car</dependency>
     <dependency>org.apache.geronimo.configs/tomcat6//car</dependency>
     <dependency>org.apache.geronimo.modules/geronimo-axis2//jar</dependency>
     <dependency>org.apache.geronimo.modules/geronimo-j2ee-schema//jar</dependency>
-    <dependency>org.apache.geronimo.plugins/geronimo-tuscany-http-tomcat/1.0-SNAPSHOT/jar</dependency>      
-    <dependency>org.apache.geronimo.specs/geronimo-commonj_1.1_spec/1.0/jar</dependency>      
-    <dependency>org.apache.httpcomponents/httpcore/4.0-alpha5/jar</dependency>      
-    <dependency>org.apache.neethi/neethi/2.0/jar</dependency>      
-    <dependency>org.apache.tuscany.das/tuscany-das-rdb/${tuscanyVersion}/jar</dependency>                  
+    <dependency>org.apache.geronimo.plugins/geronimo-tuscany-http-tomcat/1.0-SNAPSHOT/jar</dependency>
+    <dependency>org.apache.geronimo.specs/geronimo-commonj_1.1_spec/1.0/jar</dependency>
+    <dependency>org.apache.httpcomponents/httpcore/4.0-alpha5/jar</dependency>
+    <dependency>org.apache.neethi/neethi/2.0/jar</dependency>
+    <dependency>org.apache.tuscany.das/tuscany-das-rdb/${tuscanyVersion}/jar</dependency>
     
-    <dependency>org.apache.tuscany.sca/sca-api/${tuscanyVersion}/jar</dependency>      
-    <dependency>org.apache.tuscany.sca/tuscany-assembly-xml/${tuscanyVersion}/jar</dependency>      
-    <dependency>org.apache.tuscany.sca/tuscany-assembly/${tuscanyVersion}/jar</dependency>      
-    <dependency>org.apache.tuscany.sca/tuscany-binding-ejb/${tuscanyVersion}/jar</dependency>                      
-    <dependency>org.apache.tuscany.sca/tuscany-binding-feed/${tuscanyVersion}/jar</dependency>                      
+    <dependency>org.apache.tuscany.sca/sca-api/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-assembly-xml/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-assembly/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-binding-ejb/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-binding-feed/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-binding-jms/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-binding-jsonrpc/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-binding-rmi/${tuscanyVersion}/jar</dependency>
@@ -81,42 +81,42 @@
     <dependency>org.apache.tuscany.sca/tuscany-binding-sca/${tuscanyVersion}</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-binding-ws-axis2/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-binding-ws-xml/${tuscanyVersion}/jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-binding-ws/${tuscanyVersion}/jar</dependency>      
-    <dependency>org.apache.tuscany.sca/tuscany-contribution-impl/${tuscanyVersion}/ja</dependency>     
-    <dependency>org.apache.tuscany.sca/tuscany-contribution/${tuscanyVersion}/jar</dependency>      
-    <dependency>org.apache.tuscany.sca/tuscany-core-databinding/${tuscanyVersion}/jar</dependency>      
-    <dependency>org.apache.tuscany.sca/tuscany-core-spi/${tuscanyVersion}/jar</dependency>      
-    <dependency>org.apache.tuscany.sca/tuscany-core/${tuscanyVersion}/jar</dependency>      
-    <dependency>org.apache.tuscany.sca/tuscany-databinding-axiom/${tuscanyVersion}/jar</dependency>      
-    <dependency>org.apache.tuscany.sca/tuscany-databinding/${tuscanyVersion}/jar</dependency>      
+    <dependency>org.apache.tuscany.sca/tuscany-binding-ws/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-contribution-impl/${tuscanyVersion}/ja</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-contribution/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-core-databinding/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-core-spi/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-core/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-databinding-axiom/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-databinding/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-distributed/${tuscanyVersion}</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-extension-helper/${tuscanyVersion}/jar</dependency>        
+    <dependency>org.apache.tuscany.sca/tuscany-extension-helper/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-host-embedded/${tuscanyVersion}/jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-host-http/${tuscanyVersion}/jar</dependency>      
-    <dependency>org.apache.tuscany.sca/tuscany-host-rmi/${tuscanyVersion}/jar</dependency>          
-    <dependency>org.apache.tuscany.sca/tuscany-implementation-java-xml/${tuscanyVersion}/jar</dependency>      
-    <dependency>org.apache.tuscany.sca/tuscany-implementation-java/${tuscanyVersion}/jar</dependency>      
-    <dependency>org.apache.tuscany.sca/tuscany-interface-java-runtime/${tuscanyVersion}/jar</dependency>      
-    <dependency>org.apache.tuscany.sca/tuscany-interface-java-xml/${tuscanyVersion}/jar</dependency>      
-    <dependency>org.apache.tuscany.sca/tuscany-interface-java/${tuscanyVersion}/jar</dependency>      
-    <dependency>org.apache.tuscany.sca/tuscany-interface-wsdl-xml/${tuscanyVersion}/jar</dependency>      
-    <dependency>org.apache.tuscany.sca/tuscany-interface-wsdl/${tuscanyVersion}/jar</dependency>      
-    <dependency>org.apache.tuscany.sca/tuscany-interface/${tuscanyVersion}/jar</dependency>      
+    <dependency>org.apache.tuscany.sca/tuscany-host-http/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-host-rmi/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-implementation-java-xml/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-implementation-java/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-interface-java-runtime/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-interface-java-xml/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-interface-java/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-interface-wsdl-xml/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-interface-wsdl/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sca/tuscany-interface/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-policy-xml/${tuscanyVersion}/jar</dependency>
     <dependency>org.apache.tuscany.sca/tuscany-policy/${tuscanyVersion}/jar</dependency>
-    <dependency>org.apache.tuscany.sca/tuscany-policy/${tuscanyVersion}/jar</dependency>      
-    <dependency>org.apache.tuscany.sdo/tuscany-sdo-impl/${tuscanyVersion}/jar</dependency>           
-    <dependency>org.apache.ws.commons.axiom/axiom-api/1.2.5/jar</dependency>      
-    <dependency>org.apache.ws.commons.axiom/axiom-dom/1.2.5/jar</dependency>      
-    <dependency>org.apache.ws.commons.axiom/axiom-impl/1.2.5/jar</dependency>      
-    <dependency>org.apache.ws.commons.schema/XmlSchema/1.3.1/jar</dependency>      
-    <dependency>org.codehaus.woodstox/wstx-asl/3.2.0/jar</dependency>                  
-    <dependency>stax/stax-api/1.0.1/jar</dependency>      
-    <dependency>wsdl4j/wsdl4j/1.6.1/jar</dependency>      
-    <dependency>xml-resolver/xml-resolver/1.1/jar</dependency>      
+    <dependency>org.apache.tuscany.sca/tuscany-policy/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.tuscany.sdo/tuscany-sdo-impl/${tuscanyVersion}/jar</dependency>
+    <dependency>org.apache.ws.commons.axiom/axiom-api/1.2.5/jar</dependency>
+    <dependency>org.apache.ws.commons.axiom/axiom-dom/1.2.5/jar</dependency>
+    <dependency>org.apache.ws.commons.axiom/axiom-impl/1.2.5/jar</dependency>
+    <dependency>org.apache.ws.commons.schema/XmlSchema/1.3.1/jar</dependency>
+    <dependency>org.codehaus.woodstox/wstx-asl/3.2.0/jar</dependency>
+    <dependency>stax/stax-api/1.0.1/jar</dependency>
+    <dependency>wsdl4j/wsdl4j/1.6.1/jar</dependency>
+    <dependency>xml-resolver/xml-resolver/1.1/jar</dependency>
 
-    <source-repository>http://repo1.maven.org/maven2/</source-repository> 
-    <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>          
+    <source-repository>http://repo1.maven.org/maven2/</source-repository>
+    <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</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://people.apache.org/~manugeorge/repository/</source-repository>

Modified: geronimo/plugins/tuscany/trunk/tuscany-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/tuscany-tomcat/src/plan/plan.xml?rev=570584&r1=570583&r2=570584&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/tuscany-tomcat/src/plan/plan.xml (original)
+++ geronimo/plugins/tuscany/trunk/tuscany-tomcat/src/plan/plan.xml Tue Aug 28 15:10:16 2007
@@ -203,7 +203,7 @@
                 <artifactId>neethi</artifactId>
                 <version>2.0</version>
                 <type>jar</type>
-               <import>classes</import>
+                <import>classes</import>
             </dependency>
             <dependency>
                 <groupId>com.sun.xml.ws</groupId>
@@ -242,13 +242,6 @@
             </dependency>
 
             <!-- Tuscany SCA -->
-            <!--dependency>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-sca-all</artifactId>        
-                <version>0.99-incubating</version>            
-                <type>jar</type>
-                <import>classes</import>
-            </dependency-->                    
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>sca-api</artifactId>
@@ -257,13 +250,6 @@
                 <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>${tuscanyVersion}</version>
@@ -319,7 +305,6 @@
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
-
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-databinding</artifactId>
@@ -510,7 +495,13 @@
                 <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>wsdl4j</groupId>
                 <artifactId>wsdl4j</artifactId>
@@ -599,4 +590,4 @@
     <gbean name="GeronimoSCADomain" class="org.apache.geronimo.tuscany.EmbeddedSCADomainGBean">
         <attribute name="domainUri">http://localhost:8080/</attribute>
     </gbean>
-</module>
\ No newline at end of file
+</module>



Mime
View raw message