Return-Path: 
 <commits-return-31588-apmail-cloudstack-commits-archive=cloudstack.apache.org@cloudstack.apache.org>
X-Original-To: apmail-cloudstack-commits-archive@www.apache.org
Delivered-To: apmail-cloudstack-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 77F1210F87
	for <apmail-cloudstack-commits-archive@www.apache.org>;
 Wed, 25 Sep 2013 10:43:49 +0000 (UTC)
Received: (qmail 90848 invoked by uid 500); 25 Sep 2013 10:31:43 -0000
Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org
Received: (qmail 89945 invoked by uid 500); 25 Sep 2013 10:29:44 -0000
Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cloudstack.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cloudstack.apache.org>
List-Post: <mailto:commits@cloudstack.apache.org>
List-Id: <commits.cloudstack.apache.org>
Reply-To: dev@cloudstack.apache.org
Delivered-To: mailing list commits@cloudstack.apache.org
Received: (qmail 89366 invoked by uid 99); 25 Sep 2013 10:28:58 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Sep 2013 10:28:58 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 6EA20909876; Wed, 25 Sep 2013 10:28:57 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: widodh@apache.org
To: commits@cloudstack.apache.org
Date: Wed, 25 Sep 2013 10:29:21 -0000
Message-Id: <78e8d2ac0fc744da9165f570036d9dfa@git.apache.org>
In-Reply-To: <74771eb5b1e24edb9ecf13cb5701714f@git.apache.org>
References: <74771eb5b1e24edb9ecf13cb5701714f@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [26/59] [abbrv] git commit: updated refs/heads/disk-cache to bbae6f8

Move the systemvm copy action and dependency to the systemvm profile

Applied auto-formatting on the xml file


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9a7f304b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9a7f304b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9a7f304b

Branch: refs/heads/disk-cache
Commit: 9a7f304b8c2931472ca7e7faeccb126f065cb8d6
Parents: c7cc791
Author: Hugo Trippaers <htrippaers@schubergphilis.com>
Authored: Sat Sep 21 11:02:03 2013 +0800
Committer: Hugo Trippaers <htrippaers@schubergphilis.com>
Committed: Sat Sep 21 11:03:12 2013 +0800

----------------------------------------------------------------------
 client/pom.xml | 167 ++++++++++++++++++++++++++++------------------------
 1 file changed, 89 insertions(+), 78 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9a7f304b/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index c09e10e..4ceaf58 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -7,7 +7,8 @@
   the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
   OF ANY KIND, either express or implied. See the License for the specific language 
   governing permissions and limitations under the License. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cloud-client-ui</artifactId>
@@ -17,7 +18,7 @@
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
     <version>4.3.0-SNAPSHOT</version>
-  </parent> 
+  </parent>
   <dependencies>
     <dependency>
       <groupId>org.apache.cloudstack</groupId>
@@ -275,12 +276,6 @@
       <artifactId>cloud-plugin-host-anti-affinity</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.cloudstack</groupId>
-      <artifactId>cloud-systemvm</artifactId>
-      <version>${project.version}</version>
-      <type>pom</type>
-    </dependency>
   </dependencies>
   <build>
     <plugins>
@@ -351,25 +346,6 @@
         <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>process-resources</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <target>
-                <copy todir="${basedir}/target/generated-webapp/WEB-INF/classes/vms">
-                  <fileset dir="${basedir}/../systemvm/dist">
-                    <include name="systemvm.zip" />
-                    <include name="systemvm.iso" />
-                  </fileset>
-                </copy>
-              </target>
-            </configuration>
-          </execution>
           <execution>
             <id>generate-resource</id>
             <phase>generate-resources</phase>
@@ -378,95 +354,93 @@
             </goals>
             <configuration>
               <target>
-                <copy
-                  todir="${basedir}/target/generated-webapp/WEB-INF/classes/scripts">
-                  <fileset dir="${basedir}/../scripts" />
+                <copy todir="${basedir}/target/generated-webapp/WEB-INF/classes/scripts">
+                  <fileset dir="${basedir}/../scripts"/>
                 </copy>
                 <!-- CLOUDSTACK-1304 -->
-                <chmod perm="755" file="${basedir}/target/generated-webapp/WEB-INF/classes/scripts/**" type="both" />
+                <chmod perm="755"
+                  file="${basedir}/target/generated-webapp/WEB-INF/classes/scripts/**" type="both"/>
                 <copy todir="${basedir}/target/generated-webapp/WEB-INF/">
                   <fileset dir="${basedir}/WEB-INF/">
-                    <include name="web.xml" />
+                    <include name="web.xml"/>
                   </fileset>
                 </copy>
                 <copy todir="${basedir}/target/generated-webapp/WEB-INF/classes">
                   <fileset dir="${basedir}/WEB-INF/classes">
-                    <include name="resources/**/*" />
+                    <include name="resources/**/*"/>
                   </fileset>
                 </copy>
                 <copy todir="${basedir}/target/generated-webapp">
-                  <fileset dir="${basedir}/../ui" />
+                  <fileset dir="${basedir}/../ui"/>
                 </copy>
-                <copy overwrite="true"
-                  todir="${basedir}/target/generated-webapp/WEB-INF/classes">
+                <copy overwrite="true" todir="${basedir}/target/generated-webapp/WEB-INF/classes">
                   <fileset dir="${basedir}/tomcatconf">
-                    <include name="*.in" />
+                    <include name="*.in"/>
                   </fileset>
-                  <globmapper from="*.in" to="*" />
+                  <globmapper from="*.in" to="*"/>
                   <filterchain>
                     <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
-                      <param type="propertiesfile" value="${cs.replace.properties}" />
+                      <param type="propertiesfile" value="${cs.replace.properties}"/>
                     </filterreader>
                   </filterchain>
                 </copy>
-                <copy overwrite="true"
-                  todir="${basedir}/target/generated-webapp/WEB-INF/classes">
+                <copy overwrite="true" todir="${basedir}/target/generated-webapp/WEB-INF/classes">
                   <fileset dir="${basedir}/tomcatconf">
-                    <include name="*.in" />
+                    <include name="*.in"/>
                   </fileset>
-                  <globmapper from="*.in" to="*" />
+                  <globmapper from="*.in" to="*"/>
                   <filterchain>
                     <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
-                      <param type="propertiesfile" value="${cs.replace.properties}" />
+                      <param type="propertiesfile" value="${cs.replace.properties}"/>
                     </filterreader>
                   </filterchain>
                 </copy>
                 <copy overwrite="true" todir="${basedir}/target/utilities/bin">
                   <fileset dir="${basedir}/../setup/bindir">
-                    <include name="*.in" />
+                    <include name="*.in"/>
                   </fileset>
-                  <globmapper from="*.in" to="*" />
+                  <globmapper from="*.in" to="*"/>
                   <filterchain>
                     <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
-                      <param type="propertiesfile" value="${cs.replace.properties}" />
+                      <param type="propertiesfile" value="${cs.replace.properties}"/>
                     </filterreader>
                   </filterchain>
                 </copy>
                 <copy overwrite="true" todir="${basedir}/target/utilities/bin">
                   <fileset dir="${basedir}/bindir">
-                    <include name="*.in" />
+                    <include name="*.in"/>
                   </fileset>
-                  <globmapper from="*.in" to="*" />
+                  <globmapper from="*.in" to="*"/>
                   <filterchain>
                     <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
-                      <param type="propertiesfile" value="${cs.replace.properties}" />
+                      <param type="propertiesfile" value="${cs.replace.properties}"/>
                     </filterreader>
                   </filterchain>
                 </copy>
                 <copy overwrite="true" todir="${basedir}/target/utilities/scripts/db">
                   <fileset dir="${basedir}/../setup/db">
-                    <include name="**/*" />
+                    <include name="**/*"/>
                   </fileset>
                   <filterchain>
                     <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
-                      <param type="propertiesfile" value="${cs.replace.properties}" />
+                      <param type="propertiesfile" value="${cs.replace.properties}"/>
                     </filterreader>
                   </filterchain>
                 </copy>
                 <copy overwrite="true" todir="${basedir}/target/conf">
                   <fileset dir="${basedir}/tomcatconf">
-                    <include name="*.in" />
+                    <include name="*.in"/>
                   </fileset>
-                  <globmapper from="*.in" to="*" />
+                  <globmapper from="*.in" to="*"/>
                   <filterchain>
                     <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
-                      <param type="propertiesfile" value="${cs.replace.properties}" />
+                      <param type="propertiesfile" value="${cs.replace.properties}"/>
                     </filterreader>
                   </filterchain>
                 </copy>
                 <copy overwrite="true" todir="${basedir}/target/conf">
                   <fileset dir="${basedir}/tomcatconf">
-                    <exclude name="*.in" />
+                    <exclude name="*.in"/>
                   </fileset>
                 </copy>
               </target>
@@ -484,8 +458,8 @@
                 <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" />
+                  replace="cloud-stack-components-specification=components-nonoss.xml" byline="true"
+                />
               </target>
             </configuration>
           </execution>
@@ -498,10 +472,9 @@
             <configuration>
               <target if="${simulator}">
                 <echo>test</echo>
-                <replaceregexp
-                  file="${basedir}/target/generated-webapp/WEB-INF/web.xml"
-                  match="classpath:componentContext.xml" replace="classpath:simulatorComponentContext.xml"
-                  byline="true" />
+                <replaceregexp file="${basedir}/target/generated-webapp/WEB-INF/web.xml"
+                  match="classpath:componentContext.xml"
+                  replace="classpath:simulatorComponentContext.xml" byline="true"/>
               </target>
             </configuration>
           </execution>
@@ -513,15 +486,13 @@
             </goals>
             <configuration>
               <target if="${nonoss}">
-                <replaceregexp
-                  file="${basedir}/target/generated-webapp/WEB-INF/web.xml"
-                  match="classpath:componentContext.xml" replace="classpath:nonossComponentContext.xml"
-                  byline="true" />
+                <replaceregexp file="${basedir}/target/generated-webapp/WEB-INF/web.xml"
+                  match="classpath:componentContext.xml"
+                  replace="classpath:nonossComponentContext.xml" byline="true"/>
                 <copy overwrite="true"
                   todir="${basedir}/target/generated-webapp/WEB-INF/classes/scripts">
-                  <fileset
-                    dir="${basedir}/../plugins/network-elements/cisco-vnmc/scripts">
-                    <include name="**/*" />
+                  <fileset dir="${basedir}/../plugins/network-elements/cisco-vnmc/scripts">
+                    <include name="**/*"/>
                   </fileset>
                 </copy>
               </target>
@@ -539,8 +510,7 @@
                 <replaceregexp
                   file="${basedir}/target/generated-webapp/WEB-INF/classes/applicationContext.xml"
                   match="com.cloud.consoleproxy.ConsoleProxyManagerImpl"
-                  replace="com.cloud.consoleproxy.StaticConsoleProxyManager"
-                  byline="true" />
+                  replace="com.cloud.consoleproxy.StaticConsoleProxyManager" byline="true"/>
               </target>
             </configuration>
           </execution>
@@ -592,19 +562,15 @@
               <pluginExecutions>
                 <pluginExecution>
                   <pluginExecutionFilter>
-                    <groupId>
-                      org.apache.maven.plugins
-                    </groupId>
-                    <artifactId>
-                      maven-antrun-plugin
-                    </artifactId>
+                    <groupId> org.apache.maven.plugins </groupId>
+                    <artifactId> maven-antrun-plugin </artifactId>
                     <versionRange>[1.7,)</versionRange>
                     <goals>
                       <goal>run</goal>
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore />
+                    <ignore/>
                   </action>
                 </pluginExecution>
               </pluginExecutions>
@@ -616,6 +582,51 @@
   </build>
   <profiles>
     <profile>
+      <id>systemvm</id>
+      <activation>
+        <property>
+          <name>systemvm</name>
+        </property>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.cloudstack</groupId>
+          <artifactId>cloud-systemvm</artifactId>
+          <version>${project.version}</version>
+          <type>pom</type>
+        </dependency>
+      </dependencies>
+      <build>
+        <plugins>
+          <plugin>
+            <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>process-resources</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <configuration>
+                  <target>
+                    <copy todir="${basedir}/target/generated-webapp/WEB-INF/classes/vms">
+                      <fileset dir="${basedir}/../systemvm/dist">
+                        <include name="systemvm.zip"/>
+                        <include name="systemvm.iso"/>
+                      </fileset>
+                    </copy>
+                  </target>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
       <id>simulator</id>
       <activation>
         <property>