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

try to fix jetty run with new version but still issue with redback war and jar 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1190245 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2011-10-28 10:53:00 +00:00
parent 56791ab4ad
commit 938287ed6a
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -672,16 +672,24 @@
<artifactId>jetty-maven-plugin</artifactId> <artifactId>jetty-maven-plugin</artifactId>
<version>${jettyVersion}</version> <version>${jettyVersion}</version>
<configuration> <configuration>
<webAppConfig> <webApp>
<contextPath>/</contextPath> <contextPath>/</contextPath>
<baseResource implementation="org.mortbay.resource.ResourceCollection"> <baseResource implementation="org.eclipse.jetty.util.resource.ResourceCollection">
<resourcesAsCSV>src/main/webapp,target/archiva,target/redback</resourcesAsCSV> <resourcesAsCSV>src/main/webapp,target/archiva,target/redback</resourcesAsCSV>
</baseResource> </baseResource>
</webApp>
<webAppConfig>
<contextPath>/</contextPath>
<descriptor>${basedir}/src/main/webapp/WEB_INF/web.xml</descriptor>
<jettyEnvXml>${basedir}/src/jetty-env.xml</jettyEnvXml>
</webAppConfig> </webAppConfig>
<scanIntervalSeconds>10</scanIntervalSeconds> <scanIntervalSeconds>10</scanIntervalSeconds>
<jettyEnvXml>src/jetty-env.xml</jettyEnvXml> <!--
<jettyConfig>${basedir}/src/jetty-env.xml</jettyConfig>
-->
<connectors> <connectors>
<connector implementation="org.mortbay.jetty.nio.SelectChannelConnector"> <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
<port>9091</port> <port>9091</port>
<maxIdleTime>60000</maxIdleTime> <maxIdleTime>60000</maxIdleTime>
</connector> </connector>

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

@ -19,12 +19,12 @@
--> -->
<!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 id='wac' class="org.mortbay.jetty.webapp.WebAppContext"> <Configure id='wac' class="org.eclipse.jetty.webapp.WebAppContext">
<New id="validation_mail" class="org.mortbay.jetty.plus.naming.Resource"> <New id="validation_mail" class="org.eclipse.jetty.plus.jndi.Resource">
<Arg>mail/Session</Arg> <Arg>mail/Session</Arg>
<Arg> <Arg>
<New class="org.mortbay.naming.factories.MailSessionReference"> <New class="org.eclipse.jetty.jndi.factories.MailSessionReference">
<Set name="user"></Set> <Set name="user"></Set>
<Set name="password"></Set> <Set name="password"></Set>
<Set name="properties"> <Set name="properties">
@ -40,7 +40,7 @@
</New> </New>
<!-- Users / Security Database --> <!-- Users / Security Database -->
<New id="users" class="org.mortbay.jetty.plus.naming.Resource"> <New id="users" class="org.eclipse.jetty.plus.jndi.Resource">
<Arg><Ref id="wac"/></Arg> <Arg><Ref id="wac"/></Arg>
<Arg>jdbc/users</Arg> <Arg>jdbc/users</Arg>
<Arg> <Arg>
@ -52,7 +52,7 @@
</Arg> </Arg>
</New> </New>
<New id="usersShutdown" class="org.mortbay.jetty.plus.naming.Resource"> <New id="usersShutdown" class="org.eclipse.jetty.plus.jndi.Resource">
<Arg><Ref id="wac"/></Arg> <Arg><Ref id="wac"/></Arg>
<Arg>jdbc/usersShutdown</Arg> <Arg>jdbc/usersShutdown</Arg>
<Arg> <Arg>