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 2010/07/05 06:01:16 UTC
svn commit: r960434 - in /gump/live: ./
python/gump/actor/mvnrepoproxy/proxycontrol.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: Mon Jul 5 04:01:16 2010
New Revision: 960434
URL: http://svn.apache.org/viewvc?rev=960434&view=rev
Log:
merge support for tests jars
Modified:
gump/live/ (props changed)
gump/live/python/gump/actor/mvnrepoproxy/proxycontrol.py
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 Mon Jul 5 04:01:16 2010
@@ -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
+/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
Modified: gump/live/python/gump/actor/mvnrepoproxy/proxycontrol.py
URL: http://svn.apache.org/viewvc/gump/live/python/gump/actor/mvnrepoproxy/proxycontrol.py?rev=960434&r1=960433&r2=960434&view=diff
==============================================================================
--- gump/live/python/gump/actor/mvnrepoproxy/proxycontrol.py (original)
+++ gump/live/python/gump/actor/mvnrepoproxy/proxycontrol.py Mon Jul 5 04:01:16 2010
@@ -21,8 +21,7 @@ import time
import urllib
from gump import log
-from gump.core.model.output import OUTPUT_BOOTCLASSPATH_JAR, OUTPUT_JAR, \
- OUTPUT_POM
+from gump.core.model.output import OUTPUT_POM
from gump.core.run.actor import AbstractRunActor, FinalizeRunEvent, \
InitializeRunEvent
@@ -46,9 +45,7 @@ class MvnRepositoryProxyController(Abstr
if project.okToPerformWork() and project.hasOutputs():
groupId = project.getArtifactGroup()
for output in project.getOutputs():
- if output.getType() == OUTPUT_JAR \
- or output.getType() == OUTPUT_BOOTCLASSPATH_JAR \
- or output.getType() == OUTPUT_POM:
+ if output.is_jar() or output.getType() == OUTPUT_POM:
fileName = os.path.abspath(output.getPath())
try:
log.info('Publishing \'%s\' output \'%s\' to proxy'
Modified: gump/live/python/gump/core/model/output.py
URL: http://svn.apache.org/viewvc/gump/live/python/gump/core/model/output.py?rev=960434&r1=960433&r2=960434&view=diff
==============================================================================
--- gump/live/python/gump/core/model/output.py (original)
+++ gump/live/python/gump/core/model/output.py Mon Jul 5 04:01:16 2010
@@ -27,6 +27,7 @@ OUTPUT_HOMEDIR = 'home'
OUTPUT_JAR = 'jar'
OUTPUT_LICENSE = 'license'
OUTPUT_POM = 'pom'
+OUTPUT_TESTS_JAR = 'testsjar'
# represents an <output/> element
class Output(NamedModelObject):
@@ -67,3 +68,9 @@ class Output(NamedModelObject):
def setType(self, t):
""" optional type of output """
self.type = t
+
+ def is_jar(self):
+ """ is this some sort of jar output? """
+ return self.type in [OUTPUT_BOOTCLASSPATH_JAR, \
+ OUTPUT_JAR, \
+ OUTPUT_TESTS_JAR]
Propchange: gump/live/python/gump/core/update/bzr.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 5 04:01:16 2010
@@ -1 +1 @@
-/gump/trunk/python/gump/core/update/bzr.py:815848,953630-954169,955387,955837,956771,957107,957408,958453,958915
+/gump/trunk/python/gump/core/update/bzr.py:815848,953630-954169,955387,955837,956771,957107,957408,958453,958915,959344,959847
Propchange: gump/live/python/gump/core/update/darcs.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 5 04:01:16 2010
@@ -1 +1 @@
-/gump/trunk/python/gump/core/update/darcs.py:815848,953630-954169,955387,955837,956771,957107,957408,958453,958915
+/gump/trunk/python/gump/core/update/darcs.py:815848,953630-954169,955387,955837,956771,957107,957408,958453,958915,959344,959847
Propchange: gump/live/python/gump/core/update/hg.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 5 04:01:16 2010
@@ -1 +1 @@
-/gump/trunk/python/gump/core/update/hg.py:815848,953630-954169,955387,955837,956771,957107,957408,958453,958915
+/gump/trunk/python/gump/core/update/hg.py:815848,953630-954169,955387,955837,956771,957107,957408,958453,958915,959344,959847