You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2007/10/15 20:11:31 UTC
svn commit: r584833 - in /geronimo/server/trunk: configs/jetty6/pom.xml
configs/tomcat6/pom.xml modules/geronimo-jetty6/src/main/resources/
modules/geronimo-tomcat6/src/main/resources/META-INF/geronimo-dependency.xml
Author: gawor
Date: Mon Oct 15 11:11:31 2007
New Revision: 584833
URL: http://svn.apache.org/viewvc?rev=584833&view=rev
Log:
moved dependencies from geronimo-dependency.xml to config modules. right version of jetty is getting installed now.
Removed:
geronimo/server/trunk/modules/geronimo-jetty6/src/main/resources/
geronimo/server/trunk/modules/geronimo-tomcat6/src/main/resources/META-INF/geronimo-dependency.xml
Modified:
geronimo/server/trunk/configs/jetty6/pom.xml
geronimo/server/trunk/configs/tomcat6/pom.xml
Modified: geronimo/server/trunk/configs/jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty6/pom.xml?rev=584833&r1=584832&r2=584833&view=diff
==============================================================================
--- geronimo/server/trunk/configs/jetty6/pom.xml (original)
+++ geronimo/server/trunk/configs/jetty6/pom.xml Mon Oct 15 11:11:31 2007
@@ -90,6 +90,26 @@
<!--</dependency>-->
<dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-ajp</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-sslengine</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>webservices-common</artifactId>
<type>car</type>
Modified: geronimo/server/trunk/configs/tomcat6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/tomcat6/pom.xml?rev=584833&r1=584832&r2=584833&view=diff
==============================================================================
--- geronimo/server/trunk/configs/tomcat6/pom.xml (original)
+++ geronimo/server/trunk/configs/tomcat6/pom.xml Mon Oct 15 11:11:31 2007
@@ -81,12 +81,32 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
+ <artifactId>catalina</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
<artifactId>catalina-ha</artifactId>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tribes</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>coyote</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tomcat.extras</groupId>
+ <artifactId>juli</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tomcat.extras</groupId>
+ <artifactId>juli-adapters</artifactId>
</dependency>
</dependencies>