You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ri...@apache.org on 2011/01/12 15:34:22 UTC
svn commit: r1058156 - in /geronimo/server/trunk:
plugingroups/javaee6-tomcat/ plugingroups/javaee6-tomcat/src/main/history/
plugins/jetty8/jetty8-clustering-wadi/src/main/history/
plugins/jetty8/jetty8/src/main/history/ plugins/openejb/openejb/src/mai...
Author: rickmcguire
Date: Wed Jan 12 14:34:21 2011
New Revision: 1058156
URL: http://svn.apache.org/viewvc?rev=1058156&view=rev
Log:
temporarily remove wink dependencies to fix build problem
Modified:
geronimo/server/trunk/plugingroups/javaee6-tomcat/pom.xml
geronimo/server/trunk/plugingroups/javaee6-tomcat/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/jetty8/jetty8-clustering-wadi/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/jetty8/jetty8/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependencies.xml
Modified: geronimo/server/trunk/plugingroups/javaee6-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/javaee6-tomcat/pom.xml?rev=1058156&r1=1058155&r2=1058156&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/javaee6-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/javaee6-tomcat/pom.xml Wed Jan 12 14:34:21 2011
@@ -108,6 +108,8 @@
<!--<version>${project.version}</version>-->
<!--<type>car</type>-->
<!--</dependency>-->
+
+ <!--
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>wink</artifactId>
@@ -120,6 +122,7 @@
<version>${project.version}</version>
<type>car</type>
</dependency>
+ -->
</dependencies>
Modified: geronimo/server/trunk/plugingroups/javaee6-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/javaee6-tomcat/src/main/history/dependencies.xml?rev=1058156&r1=1058155&r2=1058156&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/javaee6-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugingroups/javaee6-tomcat/src/main/history/dependencies.xml Wed Jan 12 14:34:21 2011
@@ -17,16 +17,6 @@
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>wink</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>wink-deployer</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.plugingroups</groupId>
<artifactId>client</artifactId>
<type>car</type>
Modified: geronimo/server/trunk/plugins/jetty8/jetty8-clustering-wadi/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/jetty8-clustering-wadi/src/main/history/dependencies.xml?rev=1058156&r1=1058155&r2=1058156&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/jetty8-clustering-wadi/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/jetty8/jetty8-clustering-wadi/src/main/history/dependencies.xml Wed Jan 12 14:34:21 2011
@@ -58,11 +58,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-openwebbeans</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-wab</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/plugins/jetty8/jetty8/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/jetty8/src/main/history/dependencies.xml?rev=1058156&r1=1058155&r2=1058156&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/jetty8/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/jetty8/jetty8/src/main/history/dependencies.xml Wed Jan 12 14:34:21 2011
@@ -33,6 +33,11 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>openwebbeans</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
<artifactId>transaction-1_6</artifactId>
<type>car</type>
</dependency>
@@ -63,11 +68,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-openwebbeans</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-wab</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml?rev=1058156&r1=1058155&r2=1058156&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml Wed Jan 12 14:34:21 2011
@@ -7,21 +7,6 @@
<type>car</type>
</module-id>
<dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>commons-digester</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>commons-discovery</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>jstl</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-server</artifactId>
<type>car</type>
@@ -33,6 +18,11 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>openwebbeans</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
<artifactId>system-database</artifactId>
<type>car</type>
</dependency>
@@ -58,35 +48,15 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-openwebbeans</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-persistence-jpa20</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxws_2.2_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.2_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-bundle</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>commons-dbcp-all</artifactId>
<type>jar</type>
@@ -143,32 +113,12 @@
</dependency>
<dependency>
<groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-ejb</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-jsf</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-resource</artifactId>
+ <artifactId>openwebbeans-ee-common</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-web</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.commons-codec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.dom4j</artifactId>
+ <artifactId>openwebbeans-ejb</artifactId>
<type>jar</type>
</dependency>
<dependency>
@@ -187,16 +137,6 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-bundleutils</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-finder</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-spec-corba</artifactId>
<type>jar</type>
Modified: geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependencies.xml?rev=1058156&r1=1058155&r2=1058156&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependencies.xml Wed Jan 12 14:34:21 2011
@@ -33,6 +33,11 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>openwebbeans</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
<artifactId>transaction-1_6</artifactId>
<type>car</type>
</dependency>
@@ -73,11 +78,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-openwebbeans</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-tomcat7</artifactId>
<type>jar</type>
</dependency>