Author: olamy
Date: Fri Oct 28 10:53:00 2011
New Revision: 1190245
URL: http://svn.apache.org/viewvc?rev=1190245&view=rev
Log:
try to fix jetty run with new version but still issue with redback war and jar
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=1190245&r1=1190244&r2=1190245&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Fri Oct 28
10:53:00 2011
@@ -672,16 +672,24 @@
<artifactId>jetty-maven-plugin</artifactId>
<version>${jettyVersion}</version>
<configuration>
- <webAppConfig>
+ <webApp>
<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>
</baseResource>
+ </webApp>
+ <webAppConfig>
+ <contextPath>/</contextPath>
+ <descriptor>${basedir}/src/main/webapp/WEB_INF/web.xml</descriptor>
+ <jettyEnvXml>${basedir}/src/jetty-env.xml</jettyEnvXml>
</webAppConfig>
+
<scanIntervalSeconds>10</scanIntervalSeconds>
- <jettyEnvXml>src/jetty-env.xml</jettyEnvXml>
+ <!--
+ <jettyConfig>${basedir}/src/jetty-env.xml</jettyConfig>
+ -->
<connectors>
- <connector
implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+ <connector
implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
<port>9091</port>
<maxIdleTime>60000</maxIdleTime>
</connector>
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=1190245&r1=1190244&r2=1190245&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
Fri Oct 28 10:53:00 2011
@@ -19,12 +19,12 @@
-->
<!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>
- <New class="org.mortbay.naming.factories.MailSessionReference">
+ <New class="org.eclipse.jetty.jndi.factories.MailSessionReference">
<Set name="user"></Set>
<Set name="password"></Set>
<Set name="properties">
@@ -40,7 +40,7 @@
</New>
<!-- 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>jdbc/users</Arg>
<Arg>
@@ -52,7 +52,7 @@
</Arg>
</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>jdbc/usersShutdown</Arg>
<Arg>
