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/12/07 17:48:12 UTC
svn commit: r483542 - in /geronimo/server/trunk: ./
configs/webconsole-jetty6/ configs/webconsole-jetty6/src/plan/
modules/geronimo-jetty6/ modules/geronimo-jetty6/src/main/resources/META-INF/
modules/geronimo-tomcat/
Author: jbohn
Date: Thu Dec 7 08:48:10 2006
New Revision: 483542
URL: http://svn.apache.org/viewvc?view=rev&rev=483542
Log:
GERONIMO-2636 Jetty6 using jasper from tomcat 6 for the JSP 2.1 support
Also moved tomcat version specification to dependency management in root pom
Modified:
geronimo/server/trunk/configs/webconsole-jetty6/pom.xml
geronimo/server/trunk/configs/webconsole-jetty6/src/plan/plan.xml
geronimo/server/trunk/modules/geronimo-jetty6/pom.xml
geronimo/server/trunk/modules/geronimo-jetty6/src/main/resources/META-INF/geronimo-dependency.xml
geronimo/server/trunk/modules/geronimo-tomcat/pom.xml
geronimo/server/trunk/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=483542&r1=483541&r2=483542
==============================================================================
--- geronimo/server/trunk/configs/webconsole-jetty6/pom.xml (original)
+++ geronimo/server/trunk/configs/webconsole-jetty6/pom.xml Thu Dec 7 08:48:10 2006
@@ -161,11 +161,6 @@
</dependency>
<dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-runtime</artifactId>
- </dependency>
-
- <dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
</dependency>
Modified: geronimo/server/trunk/configs/webconsole-jetty6/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-jetty6/src/plan/plan.xml?view=diff&rev=483542&r1=483541&r2=483542
==============================================================================
--- geronimo/server/trunk/configs/webconsole-jetty6/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/webconsole-jetty6/src/plan/plan.xml Thu Dec 7 08:48:10 2006
@@ -40,11 +40,6 @@
<artifactId>pluto-portal</artifactId>
<type>jar</type>
</dependency>
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-runtime</artifactId>
- <type>jar</type>
- </dependency>
</dependencies>
<inverse-classloading/>
</environment>
@@ -87,11 +82,6 @@
<dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-runtime</artifactId>
<type>jar</type>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/modules/geronimo-jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6/pom.xml?view=diff&rev=483542&r1=483541&r2=483542
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6/pom.xml Thu Dec 7 08:48:10 2006
@@ -76,25 +76,25 @@
</dependency>
<dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-compiler</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>jasper</artifactId>
</dependency>
-
+
<dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-compiler-jdt</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>jasper-el</artifactId>
</dependency>
<dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-runtime</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>jasper-jdt</artifactId>
</dependency>
<dependency>
- <groupId>commons-el</groupId>
- <artifactId>commons-el</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>juli</artifactId>
</dependency>
-
+
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
Modified: geronimo/server/trunk/modules/geronimo-jetty6/src/main/resources/META-INF/geronimo-dependency.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6/src/main/resources/META-INF/geronimo-dependency.xml?view=diff&rev=483542&r1=483541&r2=483542
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6/src/main/resources/META-INF/geronimo-dependency.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6/src/main/resources/META-INF/geronimo-dependency.xml Thu Dec 7 08:48:10 2006
@@ -9,19 +9,19 @@
<dep:artifactId>jetty-util</dep:artifactId>
</dep:dependency>
<dep:dependency>
- <dep:groupId>tomcat</dep:groupId>
- <dep:artifactId>jasper-compiler</dep:artifactId>
+ <dep:groupId>org.apache.tomcat</dep:groupId>
+ <dep:artifactId>jasper</dep:artifactId>
</dep:dependency>
<dep:dependency>
- <dep:groupId>tomcat</dep:groupId>
- <dep:artifactId>jasper-compiler-jdt</dep:artifactId>
+ <dep:groupId>org.apache.tomcat</dep:groupId>
+ <dep:artifactId>jasper-jdt</dep:artifactId>
</dep:dependency>
<dep:dependency>
- <dep:groupId>tomcat</dep:groupId>
- <dep:artifactId>jasper-runtime</dep:artifactId>
+ <dep:groupId>org.apache.tomcat</dep:groupId>
+ <dep:artifactId>jasper-el</dep:artifactId>
</dep:dependency>
<dep:dependency>
- <dep:groupId>commons-el</dep:groupId>
- <dep:artifactId>commons-el</dep:artifactId>
+ <dep:groupId>org.apache.tomcat</dep:groupId>
+ <dep:artifactId>juli</dep:artifactId>
</dep:dependency>
</dep:service>
Modified: geronimo/server/trunk/modules/geronimo-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat/pom.xml?view=diff&rev=483542&r1=483541&r2=483542
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat/pom.xml Thu Dec 7 08:48:10 2006
@@ -92,37 +92,31 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>catalina</artifactId>
- <version>6.0.2-beta</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>jasper</artifactId>
- <version>6.0.2-beta</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>jasper-el</artifactId>
- <version>6.0.2-beta</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>jasper-jdt</artifactId>
- <version>6.0.2-beta</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>coyote</artifactId>
- <version>6.0.2-beta</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>juli</artifactId>
- <version>6.0.2-beta</version>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?view=diff&rev=483542&r1=483541&r2=483542
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Thu Dec 7 08:48:10 2006
@@ -71,7 +71,8 @@
<!--
HACK: Used by jsp and servlet example configs to point to the tomcat deployer
-->
- <tomcatVersion>5.5.15</tomcatVersion>
+ <tomcatVersion>6.0.2-beta</tomcatVersion>
+ <tomcat5Version>5.5.15</tomcat5Version>
<!--
HACK: Used by uddi-jetty and uddi-tomcat config plans
@@ -845,83 +846,55 @@
<dependency>
<groupId>tomcat</groupId>
- <artifactId>jasper-compiler</artifactId>
- <version>${tomcatVersion}</version>
- </dependency>
-
- <dependency>
- <groupId>tomcat</groupId>
<artifactId>jasper-compiler-jdt</artifactId>
- <version>${tomcatVersion}</version>
+ <version>${tomcat5Version}</version>
</dependency>
<dependency>
<groupId>tomcat</groupId>
<artifactId>jasper-runtime</artifactId>
- <version>${tomcatVersion}</version>
- </dependency>
-
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>catalina</artifactId>
- <version>${tomcatVersion}</version>
- </dependency>
-
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>tomcat-ajp</artifactId>
- <version>5.5.15</version>
+ <version>${tomcat5Version}</version>
</dependency>
<dependency>
<groupId>tomcat</groupId>
- <artifactId>catalina-cluster</artifactId>
- <version>${tomcatVersion}</version>
- </dependency>
-
- <!--
- - Required until any realm is provided to Tomcat
- - See StandardEngine::getRealm()
- -->
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>catalina-optional</artifactId>
- <version>${tomcatVersion}</version>
+ <artifactId>jasper-compiler</artifactId>
+ <version>${tomcat5Version}</version>
</dependency>
<dependency>
- <groupId>tomcat</groupId>
- <artifactId>tomcat-coyote</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>jasper</artifactId>
<version>${tomcatVersion}</version>
</dependency>
<dependency>
- <groupId>tomcat</groupId>
- <artifactId>tomcat-http</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>jasper-el</artifactId>
<version>${tomcatVersion}</version>
</dependency>
<dependency>
- <groupId>tomcat</groupId>
- <artifactId>tomcat-util</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>jasper-jdt</artifactId>
<version>${tomcatVersion}</version>
</dependency>
<dependency>
- <groupId>tomcat</groupId>
- <artifactId>naming-resources</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>juli</artifactId>
<version>${tomcatVersion}</version>
</dependency>
<dependency>
- <groupId>tomcat</groupId>
- <artifactId>servlets-default</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>catalina</artifactId>
<version>${tomcatVersion}</version>
</dependency>
<dependency>
- <groupId>tomcat</groupId>
- <artifactId>servlets-invoker</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>coyote</artifactId>
<version>${tomcatVersion}</version>
</dependency>