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/05/04 00:43:31 UTC
svn commit: r535002 - in /geronimo/server/trunk/configs:
webconsole-jetty6/pom.xml webconsole-tomcat/pom.xml
Author: djencks
Date: Thu May 3 15:43:30 2007
New Revision: 535002
URL: http://svn.apache.org/viewvc?view=rev&rev=535002
Log:
GERONIMO-3138 seems to require tomcat webconsole to have an orb available
Modified:
geronimo/server/trunk/configs/webconsole-jetty6/pom.xml
geronimo/server/trunk/configs/webconsole-tomcat/pom.xml
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=535002&r1=535001&r2=535002
==============================================================================
--- geronimo/server/trunk/configs/webconsole-jetty6/pom.xml (original)
+++ geronimo/server/trunk/configs/webconsole-jetty6/pom.xml Thu May 3 15:43:30 2007
@@ -73,16 +73,11 @@
<!-- we use it... and need its xmlbeans copy in our cl -->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>j2ee-deployer</artifactId>
- <version>${version}</version>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
<artifactId>jetty6-deployer</artifactId>
<version>${version}</version>
<type>car</type>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>connector-deployer</artifactId>
@@ -138,6 +133,13 @@
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-activemq-management</artifactId>
<version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>j2ee-corba-yoko</artifactId>
+ <version>${version}</version>
+ <type>car</type>
</dependency>
<dependency>
Modified: geronimo/server/trunk/configs/webconsole-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-tomcat/pom.xml?view=diff&rev=535002&r1=535001&r2=535002
==============================================================================
--- geronimo/server/trunk/configs/webconsole-tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/webconsole-tomcat/pom.xml Thu May 3 15:43:30 2007
@@ -88,13 +88,6 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>openejb-deployer</artifactId>
- <version>${version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
<groupId>org.apache.geronimo.applications.console</groupId>
<artifactId>geronimo-console-core</artifactId>
<version>${version}</version>
@@ -105,7 +98,7 @@
<artifactId>geronimo-console</artifactId>
<version>${version}</version>
<type>ear</type>
- <scope>test</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -145,6 +138,13 @@
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>j2ee-corba-yoko</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
<groupId>jdom</groupId>
<artifactId>jdom</artifactId>
</dependency>
@@ -195,18 +195,6 @@
<artifactId>dwr</artifactId>
</dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat6-deployer</artifactId>
- <version>${version}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>