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 2004/12/03 15:55:20 UTC

svn commit: r109680 - /gump/trunk/python/gump/core/model/project.py

Author: bodewig
Date: Fri Dec  3 06:55:19 2004
New Revision: 109680

URL: http://svn.apache.org/viewcvs?view=rev&rev=109680
Log:
Try to fix <jvmargs> - they currently get ignored since they are
searched as chlidren of <project> instead of <ant> or <maven>.

Modified:
   gump/trunk/python/gump/core/model/project.py

Modified: gump/trunk/python/gump/core/model/project.py
Url: http://svn.apache.org/viewcvs/gump/trunk/python/gump/core/model/project.py?view=diff&rev=109680&p1=gump/trunk/python/gump/core/model/project.py&r1=109679&p2=gump/trunk/python/gump/core/model/project.py&r2=109680
==============================================================================
--- gump/trunk/python/gump/core/model/project.py	(original)
+++ gump/trunk/python/gump/core/model/project.py	Fri Dec  3 06:55:19 2004
@@ -573,12 +573,12 @@
         if self.hasDomChild('description'):
             self.desc=self.getDomChildValue('description')   
     
-        for jvmarg in self.getDomChildIterator('jvmarg'):
-            if hasDomAttribute(jvmarg,'value'):                
-                self.jvmargs.addParameter(getDomAttributeValue(jvmarg,'value'))
-            else:
-                log.error('Bogus JVM Argument w/ Value')            
-            
+        if self.ant:
+            self.addJVMArgs(self.getDomChild("ant"))
+
+        if self.maven:
+            self.addJVMArgs(self.getDomChild("maven"))
+
         #
         # complete properties
         #
@@ -633,6 +633,14 @@
         
         # Done, don't redo
         self.setComplete(True)
+
+    # turn the <jvmarg> children of domchild into jvmargs
+    def addJVMArgs(self,domChild):        
+        for jvmarg in domChild.getDomChildIterator('jvmarg'):
+            if hasDomAttribute(jvmarg, 'value'):                
+                self.jvmargs.addParameter(getDomAttributeValue(jvmarg, 'value'))
+            else:
+                log.error('Bogus JVM Argument w/ Value')
 
     def importDependencies(self,workspace):        
         badDepends=[]