Return-Path: Delivered-To: apmail-gump-commits-archive@www.apache.org Received: (qmail 46485 invoked from network); 21 Mar 2011 16:50:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 21 Mar 2011 16:50:52 -0000 Received: (qmail 89670 invoked by uid 500); 21 Mar 2011 16:50:52 -0000 Mailing-List: contact commits-help@gump.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: general@gump.apache.org Delivered-To: mailing list commits@gump.apache.org Received: (qmail 89663 invoked by uid 99); 21 Mar 2011 16:50:52 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Mar 2011 16:50:52 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Mar 2011 16:50:50 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D251B2388901; Mon, 21 Mar 2011 16:50:18 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1083866 - in /gump/live: ./ python/gump/core/language/java.py python/gump/core/model/builder.py python/gump/core/update/bzr.py python/gump/core/update/darcs.py python/gump/core/update/hg.py Date: Mon, 21 Mar 2011 16:50:18 -0000 To: commits@gump.apache.org From: bodewig@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110321165018.D251B2388901@eris.apache.org> Author: bodewig Date: Mon Mar 21 16:50:18 2011 New Revision: 1083866 URL: http://svn.apache.org/viewvc?rev=1083866&view=rev Log: merge groupId attribute for mvn?installer from trunk Modified: gump/live/ (props changed) gump/live/python/gump/core/language/java.py (props changed) gump/live/python/gump/core/model/builder.py gump/live/python/gump/core/update/bzr.py (props changed) gump/live/python/gump/core/update/darcs.py (props changed) gump/live/python/gump/core/update/hg.py (props changed) Propchange: gump/live/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Mar 21 16:50:18 2011 @@ -1 +1 @@ -/gump/trunk:746160,746727,746892,747270,747272-747273,747656,748010,748018,748028,748661,748967,760784-761159,815848,953630-954169,955387,955837,956771,957107,957408,958453,958915,959344,959847,960260,960295,960297,960300,960303,961244,961577,961843,961859,961870,962395,962401,962981,962990,962993,963021-963048,965728-965730,980314,980756,981122,983105,986920-987098,987923,988801,988804,989112,990012-990114,991428,991430,991577,991802,992260,1001782,1005749,1027812-1027813,1029568,1029983,1034100,1034558,1066928 +/gump/trunk:746160,746727,746892,747270,747272-747273,747656,748010,748018,748028,748661,748967,760784-761159,815848,953630-954169,955387,955837,956771,957107,957408,958453,958915,959344,959847,960260,960295,960297,960300,960303,961244,961577,961843,961859,961870,962395,962401,962981,962990,962993,963021-963048,965728-965730,980314,980756,981122,983105,986920-987098,987923,988801,988804,989112,990012-990114,991428,991430,991577,991802,992260,1001782,1005749,1027812-1027813,1029568,1029983,1034100,1034558,1066928,1083707 Propchange: gump/live/python/gump/core/language/java.py ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Mar 21 16:50:18 2011 @@ -1 +1 @@ -/gump/trunk/python/gump/core/language/java.py:746160,746727,746892,747270,747272-747273,747656,748010,748018,748028,748661,748967,760784-761159,815848,953630-954169,955387,955837,956771,957107,957408,958453,958915,959344,959847,960260,960295,960297,960300,960303,961244,962395,962401,962981,962990,962993,963021-963048,965728-965730,980314,980756,981122,983105,986920-987098,987923,988801,988804,989112,990012-990114,991428,991430,991577,991802,992260,1001782,1005749,1027812-1027813,1029568,1029983,1034100,1034558,1066928 +/gump/trunk/python/gump/core/language/java.py:746160,746727,746892,747270,747272-747273,747656,748010,748018,748028,748661,748967,760784-761159,815848,953630-954169,955387,955837,956771,957107,957408,958453,958915,959344,959847,960260,960295,960297,960300,960303,961244,962395,962401,962981,962990,962993,963021-963048,965728-965730,980314,980756,981122,983105,986920-987098,987923,988801,988804,989112,990012-990114,991428,991430,991577,991802,992260,1001782,1005749,1027812-1027813,1029568,1029983,1034100,1034558,1066928,1083707 Modified: gump/live/python/gump/core/model/builder.py URL: http://svn.apache.org/viewvc/gump/live/python/gump/core/model/builder.py?rev=1083866&r1=1083865&r2=1083866&view=diff ============================================================================== --- gump/live/python/gump/core/model/builder.py (original) +++ gump/live/python/gump/core/model/builder.py Mon Mar 21 16:50:18 2011 @@ -350,6 +350,7 @@ class MvnInstall(Maven): PARENT = 'parent' POM = 'pom' VERSION = 'version' + GROUP_ID = 'groupId' def __init__(self, dom, project, version = MVN_VERSION2): Maven.__init__(self, dom, project, version) @@ -359,6 +360,7 @@ class MvnInstall(Maven): self.file = self.getDomAttributeValue(MvnInstall.FILE, 'pom.xml') self.artifactVersion = self.getDomAttributeValue(MvnInstall.VERSION) self.artifactId = self.getDomAttributeValue(MvnInstall.ARTIFACT_ID) + self.groupId = self.getDomAttributeValue(MvnInstall.GROUP_ID) def expand(self, project, workspace): """ Turns the builder's attributes into properties """ @@ -367,7 +369,8 @@ class MvnInstall(Maven): impl = getDOMImplementation() self._add_property(impl, MvnInstall.ARTIFACT_ID, self.artifactId or project.getName()) - self._add_property(impl, 'groupId', project.getArtifactGroup()) + self._add_property(impl, MvnInstall.GROUP_ID, + self.groupId or project.getArtifactGroup()) self._add_property(impl, MvnInstall.PACKAGING, self.packaging) self._add_property(impl, MvnInstall.FILE, self.file) if self.artifactVersion: Propchange: gump/live/python/gump/core/update/bzr.py ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Mar 21 16:50:18 2011 @@ -1 +1 @@ -/gump/trunk/python/gump/core/update/bzr.py:815848,953630-954169,955387,955837,956771,957107,957408,958453,958915,959344,959847,960260,960295,960297,960300,960303,961244,961577,961843,961859,961870,962395,962401,962981,962990,962993,963021-963048,965728-965730,980314,980756,981122,983105,986920-987098,987923,988801,988804,989112,990012-990114,991428,991430,991577,991802,992260,1001782,1005749,1027812-1027813,1029568,1029983,1034100,1034558,1066928 +/gump/trunk/python/gump/core/update/bzr.py:815848,953630-954169,955387,955837,956771,957107,957408,958453,958915,959344,959847,960260,960295,960297,960300,960303,961244,961577,961843,961859,961870,962395,962401,962981,962990,962993,963021-963048,965728-965730,980314,980756,981122,983105,986920-987098,987923,988801,988804,989112,990012-990114,991428,991430,991577,991802,992260,1001782,1005749,1027812-1027813,1029568,1029983,1034100,1034558,1066928,1083707 Propchange: gump/live/python/gump/core/update/darcs.py ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Mar 21 16:50:18 2011 @@ -1 +1 @@ -/gump/trunk/python/gump/core/update/darcs.py:815848,953630-954169,955387,955837,956771,957107,957408,958453,958915,959344,959847,960260,960295,960297,960300,960303,961244,961577,961843,961859,961870,962395,962401,962981,962990,962993,963021-963048,965728-965730,980314,980756,981122,983105,986920-987098,987923,988801,988804,989112,990012-990114,991428,991430,991577,991802,992260,1001782,1005749,1027812-1027813,1029568,1029983,1034100,1034558,1066928 +/gump/trunk/python/gump/core/update/darcs.py:815848,953630-954169,955387,955837,956771,957107,957408,958453,958915,959344,959847,960260,960295,960297,960300,960303,961244,961577,961843,961859,961870,962395,962401,962981,962990,962993,963021-963048,965728-965730,980314,980756,981122,983105,986920-987098,987923,988801,988804,989112,990012-990114,991428,991430,991577,991802,992260,1001782,1005749,1027812-1027813,1029568,1029983,1034100,1034558,1066928,1083707 Propchange: gump/live/python/gump/core/update/hg.py ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Mar 21 16:50:18 2011 @@ -1 +1 @@ -/gump/trunk/python/gump/core/update/hg.py:815848,953630-954169,955387,955837,956771,957107,957408,958453,958915,959344,959847,960260,960295,960297,960300,960303,961244,961577,961843,961859,961870,962395,962401,962981,962990,962993,963021-963048,965728-965730,980314,980756,981122,983105,986920-987098,987923,988801,988804,989112,990012-990114,991428,991430,991577,991802,992260,1001782,1005749,1027812-1027813,1029568,1029983,1034100,1034558,1066928 +/gump/trunk/python/gump/core/update/hg.py:815848,953630-954169,955387,955837,956771,957107,957408,958453,958915,959344,959847,960260,960295,960297,960300,960303,961244,961577,961843,961859,961870,962395,962401,962981,962990,962993,963021-963048,965728-965730,980314,980756,981122,983105,986920-987098,987923,988801,988804,989112,990012-990114,991428,991430,991577,991802,992260,1001782,1005749,1027812-1027813,1029568,1029983,1034100,1034558,1066928,1083707