You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/04/29 15:14:12 UTC

[34/50] [abbrv] git commit: updated refs/heads/marvin_refactor to 7c439fe

Please, please, pretty please try to stay away from the exec plugin whereever possible. It ussually ends up being non portable across developer operating systems. Most commands like cp have a perfectly usable equivalent in ant like the copy task.


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

Branch: refs/heads/marvin_refactor
Commit: 1adec812fad2fd58559d5b2e37b8b35d121486ce
Parents: 93ef3ad
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Fri Apr 26 13:56:07 2013 +0200
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Fri Apr 26 14:00:01 2013 +0200

----------------------------------------------------------------------
 client/pom.xml |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1adec812/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index 743cd36..a7c7009 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -450,16 +450,15 @@
             </goals>
             <configuration>
               <target if="${nonoss}">
-                <echo>test</echo>
                 <replaceregexp
                   file="${basedir}/target/generated-webapp/WEB-INF/web.xml"
                   match="classpath:componentContext.xml"
                   replace="classpath:nonossComponentContext.xml" byline="true" />
-                <exec executable="cp">
-                    <arg value="-r" />
-                    <arg value="${basedir}/../plugins/network-elements/cisco-vnmc/scripts" />
-                    <arg value="${basedir}/target/generated-webapp/WEB-INF/classes/" />
-                </exec>
+                <copy overwrite="true" todir="${basedir}/target/generated-webapp/WEB-INF/classes/scripts">
+                    <fileset dir="${basedir}/../plugins/network-elements/cisco-vnmc/scripts">
+                        <include name="**/*" />
+                    </fileset>
+                </copy>
               </target>
             </configuration>
           </execution>