Browse files

Now can run test server via mvn -Pjetty-run

  • Loading branch information...
1 parent 45abac3 commit e16b982950f201228353da70c88d917fb475df3d @snoopdave committed May 6, 2012
View
32 rollarcus-web/pom.xml
@@ -515,6 +515,12 @@
<artifactId>texen</artifactId>
<version>1.0</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>velocity</artifactId>
+ <groupId>velocity</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -563,6 +569,10 @@
<artifactId>activation</artifactId>
<groupId>javax.activation</groupId>
</exclusion>
+ <exclusion>
+ <artifactId>servlet-api</artifactId>
+ <groupId>javax.servlet</groupId>
+ </exclusion>
</exclusions>
</dependency>
@@ -576,12 +586,12 @@
<groupId>net.java.dev.rome</groupId>
<artifactId>rome-fetcher</artifactId>
<version>1.0.0</version>
- <exclusions>
- <exclusion>
- <artifactId>xercesImpl</artifactId>
- <groupId>xerces</groupId>
- </exclusion>
- </exclusions>
+ <exclusions>
+ <exclusion>
+ <artifactId>xercesImpl</artifactId>
+ <groupId>xerces</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -644,6 +654,12 @@
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
<version>2.2.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -684,6 +700,10 @@
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
</exclusion>
+ <exclusion>
+ <artifactId>servlet-api-2.5</artifactId>
+ <groupId>org.mortbay.jetty</groupId>
+ </exclusion>
</exclusions>
</dependency>
View
6 rollarcus-web/src/main/webapp/WEB-INF/jetty-env.xml
@@ -4,7 +4,7 @@
<!-- Dummy values to allow Jetty to run via Maven build process -->
- <New id="ds" class="org.eclipse.jetty.plus.naming.Resource">
+ <New id="ds" class="org.eclipse.jetty.plus.jndi.Resource">
<Arg>
<Ref id="wac"/>
</Arg>
@@ -17,13 +17,13 @@
</Arg>
</New>
- <New id="mail" class="org.eclipse.jetty.plus.naming.Resource">
+ <New id="mail" class="org.eclipse.jetty.plus.jndi.Resource">
<Arg>
<Ref id="wac"/>
</Arg>
<Arg>mail/Session</Arg>
<Arg>
- <New class="org.eclipse.naming.factories.MailSessionReference">
+ <New class="org.eclipse.jetty.jndi.factories.MailSessionReference">
<Set name="properties">
<New class="java.util.Properties">
<Put name="mail.smtp.host">mail</Put>
View
22 rollarcus-web/src/test/resources/jetty.xml
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
-<Configure id="Server" class="org.mortbay.jetty.Server">
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- Configure a log -->
<New id="ServerLog" class="java.io.PrintStream">
<Arg>
- <New class="org.mortbay.util.RolloverFileOutputStream">
+ <New class="org.eclipse.jetty.util.RolloverFileOutputStream">
<Arg>${project.build.directory}/yyyy_mm_dd.stderrout.log</Arg>
<Arg type="boolean">false</Arg>
<Arg type="int">90</Arg>
@@ -21,7 +21,7 @@
</Arg>
</New>
- <Call class="org.mortbay.log.Log" name="info">
+ <Call class="org.eclipse.jetty.util.log.Log" name="info">
<Arg>Redirecting stderr/stdout to
<Ref id="ServerLogName"/>
</Arg>
@@ -37,15 +37,9 @@
</Arg>
</Call>
- <Set name="UserRealms">
- <Array type="org.mortbay.jetty.security.UserRealm">
- <Item>
- <New class="org.mortbay.jetty.security.JDBCUserRealm">
- <Set name="name">Test JDBC Realm</Set>
- <Set name="config">target/test-classes/jetty-jdbc-realm.properties</Set>
- </New>
- </Item>
- </Array>
- </Set>
+ <New class="org.eclipse.jetty.security.JDBCLoginService">
+ <Set name="name">Test JDBC Realm</Set>
+ <Set name="config">target/test-classes/jetty-jdbc-realm.properties</Set>
+ </New>
</Configure>

0 comments on commit e16b982

Please sign in to comment.