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 2012/02/28 06:26:11 UTC
svn commit: r1294464 - in /gump/live: ./ python/gump/core/language/java.py
python/gump/core/model/output.py python/gump/core/update/bzr.py
python/gump/core/update/darcs.py python/gump/core/update/hg.py
Author: bodewig
Date: Tue Feb 28 05:26:11 2012
New Revision: 1294464
URL: http://svn.apache.org/viewvc?rev=1294464&view=rev
Log:
merge cleanup from trunk
Modified:
gump/live/ (props changed)
gump/live/python/gump/core/language/java.py (props changed)
gump/live/python/gump/core/model/output.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 Tue Feb 28 05:26:11 2012
@@ -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,1083707,1103277,1172201,1172422,1208954,1208959,1209032,1293538,1293817,1294259
+/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,1103277,1172201,1172422,1208954,1208959,1209032,1293538,1293817,1294259,1294463
Propchange: gump/live/python/gump/core/language/java.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 28 05:26:11 2012
@@ -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,1083707,1103277,1172201,1172422,1208954,1208959,1209032,1293538,1293817,1294259
+/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,1103277,1172201,1172422,1208954,1208959,1209032,1293538,1293817,1294259,1294463
Modified: gump/live/python/gump/core/model/output.py
URL: http://svn.apache.org/viewvc/gump/live/python/gump/core/model/output.py?rev=1294464&r1=1294463&r2=1294464&view=diff
==============================================================================
--- gump/live/python/gump/core/model/output.py (original)
+++ gump/live/python/gump/core/model/output.py Tue Feb 28 05:26:11 2012
@@ -74,8 +74,3 @@ class Output(NamedModelObject):
return self.type in [OUTPUT_BOOTCLASSPATH_JAR, \
OUTPUT_JAR, \
OUTPUT_TESTS_JAR]
-
- def complete(self):
- """ set type from attribute if present """
- NamedModelObject.complete(self)
- self.setType(self.getDomAttributeValue('type'))
Propchange: gump/live/python/gump/core/update/bzr.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 28 05:26:11 2012
@@ -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,1083707,1103277,1172201,1172422,1208954,1208959,1209032,1293538,1293817,1294259
+/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,1103277,1172201,1172422,1208954,1208959,1209032,1293538,1293817,1294259,1294463
Propchange: gump/live/python/gump/core/update/darcs.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 28 05:26:11 2012
@@ -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,1083707,1103277,1172201,1172422,1208954,1208959,1209032,1293538,1293817,1294259
+/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,1103277,1172201,1172422,1208954,1208959,1209032,1293538,1293817,1294259,1294463
Propchange: gump/live/python/gump/core/update/hg.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 28 05:26:11 2012
@@ -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,1083707,1103277,1172201,1172422,1208954,1208959,1209032,1293538,1293817,1294259
+/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,1103277,1172201,1172422,1208954,1208959,1209032,1293538,1293817,1294259,1294463