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 2006/08/17 01:25:40 UTC
svn commit: r432066 - in /geronimo/trunk/configs: console-jetty/pom.xml
console-tomcat/pom.xml
Author: djencks
Date: Wed Aug 16 16:25:40 2006
New Revision: 432066
URL: http://svn.apache.org/viewvc?rev=432066&view=rev
Log:
GERONIMO-2325. Make the console work better by improving its dependencies. I may have removed too many, I left the ones I'm not sure about in but commented
Modified:
geronimo/trunk/configs/console-jetty/pom.xml
geronimo/trunk/configs/console-tomcat/pom.xml
Modified: geronimo/trunk/configs/console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/console-jetty/pom.xml?rev=432066&r1=432065&r2=432066&view=diff
==============================================================================
--- geronimo/trunk/configs/console-jetty/pom.xml (original)
+++ geronimo/trunk/configs/console-jetty/pom.xml Wed Aug 16 16:25:40 2006
@@ -48,24 +48,23 @@
<version>${pom.version}</version>
<type>car</type>
</dependency>
-
- <!-- for login module manager -->
+
+ <!-- we use it... and need its xmlbeans copy in our cl -->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>j2ee-security</artifactId>
+ <artifactId>j2ee-deployer</artifactId>
<version>${pom.version}</version>
<type>car</type>
</dependency>
-
- <!-- To enforce build order -->
+
+ <!-- for login module manager -->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jetty-deployer</artifactId>
+ <artifactId>j2ee-security</artifactId>
<version>${pom.version}</version>
<type>car</type>
- <scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.applications.console</groupId>
<artifactId>geronimo-console-core</artifactId>
@@ -77,6 +76,7 @@
<artifactId>geronimo-console</artifactId>
<version>${pom.version}</version>
<type>ear</type>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -87,33 +87,15 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-connector-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-deploy-jsr88</artifactId>
<version>${pom.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-deploy-config</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-j2ee-schema</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-jetty</artifactId>
- <version>${pom.version}</version>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.modules</groupId>-->
+ <!--<artifactId>geronimo-deploy-config</artifactId>-->
+ <!--<version>${pom.version}</version>-->
+ <!--</dependency>-->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
@@ -121,29 +103,11 @@
<version>${pom.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-naming-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-security-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-service-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-test-ddbean</artifactId>
- <version>${pom.version}</version>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.modules</groupId>-->
+ <!--<artifactId>geronimo-test-ddbean</artifactId>-->
+ <!--<version>${pom.version}</version>-->
+ <!--</dependency>-->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
@@ -151,11 +115,11 @@
<version>${pom.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-util</artifactId>
- <version>${pom.version}</version>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.modules</groupId>-->
+ <!--<artifactId>geronimo-util</artifactId>-->
+ <!--<version>${pom.version}</version>-->
+ <!--</dependency>-->
<dependency>
<groupId>activemq</groupId>
Modified: geronimo/trunk/configs/console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/console-tomcat/pom.xml?rev=432066&r1=432065&r2=432066&view=diff
==============================================================================
--- geronimo/trunk/configs/console-tomcat/pom.xml (original)
+++ geronimo/trunk/configs/console-tomcat/pom.xml Wed Aug 16 16:25:40 2006
@@ -49,23 +49,22 @@
<type>car</type>
</dependency>
- <!-- for login module manager -->
+ <!-- we use it... and need its xmlbeans copy in our cl -->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>j2ee-security</artifactId>
+ <artifactId>j2ee-deployer</artifactId>
<version>${pom.version}</version>
<type>car</type>
</dependency>
-
- <!-- to enforce build order -->
+
+ <!-- for login module manager -->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat-deployer</artifactId>
+ <artifactId>j2ee-security</artifactId>
<version>${pom.version}</version>
<type>car</type>
- <scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.applications.console</groupId>
<artifactId>geronimo-console-core</artifactId>
@@ -77,6 +76,7 @@
<artifactId>geronimo-console</artifactId>
<version>${pom.version}</version>
<type>ear</type>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -87,33 +87,15 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-connector-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-deploy-jsr88</artifactId>
<version>${pom.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-deploy-config</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-j2ee-schema</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-tomcat</artifactId>
- <version>${pom.version}</version>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.modules</groupId>-->
+ <!--<artifactId>geronimo-deploy-config</artifactId>-->
+ <!--<version>${pom.version}</version>-->
+ <!--</dependency>-->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
@@ -121,29 +103,11 @@
<version>${pom.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-naming-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-security-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-service-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-test-ddbean</artifactId>
- <version>${pom.version}</version>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.modules</groupId>-->
+ <!--<artifactId>geronimo-test-ddbean</artifactId>-->
+ <!--<version>${pom.version}</version>-->
+ <!--</dependency>-->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
@@ -151,11 +115,11 @@
<version>${pom.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-util</artifactId>
- <version>${pom.version}</version>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.modules</groupId>-->
+ <!--<artifactId>geronimo-util</artifactId>-->
+ <!--<version>${pom.version}</version>-->
+ <!--</dependency>-->
<dependency>
<groupId>activemq</groupId>