client: Fix maven to replace nonoss spring ctx xml for nonoss build Signed-off-by: Rohit Yadav <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/4c1a69ac Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/4c1a69ac Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/4c1a69ac Branch: refs/heads/master Commit: 4c1a69ac334aa4ae9deb98d8335330b0732c74c1 Parents: 2fb346a Author: Rohit Yadav <[email protected]> Authored: Sun Jan 27 05:40:17 2013 -0800 Committer: Rohit Yadav <[email protected]> Committed: Sun Jan 27 05:40:17 2013 -0800 ---------------------------------------------------------------------- client/pom.xml | 56 +++++++++++++++++++++++++++++++++++--------------- 1 files changed, 39 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4c1a69ac/client/pom.xml ---------------------------------------------------------------------- diff --git a/client/pom.xml b/client/pom.xml index e57a5ab..6411ed8 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -203,7 +203,7 @@ <artifactId>maven-war-plugin</artifactId> <version>2.3</version> <configuration> - <webXml>./WEB-INF/web.xml</webXml> + <webXml>./target/generated-webapp/WEB-INF/web.xml</webXml> <warSourceDirectory>./target/generated-webapp</warSourceDirectory> </configuration> </plugin> @@ -246,6 +246,12 @@ <configuration> <target> <copy + todir="${basedir}/target/generated-webapp/WEB-INF/"> + <fileset dir="${basedir}/WEB-INF/"> + <include name="web.xml" /> + </fileset> + </copy> + <copy todir="${basedir}/target/generated-webapp/WEB-INF/classes"> <fileset dir="${basedir}/WEB-INF/classes"> <include name="resources/**/*" /> @@ -325,22 +331,38 @@ </target> </configuration> </execution> - <execution> - <id>process-nonoss</id> - <phase>process-resources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <target if="${nonoss}"> - <echo>test</echo> - <replaceregexp - file="${basedir}/target/generated-webapp/WEB-INF/classes/environment.properties" - match="cloud-stack-components-specification=.*" - replace="cloud-stack-components-specification=components-nonoss.xml" byline="true" /> - </target> - </configuration> - </execution> + <execution> + <id>process-nonoss</id> + <phase>process-resources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <target if="${nonoss}"> + <echo>test</echo> + <replaceregexp + file="${basedir}/target/generated-webapp/WEB-INF/classes/environment.properties" + match="cloud-stack-components-specification=.*" + replace="cloud-stack-components-specification=components-nonoss.xml" byline="true" /> + </target> + </configuration> + </execution> + <execution> + <id>process-nonoss-spring-context</id> + <phase>process-resources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <target if="${nonoss}"> + <echo>test</echo> + <replaceregexp + file="${basedir}/target/generated-webapp/WEB-INF/web.xml" + match="classpath:applicationContext.xml, classpath:componentContext.xml" + replace="classpath:applicationContext.xml, classpath:nonossComponentContext.xml" byline="true" /> + </target> + </configuration> + </execution> </executions> </plugin> <!-- there are the jasypt libs requires by some of the python scripts -->
