Author: chatellier Date: 2010-12-03 16:00:21 +0000 (Fri, 03 Dec 2010) New Revision: 357 Log: Remove embedded war (not working with jsp) Modified: trunk/coser-web/pom.xml trunk/pom.xml Modified: trunk/coser-web/pom.xml =================================================================== --- trunk/coser-web/pom.xml 2010-12-03 14:45:45 UTC (rev 356) +++ trunk/coser-web/pom.xml 2010-12-03 16:00:21 UTC (rev 357) @@ -29,13 +29,17 @@ <artifactId>junit</artifactId> </dependency> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-core</artifactId> </dependency> <dependency> - <groupId>org.eclipse.jetty.aggregate</groupId> - <artifactId>jetty-webapp</artifactId> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-convention-plugin</artifactId> </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </dependency> </dependencies> <name>Coser :: Web</name> @@ -53,36 +57,6 @@ <!-- Add main class into war to make it executable --> <plugins> <plugin> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <archive> - <manifest> - <mainClass>org.nuiton.util.war.JettyLauncher</mainClass> - </manifest> - </archive> - <overlays> - <overlay> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <type>jar</type> - <includes> - <include>**/war/Jetty*</include> - </includes> - </overlay> - <overlay> - <groupId>org.eclipse.jetty.aggregate</groupId> - <artifactId>jetty-webapp</artifactId> - <type>jar</type> - </overlay> - <overlay> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <type>jar</type> - </overlay> - </overlays> - </configuration> - </plugin> - <plugin> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> <configuration> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-03 14:45:45 UTC (rev 356) +++ trunk/pom.xml 2010-12-03 16:00:21 UTC (rev 357) @@ -128,13 +128,6 @@ </dependency> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>provided</scope> - </dependency> - - <dependency> <groupId>org.swinglabs</groupId> <artifactId>swingx-core</artifactId> <version>1.6.2-2</version> @@ -177,20 +170,37 @@ </dependency> <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-core</artifactId> + <version>2.2.1</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-convention-plugin</artifactId> + <version>2.2.1</version> + <scope>compile</scope> + </dependency> + + <dependency> <groupId>org.apache.struts.xwork</groupId> <artifactId>xwork-core</artifactId> <version>2.2.1</version> + <scope>compile</scope> </dependency> + <dependency> <groupId>javassist</groupId> <artifactId>javassist</artifactId> <version>3.8.0.GA</version> <scope>runtime</scope> </dependency> + <dependency> - <groupId>org.eclipse.jetty.aggregate</groupId> - <artifactId>jetty-webapp</artifactId> - <version>7.2.1.v20101111</version> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> <scope>provided</scope> </dependency> </dependencies> @@ -261,7 +271,7 @@ <plugin> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <version>7.2.1.v20101111</version> + <version>8.0.0.M2</version> </plugin> <plugin> <artifactId>maven-site-plugin</artifactId>