You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by pr...@apache.org on 2013/04/05 23:03:14 UTC
[19/50] [abbrv] git commit: updated refs/heads/affinity_groups to
ca1a794
Summary: Small changes to the maven phases.
Moved the copy of the systemvm to the package phase as the systemiso is
made during this phase. So in the original config the old systemvm.zip
would be copied to the server.
Add a cleanup to the console-proxy to clean the dist dir during the
clean phase.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4a7d392f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4a7d392f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4a7d392f
Branch: refs/heads/affinity_groups
Commit: 4a7d392f18d5720676cbb22174f2a1a3566cd163
Parents: 4456745
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Wed Apr 3 14:55:50 2013 +0200
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Wed Apr 3 14:55:50 2013 +0200
----------------------------------------------------------------------
client/pom.xml | 26 ++++++++++++++++++++------
services/console-proxy/server/pom.xml | 12 ++++++++++++
2 files changed, 32 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4a7d392f/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index ff861b7..9323d0f 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -279,6 +279,26 @@
<artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
<executions>
+ <!-- Copy the systemvm in the package phase as it is generated
+ by console-proxy in the package phase.
+ -->
+ <execution>
+ <id>copy-systemvm</id>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <copy todir="${basedir}/target/generated-webapp/WEB-INF/classes/vms">
+ <fileset dir="${basedir}/../services/console-proxy/server/dist">
+ <include name="systemvm.zip" />
+ <include name="systemvm.iso" />
+ </fileset>
+ </copy>
+ </target>
+ </configuration>
+ </execution>
<execution>
<id>generate-resource</id>
<phase>generate-resources</phase>
@@ -306,12 +326,6 @@
<include name="resources/**/*" />
</fileset>
</copy>
- <copy todir="${basedir}/target/generated-webapp/WEB-INF/classes/vms">
- <fileset dir="${basedir}/../services/console-proxy/server/dist">
- <include name="systemvm.zip" />
- <include name="systemvm.iso" />
- </fileset>
- </copy>
<copy todir="${basedir}/target/generated-webapp">
<fileset dir="${basedir}/../ui" />
</copy>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4a7d392f/services/console-proxy/server/pom.xml
----------------------------------------------------------------------
diff --git a/services/console-proxy/server/pom.xml b/services/console-proxy/server/pom.xml
index 0df7559..f57b4ca 100644
--- a/services/console-proxy/server/pom.xml
+++ b/services/console-proxy/server/pom.xml
@@ -139,6 +139,18 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>dist</directory>
+ <followSymlinks>false</followSymlinks>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
<!-- Leave this to the systemvm profile
Enable using the -P systemvm flag
<plugin>