You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by va...@apache.org on 2006/11/13 12:01:34 UTC
svn commit: r474249 - in /geronimo/server/trunk:
applications/console/geronimo-console-framework/
applications/console/geronimo-console-standard/ configs/webconsole-jetty/
configs/webconsole-jetty/src/plan/ configs/webconsole-tomcat/
configs/webconsole...
Author: vamsic007
Date: Mon Nov 13 03:01:33 2006
New Revision: 474249
URL: http://svn.apache.org/viewvc?view=rev&rev=474249
Log:
GERONIMO-2482 Remove console JARs from WEB-INF/lib
Modified:
geronimo/server/trunk/applications/console/geronimo-console-framework/pom.xml
geronimo/server/trunk/applications/console/geronimo-console-standard/pom.xml
geronimo/server/trunk/configs/webconsole-jetty/pom.xml
geronimo/server/trunk/configs/webconsole-jetty/src/plan/plan.xml
geronimo/server/trunk/configs/webconsole-tomcat/pom.xml
geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml
Modified: geronimo/server/trunk/applications/console/geronimo-console-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-framework/pom.xml?view=diff&rev=474249&r1=474248&r2=474249
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-framework/pom.xml (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-framework/pom.xml Mon Nov 13 03:01:33 2006
@@ -49,22 +49,26 @@
<dependency>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto-portal</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto-descriptors</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>castor</groupId>
<artifactId>castor</artifactId>
+ <scope>provided</scope>
</dependency>
<!-- Required for JSPC compilation -->
<dependency>
<groupId>tomcat</groupId>
<artifactId>jasper-runtime</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/pom.xml?view=diff&rev=474249&r1=474248&r2=474249
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/pom.xml (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/pom.xml Mon Nov 13 03:01:33 2006
@@ -93,21 +93,25 @@
<dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto</artifactId>
+ <scope>provided</scope>
</dependency>
<!-- JMS dependencies -->
@@ -123,22 +127,26 @@
<dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>dwr</groupId>
<artifactId>dwr</artifactId>
+ <scope>provided</scope>
</dependency>
<!-- Required for JSPC compilation -->
<dependency>
<groupId>tomcat</groupId>
<artifactId>jasper-runtime</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/configs/webconsole-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-jetty/pom.xml?view=diff&rev=474249&r1=474248&r2=474249
==============================================================================
--- geronimo/server/trunk/configs/webconsole-jetty/pom.xml (original)
+++ geronimo/server/trunk/configs/webconsole-jetty/pom.xml Mon Nov 13 03:01:33 2006
@@ -144,6 +144,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/server/trunk/configs/webconsole-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-jetty/src/plan/plan.xml?view=diff&rev=474249&r1=474248&r2=474249
==============================================================================
--- geronimo/server/trunk/configs/webconsole-jetty/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/webconsole-jetty/src/plan/plan.xml Mon Nov 13 03:01:33 2006
@@ -23,6 +23,32 @@
<module>
<web>framework.war</web>
<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-${geronimoSchemaVersion}">
+ <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>
@@ -31,6 +57,47 @@
<module>
<web>standard.war</web>
<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-${geronimoSchemaVersion}">
+ <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">
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=474249&r1=474248&r2=474249
==============================================================================
--- geronimo/server/trunk/configs/webconsole-tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/webconsole-tomcat/pom.xml Mon Nov 13 03:01:33 2006
@@ -145,6 +145,57 @@
<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>
<build>
Modified: geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml?view=diff&rev=474249&r1=474248&r2=474249
==============================================================================
--- geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml Mon Nov 13 03:01:33 2006
@@ -23,6 +23,32 @@
<module>
<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>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>
<cross-context/>
<security-realm-name>geronimo-properties-realm</security-realm-name>
@@ -32,6 +58,47 @@
<module>
<web>standard.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>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>
<cross-context/>
<security-realm-name>geronimo-properties-realm</security-realm-name>