Author: fdesbois Date: 2012-03-22 11:38:33 +0100 (Thu, 22 Mar 2012) New Revision: 3199 Url: http://chorem.org/repositories/revision/pollen/3199 Log: Add default configuration for jetty and tomcat7 as embedded servers Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/pom.xml branches/pollen-1.2.6-struts2/pom.xml Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/pom.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/pom.xml 2012-03-22 10:38:29 UTC (rev 3198) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/pom.xml 2012-03-22 10:38:33 UTC (rev 3199) @@ -211,10 +211,27 @@ <webAppConfig> <contextPath>/pollen</contextPath> </webAppConfig> + <systemProperties> + <systemProperty> + <name>siteUrl</name> + <value>http://localhost:8080/pollen</value> + </systemProperty> + </systemProperties> </configuration> </plugin> <plugin> + <groupId>org.apache.tomcat.maven</groupId> + <artifactId>tomcat7-maven-plugin</artifactId> + <configuration> + <path>/pollen</path> + <systemProperties> + <siteUrl>http://localhost:8080/pollen</siteUrl> + </systemProperties> + </configuration> + </plugin> + + <plugin> <artifactId>maven-war-plugin</artifactId> <configuration> <archive> Modified: branches/pollen-1.2.6-struts2/pom.xml =================================================================== --- branches/pollen-1.2.6-struts2/pom.xml 2012-03-22 10:38:29 UTC (rev 3198) +++ branches/pollen-1.2.6-struts2/pom.xml 2012-03-22 10:38:33 UTC (rev 3199) @@ -495,20 +495,12 @@ <version>${nuitonI18nVersion}</version> </plugin> - <!-- remove this when using mavenpom 3.1 --> <plugin> - <groupId>org.nuiton</groupId> - <artifactId>helper-maven-plugin</artifactId> - <version>1.4</version> + <groupId>org.apache.tomcat.maven</groupId> + <artifactId>tomcat7-maven-plugin</artifactId> + <version>2.0-beta-1</version> </plugin> - <!-- remove this when using mavenpom 3.1 --> - <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-maven-plugin</artifactId> - <version>${jettyVersion}</version> - </plugin> - </plugins> </pluginManagement>