You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jb...@apache.org on 2006/10/14 22:21:10 UTC
svn commit: r464015 - in /geronimo/server/trunk:
assemblies/geronimo-framework/
assemblies/geronimo-framework/src/main/var/config/ configs/jetty-deployer/
configs/jetty-deployer/src/main/resources/META-INF/ configs/jetty/
configs/jetty/src/main/resourc...
Author: jbohn
Date: Sat Oct 14 13:21:09 2006
New Revision: 464015
URL: http://svn.apache.org/viewvc?view=rev&rev=464015
Log:
GERONIMO-2417 Some more cleanup for microG
Modified:
geronimo/server/trunk/assemblies/geronimo-framework/pom.xml
geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/config.xml
geronimo/server/trunk/configs/jetty-deployer/pom.xml
geronimo/server/trunk/configs/jetty-deployer/src/main/resources/META-INF/geronimo-plugin.xml
geronimo/server/trunk/configs/jetty/pom.xml
geronimo/server/trunk/configs/jetty/src/main/resources/META-INF/geronimo-plugin.xml
geronimo/server/trunk/configs/tomcat-deployer/pom.xml
geronimo/server/trunk/configs/tomcat-deployer/src/main/resources/META-INF/geronimo-plugin.xml
geronimo/server/trunk/configs/tomcat/pom.xml
geronimo/server/trunk/configs/tomcat/src/main/resources/META-INF/geronimo-plugin.xml
Modified: geronimo/server/trunk/assemblies/geronimo-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-framework/pom.xml?view=diff&rev=464015&r1=464014&r2=464015
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-framework/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-framework/pom.xml Sat Oct 14 13:21:09 2006
@@ -54,13 +54,6 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>j2ee-server</artifactId>
- <version>${pom.version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-security</artifactId>
<version>${pom.version}</version>
<type>car</type>
@@ -89,13 +82,6 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>sharedlib</artifactId>
- <version>${pom.version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
<artifactId>online-deployer</artifactId>
<version>${pom.version}</version>
<type>car</type>
@@ -118,13 +104,6 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>unavailable-ejb-deployer</artifactId>
- <version>${pom.version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>hot-deployer</artifactId>
<version>${pom.version}</version>
<type>car</type>
</dependency>
Modified: geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/config.xml?view=diff&rev=464015&r1=464014&r2=464015
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/config.xml Sat Oct 14 13:21:09 2006
@@ -22,8 +22,6 @@
</gbean>
</module>
- <module name="org.apache.geronimo.configs/j2ee-server/${pom.version}/car"/>
-
<module name="org.apache.geronimo.configs/j2ee-security/${pom.version}/car">
<gbean name="JaasLoginServiceRemotingServer">
<attribute name="host">${PlanServerHostname}</attribute>
@@ -51,13 +49,4 @@
<module name="org.apache.geronimo.configs/unavailable-client-deployer/${pom.version}/car"/>
- <module name="org.apache.geronimo.configs/sharedlib/${pom.version}/car">
- <gbean name="SharedLib">
- <attribute name="classesDirs">var/shared/classes</attribute>
- <attribute name="libDirs">var/shared/lib</attribute>
- </gbean>
- </module>
-
- <module name="org.apache.geronimo.configs/hot-deployer/${pom.version}/car"/>
-
</attributes>
Modified: geronimo/server/trunk/configs/jetty-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty-deployer/pom.xml?view=diff&rev=464015&r1=464014&r2=464015
==============================================================================
--- geronimo/server/trunk/configs/jetty-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/jetty-deployer/pom.xml Sat Oct 14 13:21:09 2006
@@ -81,7 +81,6 @@
<configuration>
<deploymentConfigs>
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
- <deploymentConfig>${j2eeDeployer}</deploymentConfig>
</deploymentConfigs>
</configuration>
</plugin>
Modified: geronimo/server/trunk/configs/jetty-deployer/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty-deployer/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=464015&r1=464014&r2=464015
==============================================================================
--- geronimo/server/trunk/configs/jetty-deployer/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/jetty-deployer/src/main/resources/META-INF/geronimo-plugin.xml Sat Oct 14 13:21:09 2006
@@ -27,12 +27,12 @@
<prerequisite>
<id>org.apache.geronimo.configs/jetty//car</id>
<resource-type>Web Container</resource-type>
- <description> This version of the Jetty Deployer requires that the Tomcat web container is present. </description>
+ <description> This version of the Jetty Deployer requires that the Jetty web container is present. </description>
</prerequisite>
- <dependency>org.apache.geronimo.configs/connector-deployer//car</dependency>
- <dependency>org.apache.geronimo.modules/geronimo-jetty-builder//jar</dependency>
<dependency>org.apache.geronimo.configs/j2ee-deployer//car</dependency>
+ <dependency>org.apache.geronimo.configs/connector-deployer//car</dependency>
<dependency>org.apache.geronimo.configs/jetty//car</dependency>
+ <dependency>org.apache.geronimo.modules/geronimo-jetty-builder//jar</dependency>
<obsoletes>org.apache.geronimo.configs/jetty-deployer//car</obsoletes>
<source-repository>http://www.geronimoplugins.com/repository/geronimo-1.1/</source-repository>
<source-repository>http://www.ibiblio.org/maven2/</source-repository>
Modified: geronimo/server/trunk/configs/jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty/pom.xml?view=diff&rev=464015&r1=464014&r2=464015
==============================================================================
--- geronimo/server/trunk/configs/jetty/pom.xml (original)
+++ geronimo/server/trunk/configs/jetty/pom.xml Sat Oct 14 13:21:09 2006
@@ -86,7 +86,6 @@
<configuration>
<deploymentConfigs>
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
- <deploymentConfig>${j2eeDeployer}</deploymentConfig>
</deploymentConfigs>
</configuration>
</plugin>
Modified: geronimo/server/trunk/configs/jetty/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=464015&r1=464014&r2=464015
==============================================================================
--- geronimo/server/trunk/configs/jetty/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/jetty/src/main/resources/META-INF/geronimo-plugin.xml Sat Oct 14 13:21:09 2006
@@ -24,11 +24,11 @@
<author>The Apache Geronimo development community</author>
<license osi-approved="true">Apache Software License (ASL) 2.0</license>
<geronimo-version>${pom.currentVersion}</geronimo-version>
- <dependency>org.apache.geronimo.modules/geronimo-jetty//jar</dependency>
- <dependency>org.apache.geronimo.configs/transaction//car</dependency>
<dependency>org.apache.geronimo.configs/j2ee-server//car</dependency>
- <dependency>org.apache.geronimo.modules/geronimo-clustering//jar</dependency>
<dependency>org.apache.geronimo.configs/j2ee-security//car</dependency>
+ <dependency>org.apache.geronimo.configs/transaction//car</dependency>
+ <dependency>org.apache.geronimo.configs/clustering//car</dependency>
+ <dependency>org.apache.geronimo.modules/geronimo-jtty//jar</dependency>
<obsoletes>org.apache.geronimo.configs/jetty//car</obsoletes>
<source-repository>http://www.geronimoplugins.com/repository/geronimo-1.1/</source-repository>
<source-repository>http://www.ibiblio.org/maven2/</source-repository>
Modified: geronimo/server/trunk/configs/tomcat-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/tomcat-deployer/pom.xml?view=diff&rev=464015&r1=464014&r2=464015
==============================================================================
--- geronimo/server/trunk/configs/tomcat-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/tomcat-deployer/pom.xml Sat Oct 14 13:21:09 2006
@@ -81,7 +81,6 @@
<configuration>
<deploymentConfigs>
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
- <deploymentConfig>${j2eeDeployer}</deploymentConfig>
</deploymentConfigs>
</configuration>
</plugin>
Modified: geronimo/server/trunk/configs/tomcat-deployer/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/tomcat-deployer/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=464015&r1=464014&r2=464015
==============================================================================
--- geronimo/server/trunk/configs/tomcat-deployer/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/tomcat-deployer/src/main/resources/META-INF/geronimo-plugin.xml Sat Oct 14 13:21:09 2006
@@ -29,10 +29,10 @@
<resource-type>Web Container</resource-type>
<description> This version of the Tomcat Deployer requires that the Tomcat web container is present. </description>
</prerequisite>
+ <dependency>org.apache.geronimo.configs/j2ee-deployer//car</dependency>
+ <dependency>org.apache.geronimo.configs/connector-deployer//car</dependency>
<dependency>org.apache.geronimo.configs/tomcat//car</dependency>
<dependency>org.apache.geronimo.modules/geronimo-tomcat-builder//jar</dependency>
- <dependency>org.apache.geronimo.configs/connector-deployer//car</dependency>
- <dependency>org.apache.geronimo.configs/j2ee-deployer//car</dependency>
<obsoletes>org.apache.geronimo.configs/tomcat-deployer//car</obsoletes>
<source-repository>http://www.geronimoplugins.com/repository/geronimo-1.1/</source-repository>
<source-repository>http://www.ibiblio.org/maven2/</source-repository>
Modified: geronimo/server/trunk/configs/tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/tomcat/pom.xml?view=diff&rev=464015&r1=464014&r2=464015
==============================================================================
--- geronimo/server/trunk/configs/tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/tomcat/pom.xml Sat Oct 14 13:21:09 2006
@@ -78,7 +78,6 @@
<configuration>
<deploymentConfigs>
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
- <deploymentConfig>${j2eeDeployer}</deploymentConfig>
</deploymentConfigs>
</configuration>
</plugin>
Modified: geronimo/server/trunk/configs/tomcat/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/tomcat/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=464015&r1=464014&r2=464015
==============================================================================
--- geronimo/server/trunk/configs/tomcat/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/tomcat/src/main/resources/META-INF/geronimo-plugin.xml Sat Oct 14 13:21:09 2006
@@ -24,10 +24,10 @@
<author>The Apache Geronimo development community</author>
<license osi-approved="true">Apache Software License (ASL) 2.0</license>
<geronimo-version>${pom.currentVersion}</geronimo-version>
- <dependency>org.apache.geronimo.modules/geronimo-tomcat//jar</dependency>
- <dependency>org.apache.geronimo.configs/transaction//car</dependency>
<dependency>org.apache.geronimo.configs/j2ee-server//car</dependency>
<dependency>org.apache.geronimo.configs/j2ee-security//car</dependency>
+ <dependency>org.apache.geronimo.configs/transaction//car</dependency>
+ <dependency>org.apache.geronimo.modules/geronimo-tomcat//jar</dependency>
<obsoletes>org.apache.geronimo.configs/tomcat//car</obsoletes>
<source-repository>http://www.geronimoplugins.com/repository/geronimo-1.1/</source-repository>
<source-repository>http://www.ibiblio.org/maven2/</source-repository>