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/11/14 20:43:18 UTC
svn commit: r474937 - in
/geronimo/sandbox/javaee5/configs-jee5/webconsole-jetty6: pom.xml
src/plan/plan.xml
Author: jbohn
Date: Tue Nov 14 11:43:17 2006
New Revision: 474937
URL: http://svn.apache.org/viewvc?view=rev&rev=474937
Log:
sync up with trunk changes removing console JARs from WEB-INF/lib
Modified:
geronimo/sandbox/javaee5/configs-jee5/webconsole-jetty6/pom.xml
geronimo/sandbox/javaee5/configs-jee5/webconsole-jetty6/src/plan/plan.xml
Modified: geronimo/sandbox/javaee5/configs-jee5/webconsole-jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/configs-jee5/webconsole-jetty6/pom.xml?view=diff&rev=474937&r1=474936&r2=474937
==============================================================================
--- geronimo/sandbox/javaee5/configs-jee5/webconsole-jetty6/pom.xml (original)
+++ geronimo/sandbox/javaee5/configs-jee5/webconsole-jetty6/pom.xml Tue Nov 14 11:43:17 2006
@@ -142,6 +142,57 @@
<groupId>portlet-api</groupId>
<artifactId>portlet-api</artifactId>
</dependency>
+
+ <!-- Added to eliminate packaging of libraries in WEB-INF/lib in console-standard and console-framework applications -->
+ <dependency>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto-portal</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto-descriptors</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>castor</groupId>
+ <artifactId>castor</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-runtime</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>dwr</groupId>
+ <artifactId>dwr</artifactId>
+ </dependency>
</dependencies>
Modified: geronimo/sandbox/javaee5/configs-jee5/webconsole-jetty6/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/configs-jee5/webconsole-jetty6/src/plan/plan.xml?view=diff&rev=474937&r1=474936&r2=474937
==============================================================================
--- geronimo/sandbox/javaee5/configs-jee5/webconsole-jetty6/src/plan/plan.xml (original)
+++ geronimo/sandbox/javaee5/configs-jee5/webconsole-jetty6/src/plan/plan.xml Tue Nov 14 11:43:17 2006
@@ -22,6 +22,32 @@
<module>
<web>framework.war</web>
<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1">
+ <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+ <dependencies>
+ <dependency>
+ <groupId>castor</groupId>
+ <artifactId>castor</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>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-runtime</artifactId>
+ <type>jar</type>
+ </dependency>
+ </dependencies>
+ <inverse-classloading/>
+ </environment>
+
<context-root>console</context-root>
<security-realm-name>geronimo-properties-realm</security-realm-name>
</web-app>
@@ -30,6 +56,47 @@
<module>
<web>standard.war</web>
<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1">
+ <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+ <dependencies>
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>dwr</groupId>
+ <artifactId>dwr</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-runtime</artifactId>
+ <type>jar</type>
+ </dependency>
+ </dependencies>
+ <inverse-classloading/>
+ </environment>
+
<context-root>/console-standard</context-root>
<security-realm-name>geronimo-properties-realm</security-realm-name>
<gbean name="PropertiesLoginManager" class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager">