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/09/11 18:55:07 UTC
svn commit: r574639 - in /geronimo/server/trunk: assemblies/pom.xml
configs/webconsole-jetty6/src/main/plan/plan.xml
configs/webconsole-tomcat/src/main/plan/plan.xml
Author: djencks
Date: Tue Sep 11 09:55:05 2007
New Revision: 574639
URL: http://svn.apache.org/viewvc?rev=574639&view=rev
Log:
Undo breakage from previous commit
Modified:
geronimo/server/trunk/assemblies/pom.xml
geronimo/server/trunk/configs/webconsole-jetty6/src/main/plan/plan.xml
geronimo/server/trunk/configs/webconsole-tomcat/src/main/plan/plan.xml
Modified: geronimo/server/trunk/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/pom.xml?rev=574639&r1=574638&r2=574639&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/pom.xml (original)
+++ geronimo/server/trunk/assemblies/pom.xml Tue Sep 11 09:55:05 2007
@@ -42,20 +42,16 @@
<modules>
<module>geronimo-boilerplate-minimal</module>
<module>geronimo-boilerplate-jee5</module>
-<!--
<module>geronimo-jetty6-jee5</module>
<module>geronimo-tomcat6-jee5</module>
--->
<!--
NOTE: Don't enable by default for now...
<module>geronimo-jetty6-javaee5-gshell</module>
-->
<module>geronimo-framework</module>
-<!--
<module>geronimo-jetty6-minimal</module>
<module>geronimo-tomcat6-minimal</module>
--->
</modules>
</project>
Modified: geronimo/server/trunk/configs/webconsole-jetty6/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-jetty6/src/main/plan/plan.xml?rev=574639&r1=574638&r2=574639&view=diff
==============================================================================
--- geronimo/server/trunk/configs/webconsole-jetty6/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/webconsole-jetty6/src/main/plan/plan.xml Tue Sep 11 09:55:05 2007
@@ -19,6 +19,29 @@
<web>framework.war</web>
<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2">
<environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.castor</groupId>
+ <artifactId>castor</artifactId>
+ <type>jar</type>
+ </dependency>
+ <!--required for castor-->
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto-descriptors</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto-portal</artifactId>
+ <type>jar</type>
+ </dependency>
+ </dependencies>
<inverse-classloading/>
</environment>
<context-root>console</context-root>
Modified: geronimo/server/trunk/configs/webconsole-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-tomcat/src/main/plan/plan.xml?rev=574639&r1=574638&r2=574639&view=diff
==============================================================================
--- geronimo/server/trunk/configs/webconsole-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/webconsole-tomcat/src/main/plan/plan.xml Tue Sep 11 09:55:05 2007
@@ -24,6 +24,29 @@
<web>framework.war</web>
<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-${geronimoSchemaVersion}">
<environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.castor</groupId>
+ <artifactId>castor</artifactId>
+ <type>jar</type>
+ </dependency>
+ <!-- Required for Castor -->
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto-descriptors</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto-portal</artifactId>
+ <type>jar</type>
+ </dependency>
+ </dependencies>
<inverse-classloading/>
</environment>