Return-Path: Delivered-To: apmail-gump-commits-archive@www.apache.org Received: (qmail 45340 invoked from network); 6 Dec 2004 08:07:37 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 6 Dec 2004 08:07:37 -0000 Received: (qmail 48880 invoked by uid 500); 6 Dec 2004 08:07:18 -0000 Mailing-List: contact commits-help@gump.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@gump.apache.org Delivered-To: mailing list commits@gump.apache.org Received: (qmail 48636 invoked by uid 99); 6 Dec 2004 08:07:16 -0000 X-ASF-Spam-Status: No, hits=-10.0 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Mon, 06 Dec 2004 00:07:15 -0800 Received: (qmail 45099 invoked by uid 65534); 6 Dec 2004 08:07:13 -0000 Date: 6 Dec 2004 08:07:13 -0000 Message-ID: <20041206080713.45094.qmail@minotaur.apache.org> From: bodewig@apache.org To: commits@gump.apache.org Subject: svn commit: r109960 - /gump/live/python/gump/core/model/project.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N 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 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 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=[]