Author: tchemit Date: 2012-10-05 16:12:32 +0200 (Fri, 05 Oct 2012) New Revision: 3723 Url: http://chorem.org/repositories/revision/pollen/3723 Log: improve embedded application create process Modified: trunk/pollen-ui-struts2/pom.xml Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-10-01 12:09:56 UTC (rev 3722) +++ trunk/pollen-ui-struts2/pom.xml 2012-10-05 14:12:32 UTC (rev 3723) @@ -399,6 +399,12 @@ <value>true</value> </property> </activation> + <properties> + <embeddedWarName>pollen-${project.version}-embedded</embeddedWarName> + <embeddedTmpWarDir> + ${project.build.directory}/${embeddedWarName}-temp + </embeddedTmpWarDir> + </properties> <build> <defaultGoal>verify</defaultGoal> <plugins> @@ -411,7 +417,7 @@ <phase>generate-resources</phase> <configuration> <target> - <mkdir dir="${basedir}/target/pollen-embedded-temp-${project.version}/WEB-INF/classes" /> + <mkdir dir="${embeddedTmpWarDir}/WEB-INF/classes" /> </target> </configuration> <goals> @@ -435,10 +441,10 @@ </goals> <configuration> <generatedClasses> - ${basedir}/target/pollen-embedded-temp-${project.version}/WEB-INF/classes + ${embeddedTmpWarDir}/WEB-INF/classes </generatedClasses> <webXmlFragment> - ${basedir}/target/pollen-embedded-temp-${project.version}/WEB-INF/webfrag.xml + ${embeddedTmpWarDir}/WEB-INF/webfrag.xml </webXmlFragment> <packageRoot>org.apache.jsp</packageRoot> @@ -475,26 +481,24 @@ <artifactId>maven-war-plugin</artifactId> <executions> <execution> - <id>pack</id> + <id>pack-embedded-war</id> <goals> <goal>war</goal> </goals> <configuration> <primaryArtifact>false</primaryArtifact> <webappDirectory> - ${basedir}/target/pollen-embedded-${project.version} + ${project.build.directory}/${embeddedWarName} </webappDirectory> <archive> <manifest> <mainClass>org.nuiton.web.war.JettyLauncher</mainClass> </manifest> </archive> - <warName>pollen-${project.version}-embedded</warName> + <warName>${embeddedWarName}</warName> <webResources> <webResource> - <directory> - target/pollen-embedded-temp-${project.version} - </directory> + <directory>${embeddedTmpWarDir}</directory> <includes> <include>**/*</include> </includes>