You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2007/01/06 00:56:06 UTC
svn commit: r493249 - in /geronimo/server/trunk/configs:
client-deployer/src/plan/ connector-deployer/src/plan/
geronimo-gbean-deployer/ j2ee-deployer/ j2ee-deployer/src/plan/
jetty6-deployer/src/plan/ openejb-deployer/src/plan/
tomcat6-deployer/src/pl...
Author: djencks
Date: Fri Jan 5 15:56:05 2007
New Revision: 493249
URL: http://svn.apache.org/viewvc?view=rev&rev=493249
Log:
GERONIMO-2686 missed the configs changes in previous commit
Modified:
geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml
geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml
geronimo/server/trunk/configs/geronimo-gbean-deployer/pom.xml
geronimo/server/trunk/configs/j2ee-deployer/pom.xml
geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml
geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml
geronimo/server/trunk/configs/openejb-deployer/src/plan/plan.xml
geronimo/server/trunk/configs/tomcat6-deployer/src/plan/plan.xml
geronimo/server/trunk/configs/webconsole-jetty6/pom.xml
Modified: geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml?view=diff&rev=493249&r1=493248&r2=493249
==============================================================================
--- geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml Fri Jan 5 15:56:05 2007
@@ -88,4 +88,6 @@
</gbean>
+ <gbean name="ClientConfigurer" class="org.apache.geronimo.client.builder.jsr88.ClientConfigurer"/>
+
</module>
Modified: geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml?view=diff&rev=493249&r1=493248&r2=493249
==============================================================================
--- geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml Fri Jan 5 15:56:05 2007
@@ -85,4 +85,6 @@
<attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee</attribute>
</gbean>
+ <gbean name="RARConfigurer" class="org.apache.geronimo.connector.deployment.RARConfigurer"/>
+
</module>
Modified: geronimo/server/trunk/configs/geronimo-gbean-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/geronimo-gbean-deployer/pom.xml?view=diff&rev=493249&r1=493248&r2=493249
==============================================================================
--- geronimo/server/trunk/configs/geronimo-gbean-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/geronimo-gbean-deployer/pom.xml Fri Jan 5 15:56:05 2007
@@ -54,6 +54,12 @@
<artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
</dependency>
+ <!-- jsr88 dconfigbean support base classes -->
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-deploy-config</artifactId>
+ <version>${version}</version>
+ </dependency>
<!-- Thirdparty Dependencies -->
<dependency>
Modified: geronimo/server/trunk/configs/j2ee-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-deployer/pom.xml?view=diff&rev=493249&r1=493248&r2=493249
==============================================================================
--- geronimo/server/trunk/configs/j2ee-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/j2ee-deployer/pom.xml Fri Jan 5 15:56:05 2007
@@ -92,6 +92,7 @@
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-test-ddbean</artifactId>
<version>${version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
Modified: geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml?view=diff&rev=493249&r1=493248&r2=493249
==============================================================================
--- geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml Fri Jan 5 15:56:05 2007
@@ -145,4 +145,6 @@
<attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee</attribute>
</gbean>
+ <gbean name="EARConfigurer" class="org.apache.geronimo.j2ee.jsr88.EARConfigurer"/>
+
</module>
Modified: geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml?view=diff&rev=493249&r1=493248&r2=493249
==============================================================================
--- geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml Fri Jan 5 15:56:05 2007
@@ -124,4 +124,6 @@
<attribute name="servletName">dummy</attribute>
</gbean>
+ <gbean name="Jetty6WARConfigurer" class="org.apache.geronimo.web.deployment.WARConfigurer"/>
+
</module>
Modified: geronimo/server/trunk/configs/openejb-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/openejb-deployer/src/plan/plan.xml?view=diff&rev=493249&r1=493248&r2=493249
==============================================================================
--- geronimo/server/trunk/configs/openejb-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/openejb-deployer/src/plan/plan.xml Fri Jan 5 15:56:05 2007
@@ -113,4 +113,6 @@
<gbean name="WebServiceEJBLinkTemplate" class="org.apache.openejb.server.axis.WSContainerGBean"/>
+ <gbean name="EJBConfigurer" class="org.apache.openejb.deployment.EjbConfigurer"/>
+
</module>
Modified: geronimo/server/trunk/configs/tomcat6-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/tomcat6-deployer/src/plan/plan.xml?view=diff&rev=493249&r1=493248&r2=493249
==============================================================================
--- geronimo/server/trunk/configs/tomcat6-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/tomcat6-deployer/src/plan/plan.xml Fri Jan 5 15:56:05 2007
@@ -71,4 +71,6 @@
</xml-attribute>
</gbean>
+ <gbean name="Tomcat6WARConfigurer" class="org.apache.geronimo.web.deployment.WARConfigurer"/>
+
</module>
Modified: geronimo/server/trunk/configs/webconsole-jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-jetty6/pom.xml?view=diff&rev=493249&r1=493248&r2=493249
==============================================================================
--- geronimo/server/trunk/configs/webconsole-jetty6/pom.xml (original)
+++ geronimo/server/trunk/configs/webconsole-jetty6/pom.xml Fri Jan 5 15:56:05 2007
@@ -44,37 +44,41 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jetty6-deployer</artifactId>
+ <artifactId>system-database</artifactId>
<version>${pom.version}</version>
<type>car</type>
- <scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>cxf-deployer</artifactId>
+ <artifactId>dojo-jetty6</artifactId>
<version>${pom.version}</version>
<type>car</type>
- <scope>provided</scope>
</dependency>
+ <!-- we use it... and need its xmlbeans copy in our cl -->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>system-database</artifactId>
+ <artifactId>j2ee-deployer</artifactId>
<version>${pom.version}</version>
<type>car</type>
</dependency>
-
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>dojo-jetty6</artifactId>
+ <artifactId>jetty6-deployer</artifactId>
<version>${pom.version}</version>
<type>car</type>
</dependency>
-
- <!-- we use it... and need its xmlbeans copy in our cl -->
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.configs</groupId>-->
+ <!--<artifactId>cxf-deployer</artifactId>-->
+ <!--<version>${pom.version}</version>-->
+ <!--<type>car</type>-->
+ <!--<scope>provided</scope>-->
+ <!--</dependency>-->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>j2ee-deployer</artifactId>
+ <artifactId>connector-deployer</artifactId>
<version>${pom.version}</version>
<type>car</type>
</dependency>
@@ -183,14 +187,6 @@
<dependency>
<groupId>dwr</groupId>
<artifactId>dwr</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jetty6-deployer</artifactId>
- <version>${version}</version>
- <type>car</type>
- <scope>provided</scope>
</dependency>
</dependencies>