Return-Path: X-Original-To: apmail-cloudstack-dev-archive@www.apache.org Delivered-To: apmail-cloudstack-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2A67510564 for ; Thu, 11 Apr 2013 19:40:22 +0000 (UTC) Received: (qmail 27892 invoked by uid 500); 11 Apr 2013 19:36:51 -0000 Delivered-To: apmail-cloudstack-dev-archive@cloudstack.apache.org Received: (qmail 19191 invoked by uid 500); 11 Apr 2013 19:36:15 -0000 Mailing-List: contact dev-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list dev@cloudstack.apache.org Received: (qmail 48350 invoked by uid 99); 11 Apr 2013 19:18:54 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Apr 2013 19:18:54 +0000 X-ASF-Spam-Status: No, hits=1.5 required=5.0 tests=HTML_MESSAGE,RCVD_IN_DNSWL_LOW,SPF_HELO_PASS,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of Chiradeep.Vittal@citrix.com designates 66.165.176.63 as permitted sender) Received: from [66.165.176.63] (HELO SMTP02.CITRIX.COM) (66.165.176.63) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Apr 2013 19:18:50 +0000 X-IronPort-AV: E=Sophos;i="4.87,456,1363132800"; d="scan'208,217";a="18034308" Received: from sjcpmailmx02.citrite.net ([10.216.14.75]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 11 Apr 2013 19:18:27 +0000 Received: from SJCPMAILBOX01.citrite.net ([10.216.4.73]) by SJCPMAILMX02.citrite.net ([10.216.14.75]) with mapi; Thu, 11 Apr 2013 12:18:26 -0700 From: Chiradeep Vittal To: Hugo CC: "dev@cloudstack.apache.org" , "hugo@apache.org" Date: Thu, 11 Apr 2013 12:18:23 -0700 Subject: Re: systemvm.iso does not get copied with mvn jetty:run Thread-Topic: systemvm.iso does not get copied with mvn jetty:run Thread-Index: Ac426Vc9IeQUo9wFRMOH08NpGwzbww== Message-ID: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: user-agent: Microsoft-MacOutlook/14.3.2.130206 acceptlanguage: en-US Content-Type: multipart/alternative; boundary="_000_CD8C5A8711007chiradeepvittalcitrixcom_" MIME-Version: 1.0 X-Virus-Checked: Checked by ClamAV on apache.org --_000_CD8C5A8711007chiradeepvittalcitrixcom_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Yes! From: Hugo > Date: Thursday, April 11, 2013 11:52 AM To: Chiradeep Vittal > Cc: "dev@cloudstack.apache.org" >, "hugo@apache.org" > Subject: Re: systemvm.iso does not get copied with mvn jetty:run Just noticed Kelvens commit f35272b6c585f85c5c0f1e92f99b8224feceb29e That fixed it right? Cheers, Hugo On Thu, Apr 11, 2013 at 8:46 PM, Hugo Trippaers > wrote: Ouch. I'll try and fix that. Without this commit it would use the systemvm.= iso from the previous compile, which is also bad. Probably some tweaking in the phases should be ok. Cheers, Hugo Sent from my iPhone On 11 apr. 2013, at 19:33, Chiradeep Vittal > wrote: > Hi Hugo, > > With the change 4a7d392f1, the systemvm.iso no longer appears in > cloud-client-ui-4.2.0-SNAPSHOT/WEB-INF/classes/vms/systemvm.iso > > For 'clean' hypervisors this means that during a developer build and test= , > the systemvm.iso is no longer copied over. > > I'd like to revert this. I do not understand the intent of the commit, so > I can't fix both issues. > > > On 4/3/13 5:56 AM, "hugo@apache.org" > wrote: > >> Updated Branches: >> refs/heads/master 44567453e -> 4a7d392f1 >> >> >> 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/4a7d392= f >> 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/master >> Commit: 4a7d392f18d5720676cbb22174f2a1a3566cd163 >> Parents: 4456745 >> Author: Hugo Trippaers > >> Authored: Wed Apr 3 14:55:50 2013 +0200 >> Committer: Hugo Trippaers > >> 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/p= om >> .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 @@ >> maven-antrun-plugin >> 1.7 >> >> + >> + >> + copy-systemvm >> + package >> + >> + run >> + >> + >> + >> + > todir=3D"${basedir}/target/generated-webapp/WEB-INF/classes/vms"> >> + > dir=3D"${basedir}/../services/console-proxy/server/dist"> >> + >> + >> + >> + >> + >> + >> + >> >> generate-resource >> generate-resources >> @@ -306,12 +326,6 @@ >> >> >> >> - > todir=3D"${basedir}/target/generated-webapp/WEB-INF/classes/vms"> >> - > dir=3D"${basedir}/../services/console-proxy/server/dist"> >> - >> - >> - >> - >> >> >> >> >> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4a7d392f/services= /c >> onsole-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 @@ >> >> >> >> + >> + maven-clean-plugin >> + 2.5 >> + >> + >> + >> + dist >> + false >> + >> + >> + >> + >>