Author: tchemit Date: 2012-06-13 18:58:24 +0200 (Wed, 13 Jun 2012) New Revision: 3471 Url: http://chorem.org/repositories/revision/pollen/3471 Log: fix pollen default server url Modified: trunk/pollen-ui-struts2/pom.xml Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-06-13 16:30:41 UTC (rev 3470) +++ trunk/pollen-ui-struts2/pom.xml 2012-06-13 16:58:24 UTC (rev 3471) @@ -244,7 +244,8 @@ target/${project.build.finalName}-bin.zip </redmine.releaseFiles> - <defaultSiteUrl>http://localhost:8080/poll</defaultSiteUrl> + <defaultWebContextPath>pollen</defaultWebContextPath> + <defaultSiteUrl>http://localhost:8080/${defaultWebContextPath}</defaultSiteUrl> <defaultLogDir>${basedir}/target</defaultLogDir> </properties> @@ -299,7 +300,7 @@ <stopPort>1269</stopPort> <contextXml>${basedir}/src/jetty/jetty-context.xml</contextXml> <webAppConfig> - <contextPath>/pollen</contextPath> + <contextPath>/${defaultWebContextPath}</contextPath> </webAppConfig> <systemProperties> <systemProperty> @@ -318,7 +319,7 @@ <groupId>org.apache.tomcat.maven</groupId> <artifactId>tomcat7-maven-plugin</artifactId> <configuration> - <path>/pollen</path> + <path>/${defaultWebContextPath}</path> <systemProperties> <siteUrl>${defaultSiteUrl}</siteUrl> <pollen.log.dir>${defaultLogDir}</pollen.log.dir> @@ -331,7 +332,7 @@ <groupId>org.apache.tomcat.maven</groupId> <artifactId>tomcat6-maven-plugin</artifactId> <configuration> - <path>/pollen</path> + <path>/${defaultWebContextPath}</path> <systemProperties> <siteUrl>${defaultSiteUrl}</siteUrl> <pollen.log.dir>${defaultLogDir}</pollen.log.dir> @@ -549,7 +550,7 @@ </activation> <properties> <pollenTestServerPort>8765</pollenTestServerPort> - <pollenTestUrl>http://localhost:${pollenTestServerPort}/pollen</pollenTestUrl> + <pollenTestUrl>http://localhost:${pollenTestServerPort}/${defaultWebContextPath}</pollenTestUrl> </properties> <build> @@ -570,7 +571,7 @@ <daemon>true</daemon> <webAppConfig> <descriptor>${basedir}/src/test/resources/web-test.xml</descriptor> - <contextPath>/pollen</contextPath> + <contextPath>/${defaultWebContextPath}</contextPath> </webAppConfig> <useTestClasspath>true</useTestClasspath>