svn commit: r962401 - /gump/trunk/python/gump/core/language/java.py

[bo...@apache.org]

Author: bodewig
Date: Fri Jul  9 04:33:10 2010
New Revision: 962401

URL: http://svn.apache.org/viewvc?rev=962401&view=rev
Log:
only add jar type outputs to CLASSPATH

Modified:
    gump/trunk/python/gump/core/language/java.py

Modified: gump/trunk/python/gump/core/language/java.py
URL: http://svn.apache.org/viewvc/gump/trunk/python/gump/core/language/java.py?rev=962401&r1=962400&r2=962401&view=diff
==============================================================================
--- gump/trunk/python/gump/core/language/java.py (original)
+++ gump/trunk/python/gump/core/language/java.py Fri Jul  9 04:33:10 2010
@@ -33,6 +33,7 @@ import gump.util.process.command
 import gump.core.model.depend
 
 from gump.core.language.path import AnnotatedPath, Classpath
+from gump.core.model.output import OUTPUT_BOOTCLASSPATH_JAR
 
 ###############################################################################
 # Classes
@@ -210,7 +211,7 @@ class JavaHelper(gump.core.run.gumprun.R
         # from the repository. [This has been done already, 
         # so is transparent here.]
         projectIds = []
-        for jar in project.getOutputs():
+        for jar in [o for o in project.getOutputs() if o.is_jar()]:
             # Store for double checking
             if jar.getId():
                 projectIds.append(jar.getId())
@@ -223,7 +224,7 @@ class JavaHelper(gump.core.run.gumprun.R
                                      dependency.getOwnerProject(), dependStr) 
 
                 # Add to CLASSPATH
-                if not jar.getType() == 'boot':
+                if not jar.getType() == OUTPUT_BOOTCLASSPATH_JAR:
                     if debug:
                         print str(depth) + ') Append JAR : ' + str(path)
                     classpath.addPathPart(path)