gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r109960 - /gump/live/python/gump/core/model/project.py
Date Mon, 06 Dec 2004 08:07:13 GMT
Author: bodewig
Date: Mon Dec  6 00:07:13 2004
New Revision: 109960

URL: http://svn.apache.org/viewcvs?view=rev&rev=109960
Log:
Merge rev 109732 from trunk, make <jvmarg> work
Modified:
   gump/live/python/gump/core/model/project.py

Modified: gump/live/python/gump/core/model/project.py
Url: http://svn.apache.org/viewcvs/gump/live/python/gump/core/model/project.py?view=diff&rev=109960&p1=gump/live/python/gump/core/model/project.py&r1=109959&p2=gump/live/python/gump/core/model/project.py&r2=109960
==============================================================================
--- gump/live/python/gump/core/model/project.py	(original)
+++ gump/live/python/gump/core/model/project.py	Mon Dec  6 00:07:13 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 getDomChildIterator(domChild,'jvmarg'):
+            if hasDomAttribute(jvmarg, 'value'):                
+                self.jvmargs.addParameter(getDomAttributeValue(jvmarg, 'value'))
+            else:
+                log.error('Bogus JVM Argument w/ Value')
 
     def importDependencies(self,workspace):        
         badDepends=[]

Mime
View raw message