Author: brett
Date: Wed Nov 26 22:41:42 2008
New Revision: 721100
URL: http://svn.apache.org/viewvc?rev=721100&view=rev
Log:
upgrade Jetty to 6.1.14
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/jetty-env.xml
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=721100&r1=721099&r2=721100&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Wed Nov 26
22:41:42 2008
@@ -330,8 +330,8 @@
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-maven-plugin</artifactId>
- <version>7.0.0pre3</version>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <version>6.1.14</version>
<configuration>
<scanIntervalSeconds>10</scanIntervalSeconds>
<contextPath>/</contextPath>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/jetty-env.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/jetty-env.xml?rev=721100&r1=721099&r2=721100&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/jetty-env.xml
(original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/jetty-env.xml
Wed Nov 26 22:41:42 2008
@@ -19,7 +19,7 @@
-->
<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN"
"http://jetty.mortbay.org/configure.dtd";>
-<Configure class="org.mortbay.jetty.webapp.WebAppContext">
+<Configure id='wac' class="org.mortbay.jetty.webapp.WebAppContext">
<New id="validation_mail" class="org.mortbay.jetty.plus.naming.Resource">
<Arg>mail/Session</Arg>
@@ -41,6 +41,7 @@
<!-- Archiva database -->
<New id="archiva" class="org.mortbay.jetty.plus.naming.Resource">
+ <Arg><Ref id="wac"/></Arg>
<Arg>jdbc/archiva</Arg>
<Arg>
<New class="org.apache.derby.jdbc.EmbeddedDataSource">
@@ -52,6 +53,7 @@
</New>
<New id="archivaShutdown" class="org.mortbay.jetty.plus.naming.Resource">
+ <Arg><Ref id="wac"/></Arg>
<Arg>jdbc/archivaShutdown</Arg>
<Arg>
<New class="org.apache.derby.jdbc.EmbeddedDataSource">
@@ -64,6 +66,7 @@
<!-- Users / Security Database -->
<New id="users" class="org.mortbay.jetty.plus.naming.Resource">
+ <Arg><Ref id="wac"/></Arg>
<Arg>jdbc/users</Arg>
<Arg>
<New class="org.apache.derby.jdbc.EmbeddedDataSource">
@@ -75,6 +78,7 @@
</New>
<New id="usersShutdown" class="org.mortbay.jetty.plus.naming.Resource">
+ <Arg><Ref id="wac"/></Arg>
<Arg>jdbc/usersShutdown</Arg>
<Arg>
<New class="org.apache.derby.jdbc.EmbeddedDataSource">
