You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gump.apache.org by bo...@apache.org on 2011/02/04 05:54:54 UTC
svn commit: r1067081 - in /gump/live: ./ python/gump/core/language/java.py
python/gump/core/model/builder.py python/gump/core/model/project.py
python/gump/core/update/bzr.py python/gump/core/update/darcs.py
python/gump/core/update/hg.py
Author: bodewig
Date: Fri Feb 4 04:54:54 2011
New Revision: 1067081
URL: http://svn.apache.org/viewvc?rev=1067081&view=rev
Log:
mvn3builder
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/model/project.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 Fri Feb 4 04:54:54 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
+/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
Propchange: gump/live/python/gump/core/language/java.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 4 04:54:54 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
+/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
Modified: gump/live/python/gump/core/model/builder.py
URL: http://svn.apache.org/viewvc/gump/live/python/gump/core/model/builder.py?rev=1067081&r1=1067080&r2=1067081&view=diff
==============================================================================
--- gump/live/python/gump/core/model/builder.py (original)
+++ gump/live/python/gump/core/model/builder.py Fri Feb 4 04:54:54 2011
@@ -357,7 +357,7 @@ class MvnInstall(Maven):
self.packaging = self.getDomAttributeValue(MvnInstall.PACKAGING,
MvnInstall.POM)
self.file = self.getDomAttributeValue(MvnInstall.FILE, 'pom.xml')
- self.version = self.getDomAttributeValue(MvnInstall.VERSION)
+ self.artifactVersion = self.getDomAttributeValue(MvnInstall.VERSION)
self.artifactId = self.getDomAttributeValue(MvnInstall.ARTIFACT_ID)
def expand(self, project, workspace):
@@ -370,8 +370,8 @@ class MvnInstall(Maven):
self._add_property(impl, 'groupId', project.getArtifactGroup())
self._add_property(impl, MvnInstall.PACKAGING, self.packaging)
self._add_property(impl, MvnInstall.FILE, self.file)
- if self.version:
- self._add_property(impl, MvnInstall.VERSION, self.version)
+ if self.artifactVersion:
+ self._add_property(impl, MvnInstall.VERSION, self.artifactVersion)
elif not self.packaging == MvnInstall.POM:
project.addError("version attribute is mandatory if the file is"
+ " not a POM.")
@@ -383,7 +383,7 @@ class MvnInstall(Maven):
"""
props = PropertyContainer.getProperties(self)[:]
- if not self.version and self.packaging == MvnInstall.POM:
+ if not self.artifactVersion and self.packaging == MvnInstall.POM:
try:
pomDoc = self._read_pom()
root = pomDoc.documentElement
Modified: gump/live/python/gump/core/model/project.py
URL: http://svn.apache.org/viewvc/gump/live/python/gump/core/model/project.py?rev=1067081&r1=1067080&r2=1067081&view=diff
==============================================================================
--- gump/live/python/gump/core/model/project.py (original)
+++ gump/live/python/gump/core/model/project.py Fri Feb 4 04:54:54 2011
@@ -466,7 +466,7 @@ class Project(NamedModelObject, Statable
# Import any <mvninstall part [if not packaged]
for tag in ['mvninstall', 'mvn2install']:
if self.hasDomChild(tag) and not packaged:
- self.mvn = MvnInstall(self.getDomChild(tag), self)
+ self.mvn = MvnInstall(self.getDomChild(tag), self, MVN_VERSION2)
self.builder.append(self.mvn)
# Copy over any XML errors/warnings
@@ -477,6 +477,12 @@ class Project(NamedModelObject, Statable
self.mvn = Maven(self.getDomChild('mvn3'), self, MVN_VERSION3)
self.builder.append(self.mvn)
+ # Import any <mvn3install part [if not packaged]
+ if self.hasDomChild('mvn3install') and not packaged:
+ self.mvn = MvnInstall(self.getDomChild('mvn3install'), self,
+ MVN_VERSION3)
+ self.builder.append(self.mvn)
+
# Copy over any XML errors/warnings
# :TODO:#1: transferAnnotations(self.xml.maven, self)
Propchange: gump/live/python/gump/core/update/bzr.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 4 04:54:54 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
+/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
Propchange: gump/live/python/gump/core/update/darcs.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 4 04:54:54 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
+/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
Propchange: gump/live/python/gump/core/update/hg.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 4 04:54:54 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
+/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