Author: vamsic007
Date: Thu Nov 9 05:43:13 2006
New Revision: 472897
URL: http://svn.apache.org/viewvc?view=rev&rev=472897
Log:
GERONIMO-2482 Remove console JARs from WEB-INF/lib
Modified:
geronimo/server/branches/1.1/applications/console-framework/project.xml
geronimo/server/branches/1.1/applications/console-standard/project.xml
geronimo/server/branches/1.1/configs/console-jetty/project.xml
geronimo/server/branches/1.1/configs/console-jetty/src/plan/plan.xml
geronimo/server/branches/1.1/configs/console-tomcat/project.xml
geronimo/server/branches/1.1/configs/console-tomcat/src/plan/plan.xml
Modified: geronimo/server/branches/1.1/applications/console-framework/project.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1/applications/console-framework/project.xml?view=diff&rev=472897&r1=472896&r2=472897
==============================================================================
--- geronimo/server/branches/1.1/applications/console-framework/project.xml (original)
+++ geronimo/server/branches/1.1/applications/console-framework/project.xml Thu Nov 9 05:43:13
2006
@@ -33,9 +33,6 @@
<artifactId>commons-el</artifactId>
<version>${commons_el_version}</version>
<url>http://jakarta.apache.org/commons/el/</url>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
@@ -61,25 +58,16 @@
<groupId>org.apache.pluto</groupId>
<artifactId>pluto-portal</artifactId>
<version>${pluto_version}</version>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
</dependency>
<dependency>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto-descriptors</artifactId>
<version>${pluto_version}</version>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
</dependency>
<dependency>
<groupId>castor</groupId>
<artifactId>castor</artifactId>
<version>${castor_version}</version>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
</dependency>
<dependency>
Modified: geronimo/server/branches/1.1/applications/console-standard/project.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1/applications/console-standard/project.xml?view=diff&rev=472897&r1=472896&r2=472897
==============================================================================
--- geronimo/server/branches/1.1/applications/console-standard/project.xml (original)
+++ geronimo/server/branches/1.1/applications/console-standard/project.xml Thu Nov 9 05:43:13
2006
@@ -152,25 +152,16 @@
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
<version>${commons_digester_version}</version>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>${commons_fileupload_version}</version>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons_io_version}</version>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
</dependency>
<!-- Portlet services manager dependencies -->
<dependency>
@@ -237,17 +228,11 @@
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
<version>${standard_taglibs_version}</version>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
</dependency>
<dependency>
<groupId>jstl</groupId>
<artifactId>jstl</artifactId>
<version>${jstl_version}</version>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
</dependency>
<dependency>
<groupId>tomcat</groupId>
@@ -263,9 +248,6 @@
<groupId>dwr</groupId>
<artifactId>dwr</artifactId>
<version>${dwr_version}</version>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
</dependency>
<dependency>
<groupId>xmlbeans</groupId>
Modified: geronimo/server/branches/1.1/configs/console-jetty/project.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1/configs/console-jetty/project.xml?view=diff&rev=472897&r1=472896&r2=472897
==============================================================================
--- geronimo/server/branches/1.1/configs/console-jetty/project.xml (original)
+++ geronimo/server/branches/1.1/configs/console-jetty/project.xml Thu Nov 9 05:43:13 2006
@@ -145,6 +145,99 @@
<geronimo.keep.version>true</geronimo.keep.version>
</properties>
</dependency>
+
+ <!-- Added to eliminate packaging of libraries in WEB-INF/lib in console-standard
and console-framework applications -->
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>${commons_digester_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ <geronimo.keep.version>true</geronimo.keep.version>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>${commons_fileupload_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ <geronimo.keep.version>true</geronimo.keep.version>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons_io_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ <geronimo.keep.version>true</geronimo.keep.version>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>dwr</groupId>
+ <artifactId>dwr</artifactId>
+ <version>${dwr_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ <geronimo.keep.version>true</geronimo.keep.version>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>jstl</groupId>
+ <artifactId>jstl</artifactId>
+ <version>${jstl_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ <geronimo.keep.version>true</geronimo.keep.version>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ <version>${standard_taglibs_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ <geronimo.keep.version>true</geronimo.keep.version>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>castor</groupId>
+ <artifactId>castor</artifactId>
+ <version>${castor_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ <geronimo.keep.version>true</geronimo.keep.version>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>commons-el</groupId>
+ <artifactId>commons-el</artifactId>
+ <version>${commons_el_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ <geronimo.keep.version>true</geronimo.keep.version>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto-descriptors</artifactId>
+ <version>${pluto_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ <geronimo.keep.version>true</geronimo.keep.version>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto-portal</artifactId>
+ <version>${pluto_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ <geronimo.keep.version>true</geronimo.keep.version>
+ </properties>
+ </dependency>
+
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-console-core</artifactId>
Modified: geronimo/server/branches/1.1/configs/console-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1/configs/console-jetty/src/plan/plan.xml?view=diff&rev=472897&r1=472896&r2=472897
==============================================================================
--- geronimo/server/branches/1.1/configs/console-jetty/src/plan/plan.xml (original)
+++ geronimo/server/branches/1.1/configs/console-jetty/src/plan/plan.xml Thu Nov 9 05:43:13
2006
@@ -23,6 +23,35 @@
<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-1.1">
+ <dependencies>
+ <dependency>
+ <groupId>castor</groupId>
+ <artifactId>castor</artifactId>
+ <version>${castor_version}</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>commons-el</groupId>
+ <artifactId>commons-el</artifactId>
+ <version>${commons_el_version}</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto-descriptors</artifactId>
+ <version>${pluto_version}</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto-portal</artifactId>
+ <version>${pluto_version}</version>
+ <type>jar</type>
+ </dependency>
+ </dependencies>
+ </environment>
+
<context-root>/console</context-root>
<security-realm-name>geronimo-properties-realm</security-realm-name>
<gbean name="CARExportForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean"
xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
@@ -46,6 +75,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-1.1">
+ <dependencies>
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>${commons_digester_version}</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>${commons_fileupload_version}</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons_io_version}</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>dwr</groupId>
+ <artifactId>dwr</artifactId>
+ <version>${dwr_version}</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>jstl</groupId>
+ <artifactId>jstl</artifactId>
+ <version>${jstl_version}</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ <version>${standard_taglibs_version}</version>
+ <type>jar</type>
+ </dependency>
+ </dependencies>
+ </environment>
+
<context-root>/console-standard</context-root>
<security-realm-name>geronimo-properties-realm</security-realm-name>
<gbean name="Database0" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean"
xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
Modified: geronimo/server/branches/1.1/configs/console-tomcat/project.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1/configs/console-tomcat/project.xml?view=diff&rev=472897&r1=472896&r2=472897
==============================================================================
--- geronimo/server/branches/1.1/configs/console-tomcat/project.xml (original)
+++ geronimo/server/branches/1.1/configs/console-tomcat/project.xml Thu Nov 9 05:43:13 2006
@@ -146,6 +146,99 @@
<geronimo.keep.version>true</geronimo.keep.version>
</properties>
</dependency>
+
+ <!-- Added to eliminate packaging of libraries in WEB-INF/lib in console-standard
and console-framework applications -->
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>${commons_digester_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ <geronimo.keep.version>true</geronimo.keep.version>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>${commons_fileupload_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ <geronimo.keep.version>true</geronimo.keep.version>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons_io_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ <geronimo.keep.version>true</geronimo.keep.version>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>dwr</groupId>
+ <artifactId>dwr</artifactId>
+ <version>${dwr_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ <geronimo.keep.version>true</geronimo.keep.version>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>jstl</groupId>
+ <artifactId>jstl</artifactId>
+ <version>${jstl_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ <geronimo.keep.version>true</geronimo.keep.version>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ <version>${standard_taglibs_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ <geronimo.keep.version>true</geronimo.keep.version>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>castor</groupId>
+ <artifactId>castor</artifactId>
+ <version>${castor_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ <geronimo.keep.version>true</geronimo.keep.version>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>commons-el</groupId>
+ <artifactId>commons-el</artifactId>
+ <version>${commons_el_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ <geronimo.keep.version>true</geronimo.keep.version>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto-descriptors</artifactId>
+ <version>${pluto_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ <geronimo.keep.version>true</geronimo.keep.version>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto-portal</artifactId>
+ <version>${pluto_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ <geronimo.keep.version>true</geronimo.keep.version>
+ </properties>
+ </dependency>
+
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-console-core</artifactId>
Modified: geronimo/server/branches/1.1/configs/console-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1/configs/console-tomcat/src/plan/plan.xml?view=diff&rev=472897&r1=472896&r2=472897
==============================================================================
--- geronimo/server/branches/1.1/configs/console-tomcat/src/plan/plan.xml (original)
+++ geronimo/server/branches/1.1/configs/console-tomcat/src/plan/plan.xml Thu Nov 9 05:43:13
2006
@@ -23,6 +23,35 @@
<module>
<web>framework.war</web>
<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1">
+ <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+ <dependencies>
+ <dependency>
+ <groupId>castor</groupId>
+ <artifactId>castor</artifactId>
+ <version>${castor_version}</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>commons-el</groupId>
+ <artifactId>commons-el</artifactId>
+ <version>${commons_el_version}</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto-descriptors</artifactId>
+ <version>${pluto_version}</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto-portal</artifactId>
+ <version>${pluto_version}</version>
+ <type>jar</type>
+ </dependency>
+ </dependencies>
+ </environment>
+
<context-root>/console</context-root>
<cross-context/>
<security-realm-name>geronimo-properties-realm</security-realm-name>
@@ -47,6 +76,47 @@
<module>
<web>standard.war</web>
<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1">
+ <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+ <dependencies>
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>${commons_digester_version}</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>${commons_fileupload_version}</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons_io_version}</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>dwr</groupId>
+ <artifactId>dwr</artifactId>
+ <version>${dwr_version}</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>jstl</groupId>
+ <artifactId>jstl</artifactId>
+ <version>${jstl_version}</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ <version>${standard_taglibs_version}</version>
+ <type>jar</type>
+ </dependency>
+ </dependencies>
+ </environment>
+
<context-root>/console-standard</context-root>
<cross-context/>
<security-realm-name>geronimo-properties-realm</security-realm-name>
|