Updated Branches: refs/heads/nonoss-to-noredist [created] 86bef8bfb
Rename nonoss to noredist to better reflect what the flag is used for. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/13e8b59b Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/13e8b59b Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/13e8b59b Branch: refs/heads/nonoss-to-noredist Commit: 13e8b59bc2c40de9009457bbe01608b28dac1f5d Parents: 62b0ad0 Author: Hugo Trippaers <[email protected]> Authored: Wed Sep 18 19:10:27 2013 +0800 Committer: Hugo Trippaers <[email protected]> Committed: Wed Sep 18 19:36:08 2013 +0800 ---------------------------------------------------------------------- client/pom.xml | 22 +++++++++++----------- plugins/pom.xml | 12 ++++++------ pom.xml | 2 +- services/console-proxy/server/pom.xml | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/13e8b59b/client/pom.xml ---------------------------------------------------------------------- diff --git a/client/pom.xml b/client/pom.xml index 119c96e..7ae1eb7 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -472,18 +472,18 @@ </configuration> </execution> <execution> - <id>process-nonoss</id> + <id>process-noredist</id> <phase>process-resources</phase> <goals> <goal>run</goal> </goals> <configuration> - <target if="${nonoss}"> + <target if="${noredist}"> <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" + replace="cloud-stack-components-specification=components-noredist.xml" byline="true" /> </target> </configuration> @@ -505,16 +505,16 @@ </configuration> </execution> <execution> - <id>process-nonoss-spring-context</id> + <id>process-noredist-spring-context</id> <phase>process-resources</phase> <goals> <goal>run</goal> </goals> <configuration> - <target if="${nonoss}"> + <target if="${noredist}"> <replaceregexp file="${basedir}/target/generated-webapp/WEB-INF/web.xml" - match="classpath:componentContext.xml" replace="classpath:nonossComponentContext.xml" + match="classpath:componentContext.xml" replace="classpath:noredistComponentContext.xml" byline="true" /> <copy overwrite="true" todir="${basedir}/target/generated-webapp/WEB-INF/classes/scripts"> @@ -633,7 +633,7 @@ <id>netapp</id> <activation> <property> - <name>nonoss</name> + <name>noredist</name> </property> </activation> <dependencies> @@ -648,7 +648,7 @@ <id>f5</id> <activation> <property> - <name>nonoss</name> + <name>noredist</name> </property> </activation> <dependencies> @@ -663,7 +663,7 @@ <id>netscaler</id> <activation> <property> - <name>nonoss</name> + <name>noredist</name> </property> </activation> <dependencies> @@ -678,7 +678,7 @@ <id>srx</id> <activation> <property> - <name>nonoss</name> + <name>noredist</name> </property> </activation> <dependencies> @@ -693,7 +693,7 @@ <id>vmware</id> <activation> <property> - <name>nonoss</name> + <name>noredist</name> </property> </activation> <dependencies> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/13e8b59b/plugins/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/pom.xml b/plugins/pom.xml index 0812642..ff18e83 100755 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -99,7 +99,7 @@ <id>netapp</id> <activation> <property> - <name>nonoss</name> + <name>noredist</name> </property> </activation> <modules> @@ -110,7 +110,7 @@ <id>kvm</id> <activation> <property> - <name>nonoss</name> + <name>noredist</name> </property> </activation> <modules> @@ -121,7 +121,7 @@ <id>f5</id> <activation> <property> - <name>nonoss</name> + <name>noredist</name> </property> </activation> <modules> @@ -132,7 +132,7 @@ <id>netscaler</id> <activation> <property> - <name>nonoss</name> + <name>noredist</name> </property> </activation> <modules> @@ -143,7 +143,7 @@ <id>srx</id> <activation> <property> - <name>nonoss</name> + <name>noredist</name> </property> </activation> <modules> @@ -154,7 +154,7 @@ <id>vmware</id> <activation> <property> - <name>nonoss</name> + <name>noredist</name> </property> </activation> <modules> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/13e8b59b/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 6d9a30f..c2c7e30 100644 --- a/pom.xml +++ b/pom.xml @@ -704,7 +704,7 @@ <id>vmware</id> <activation> <property> - <name>nonoss</name> + <name>noredist</name> </property> </activation> <modules> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/13e8b59b/services/console-proxy/server/pom.xml ---------------------------------------------------------------------- diff --git a/services/console-proxy/server/pom.xml b/services/console-proxy/server/pom.xml index 391c15a..7e101e8 100644 --- a/services/console-proxy/server/pom.xml +++ b/services/console-proxy/server/pom.xml @@ -204,7 +204,7 @@ <id>vmware</id> <activation> <property> - <name>nonoss</name> + <name>noredist</name> </property> </activation> <dependencies>
