gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r961870 - in /gump/trunk/python/gump: core/build/maven.py test/maven.py
Date Thu, 08 Jul 2010 18:35:27 GMT
Author: bodewig
Date: Thu Jul  8 18:35:27 2010
New Revision: 961870

URL: http://svn.apache.org/viewvc?rev=961870&view=rev
Log:
Maven 1.x doesn't use CLASSPATH either

Modified:
    gump/trunk/python/gump/core/build/maven.py
    gump/trunk/python/gump/test/maven.py

Modified: gump/trunk/python/gump/core/build/maven.py
URL: http://svn.apache.org/viewvc/gump/trunk/python/gump/core/build/maven.py?rev=961870&r1=961869&r2=961870&view=diff
==============================================================================
--- gump/trunk/python/gump/core/build/maven.py (original)
+++ gump/trunk/python/gump/core/build/maven.py Thu Jul  8 18:35:27 2010
@@ -41,7 +41,7 @@ from gump.util.tools import catFileToFil
 #
 # Build an Maven command for this project
 #
-def getMavenCommand(project, languageHelper):
+def getMavenCommand(project):
     maven = project.maven
 
     # The maven goal (or none == maven default goal)
@@ -56,30 +56,9 @@ def getMavenCommand(project, languageHel
     #
     basedir = maven.getBaseDirectory() or project.getBaseDirectory()
 
-    #
-    # Build a classpath (based upon dependencies)
-    #
-    (classpath, _bootclasspath) = languageHelper.getClasspaths(project)
-
     # Run Maven...
     cmd = Cmd('maven', 'build_' + project.getModule().getName() + '_' + \
-                  project.getName(), basedir, {'CLASSPATH':classpath})
-
-    # Set this as a system property. Setting it here helps JDK1.4 + 
-    # AWT implementations cope w/o an X11 server running (e.g. on
-    # Linux)
-    # cmd.addPrefixedParameter('-D', 'java.awt.headless', 'true', ' = ')
-
-    #
-    # Add BOOTCLASSPATH
-    #
-    #if bootclasspath:
-    #    cmd.addPrefixedParameter('-X', 'bootclasspath/p', bootclasspath, ':')
-
-    #if jvmargs:
-    #    cmd.addParameters(jvmargs)
-
-    # cmd.addParameter('org.apache.maven.cli.App')
+                  project.getName(), basedir)
 
     #
     # Allow maven-level debugging...
@@ -95,11 +74,6 @@ def getMavenCommand(project, languageHel
     #
     cmd.addParameter('--offline')
 
-    #
-    #       This sets the *defaults*, a workspace could override them.
-    #
-    #cmd.addPrefixedParameter('-D', 'build.sysclasspath', 'only', ' = ')
-
     # End with the goal...
     if goal: 
         for goalParam in goal.split(', '):
@@ -223,7 +197,7 @@ class MavenBuilder(RunSpecific):
             #
             # Get the appropriate build command...
             #
-            cmd = getMavenCommand(project, languageHelper)
+            cmd = getMavenCommand(project)
 
             if cmd:
                 # Execute the command ....
@@ -280,7 +254,7 @@ class MavenBuilder(RunSpecific):
                 project.addError(message)
                 project.changeState(STATE_FAILED, REASON_PREBUILD_FAILED)
  
-    def preview(self, project, languageHelper, _stats):
-        cmd = getMavenCommand(project, languageHelper) 
+    def preview(self, project, _languageHelper, _stats):
+        cmd = getMavenCommand(project) 
         cmd.dump()
 

Modified: gump/trunk/python/gump/test/maven.py
URL: http://svn.apache.org/viewvc/gump/trunk/python/gump/test/maven.py?rev=961870&r1=961869&r2=961870&view=diff
==============================================================================
--- gump/trunk/python/gump/test/maven.py (original)
+++ gump/trunk/python/gump/test/maven.py Thu Jul  8 18:35:27 2010
@@ -67,7 +67,7 @@ class MavenTestSuite(UnitTestSuite):
     def testMavenCommand(self):                
         self.assertTrue('Maven project has a Maven object', self.maven1.hasMaven())     
  
   
-        cmd = getMavenCommand(self.maven1,self.javaHelper)
+        cmd = getMavenCommand(self.maven1)
         
         # cmd.dump()
         



Mime
View raw message