Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upgrade Jetty to 6.1.14 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@721100 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Porter 2008-11-27 06:41:42 +00:00
parent e92550d80f
commit fbb49e3387
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archiva-modules/archiva-web/archiva-webapp/pom.xml
View File

@ -330,8 +330,8 @@
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.mortbay.jetty</groupId> <groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId> <artifactId>maven-jetty-plugin</artifactId>
<version>7.0.0pre3</version> <version>6.1.14</version>
<configuration> <configuration>
<scanIntervalSeconds>10</scanIntervalSeconds> <scanIntervalSeconds>10</scanIntervalSeconds>
<contextPath>/</contextPath> <contextPath>/</contextPath>

6
archiva-modules/archiva-web/archiva-webapp/src/jetty-env.xml
View File

@ -19,7 +19,7 @@
--> -->
<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd"> <!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"> <New id="validation_mail" class="org.mortbay.jetty.plus.naming.Resource">
<Arg>mail/Session</Arg> <Arg>mail/Session</Arg>
@ -41,6 +41,7 @@
<!-- Archiva database --> <!-- Archiva database -->
<New id="archiva" class="org.mortbay.jetty.plus.naming.Resource"> <New id="archiva" class="org.mortbay.jetty.plus.naming.Resource">
<Arg><Ref id="wac"/></Arg>
<Arg>jdbc/archiva</Arg> <Arg>jdbc/archiva</Arg>
<Arg> <Arg>
<New class="org.apache.derby.jdbc.EmbeddedDataSource"> <New class="org.apache.derby.jdbc.EmbeddedDataSource">
@ -52,6 +53,7 @@
</New> </New>
<New id="archivaShutdown" class="org.mortbay.jetty.plus.naming.Resource"> <New id="archivaShutdown" class="org.mortbay.jetty.plus.naming.Resource">
<Arg><Ref id="wac"/></Arg>
<Arg>jdbc/archivaShutdown</Arg> <Arg>jdbc/archivaShutdown</Arg>
<Arg> <Arg>
<New class="org.apache.derby.jdbc.EmbeddedDataSource"> <New class="org.apache.derby.jdbc.EmbeddedDataSource">
@ -64,6 +66,7 @@
<!-- Users / Security Database --> <!-- Users / Security Database -->
<New id="users" class="org.mortbay.jetty.plus.naming.Resource"> <New id="users" class="org.mortbay.jetty.plus.naming.Resource">
<Arg><Ref id="wac"/></Arg>
<Arg>jdbc/users</Arg> <Arg>jdbc/users</Arg>
<Arg> <Arg>
<New class="org.apache.derby.jdbc.EmbeddedDataSource"> <New class="org.apache.derby.jdbc.EmbeddedDataSource">
@ -75,6 +78,7 @@
</New> </New>
<New id="usersShutdown" class="org.mortbay.jetty.plus.naming.Resource"> <New id="usersShutdown" class="org.mortbay.jetty.plus.naming.Resource">
<Arg><Ref id="wac"/></Arg>
<Arg>jdbc/usersShutdown</Arg> <Arg>jdbc/usersShutdown</Arg>
<Arg> <Arg>
<New class="org.apache.derby.jdbc.EmbeddedDataSource"> <New class="org.apache.derby.jdbc.EmbeddedDataSource">