Permalink
Browse files

fixed failing jetty classpath after merge. moved webapp into test

  • Loading branch information...
1 parent ea7e467 commit 120c2369d1ee189042c8aa90c25dc24662547e6f @runepeter committed Oct 19, 2011
Showing with 72 additions and 74 deletions.
  1. +72 −52 pom.xml
  2. +0 −22 src/main/webapp/WEB-INF/web.xml
View
124 pom.xml
@@ -3,66 +3,86 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <groupId>no.jforce</groupId>
- <artifactId>jersey-guice-test-framework</artifactId>
- <version>0.1-SNAPSHOT</version>
- <packaging>war</packaging>
+ <groupId>no.jforce</groupId>
+ <artifactId>jersey-guice-test-framework</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ <!--packaging>war</packaging-->
- <name>jForce :: Jersey+Guice Test Framework</name>
+ <name>jForce :: Jersey+Guice Test Framework</name>
- <properties>
- <jersey.version>1.9.1</jersey.version>
- </properties>
+ <properties>
+ <jersey.version>1.9.1</jersey.version>
+ </properties>
- <dependencies>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.10</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
+ <dependencies>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
- <version>${jersey.version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey.contribs</groupId>
- <artifactId>jersey-guice</artifactId>
- <version>${jersey.version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey.jersey-test-framework</groupId>
- <artifactId>jersey-test-framework-inmemory</artifactId>
- <version>1.4</version>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
- <build>
- <plugins>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.23</version>
- <configuration>
- <contextPath>example</contextPath>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ <version>${jersey.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey.contribs</groupId>
+ <artifactId>jersey-guice</artifactId>
+ <version>${jersey.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey.jersey-test-framework</groupId>
+ <artifactId>jersey-test-framework-inmemory</artifactId>
+ <version>${jersey.version}</version>
+ </dependency>
+ </dependencies>
- <repositories>
- <repository>
- <id>maven2-repository.dev.java.net</id>
- <name>Java.net Repository for Maven</name>
- <url>http://download.java.net/maven/2/</url>
- <layout>default</layout>
- </repository>
- </repositories>
+ <build>
+ <plugins>
+ <!--plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.1.1</version>
+ <configuration>
+ <warSourceDirectory>${basedir}/src/test/webapp</warSourceDirectory>
+ </configuration>
+ </plugin-->
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <version>6.1.26</version>
+ <configuration>
+ <contextPath>example</contextPath>
+ <webAppSourceDirectory>${basedir}/src/test/webapp</webAppSourceDirectory>
+ <useTestClasspath>true</useTestClasspath>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <repositories>
+ <repository>
+ <id>maven2-repository.dev.java.net</id>
+ <name>Java.net Repository for Maven</name>
+ <url>http://download.java.net/maven/2/</url>
+ <layout>default</layout>
+ </repository>
+ </repositories>
</project>
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
- version="2.5">
-
- <listener>
- <listener-class>no.jforce.jersey.guice.example.web.ApplicationGuiceWebConfig</listener-class>
- </listener>
-
- <filter>
- <filter-name>guiceFilter</filter-name>
- <filter-class>com.google.inject.servlet.GuiceFilter</filter-class>
- </filter>
-
- <filter-mapping>
- <filter-name>guiceFilter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
-</web-app>
-

0 comments on commit 120c236

Please sign in to comment.