Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 60694 invoked from network); 15 Feb 2007 02:06:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 15 Feb 2007 02:06:31 -0000 Received: (qmail 95299 invoked by uid 500); 15 Feb 2007 02:06:38 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 95237 invoked by uid 500); 15 Feb 2007 02:06:38 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 95101 invoked by uid 99); 15 Feb 2007 02:06:38 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Feb 2007 18:06:37 -0800 X-ASF-Spam-Status: No, hits=-8.6 required=10.0 tests=ALL_TRUSTED,INFO_TLD,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Feb 2007 18:06:28 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id D8F9A1A981A; Wed, 14 Feb 2007 18:06:08 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r507776 - in /geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild: config/projects/Geronimo_CTS/Controller.groovy config/projects/Geronimo_CTS/Geronimo12Collector.groovy system/commands/MavenCommand.groovy Date: Thu, 15 Feb 2007 02:06:08 -0000 To: scm@geronimo.apache.org From: jdillon@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070215020608.D8F9A1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jdillon Date: Wed Feb 14 18:06:08 2007 New Revision: 507776 URL: http://svn.apache.org/viewvc?view=rev&rev=507776 Log: Move collection bits to Geronimo12Collector so the controller is less noisy Use long opts for runtests for clarity Added: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Geronimo12Collector.groovy (with props) Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Controller.groovy geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/commands/MavenCommand.groovy Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Controller.groovy URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Controller.groovy?view=diff&rev=507776&r1=507775&r2=507776 ============================================================================== --- geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Controller.groovy (original) +++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Controller.groovy Wed Feb 14 18:06:08 2007 @@ -104,73 +104,10 @@ // Collect the repository ant.mkdir(dir: "$targetDir/repository") - // Determine the set of artifacts based on the workflow since this will differer from version to version :-( + // Determine the set of artifacts based on the workflow since this will differ from version to version :-( switch (params.require('anthill.workflow')) { case 'build 1.2': - ant.copy(todir: "$targetDir/repository") { - fileset(dir: "$sourceDir/repository") { - include(name: 'activeio/**') - include(name: 'ant/**') - include(name: 'axis/**') - include(name: 'avalon-framework/**') - include(name: 'backport-util-concurrent/**') - include(name: 'commons-discovery/**') - include(name: 'commons-logging/**') - include(name: 'commons-jexl/**') - include(name: 'commons-lang/**') - include(name: 'cglib/**') - include(name: 'classworlds/**') - include(name: 'groovy/**') - include(name: 'oro/**') - include(name: 'mx4j/**') - include(name: 'plexus/**') - include(name: 'ognl/**') - include(name: 'stax/**') - include(name: 'regexp/**') - include(name: 'logkit/**') - include(name: 'log4j/**') - include(name: 'mockobjects/**') - include(name: 'javax/**') - include(name: 'junit/**') - include(name: 'jline/**') - include(name: 'org/objectweb/howl/**') - include(name: 'org/codehaus/plexus/**') - include(name: 'org/apache/geronimo/cts/**') - include(name: 'org/apache/geronimo/plugins/**') - include(name: 'org/apache/geronimo/geronimo/**') - include(name: 'org/apache/geronimo/specs/**') - include(name: 'org/apache/geronimo/genesis/**') - include(name: 'org/apache/geronimo/modules/geronimo-j2ee/**') - include(name: 'org/apache/geronimo/modules/geronimo-activemq-gbean/**') - include(name: 'org/apache/geronimo/modules/geronimo-naming/**') - include(name: 'org/apache/geronimo/modules/geronimo-management/**') - include(name: 'org/apache/geronimo/modules/geronimo-transaction/**') - include(name: 'org/apache/geronimo/modules/geronimo-security/**') - include(name: 'org/apache/geronimo/modules/geronimo-kernel/**') - include(name: 'org/apache/geronimo/modules/geronimo-activemq-gbean-management/**') - include(name: 'org/apache/geronimo/modules/geronimo-connector/**') - include(name: 'org/apache/geronimo/modules/geronimo-system/**') - include(name: 'org/apache/geronimo/modules/geronimo-common/**') - include(name: 'org/apache/geronimo/modules/geronimo-util/**') - include(name: 'org/apache/geronimo/modules/geronimo-deploy-jsr88/**') - include(name: 'org/apache/geronimo/modules/geronimo-deploy-config/**') - include(name: 'org/apache/geronimo/modules/geronimo-deployment/**') - include(name: 'org/apache/geronimo/modules/geronimo-interceptor/**') - include(name: 'org/apache/geronimo/modules/geronimo-core/**') - include(name: 'org/apache/geronimo/modules/modules/**') - include(name: 'org/apache/activemq/**') - include(name: 'org/apache/maven/**') - include(name: 'org/apache/xbean/**') - include(name: 'org/apache/apache/**') - include(name: 'com/sun/j2eetck/**') - include(name: 'com/jcraft/jsch/**') - include(name: 'velocity/**') - include(name: 'xstream/**') - include(name: 'xmlbeans/**') - include(name: 'xpp3/**') - include(name: 'xml-resolver/**') - } - } + Geronimo12Collector.collect(ant, sourceDir, targetDir) break case 'build 2.0': @@ -194,8 +131,6 @@ } def runtests = { - def targetDir = new File('target').canonicalFile - // // TODO: Need to handle differnt libs for different version of the CTS project // @@ -233,7 +168,7 @@ // /* - args << '-jv' + args << '--java-version' switch (params.require('anthill.workflow')) { case 'build 1.2': args << 1.4 @@ -245,9 +180,13 @@ } */ - args << '-w' + args << '--web' args << params.require('webcontainer') + // + // TODO: See bits about using settings.xml for this, as this propery is deprecated + // + def repoDir = new File('repository').canonicalFile args << "-Dmaven.repo.local=$repoDir" @@ -265,7 +204,8 @@ args << params.require('tests') // Before we execute, save the parameters used to execute runtests - ant.mkdir(dir: targetDir) + def targetDir = new File('target').canonicalFile + targetDir.mkdirs() params.store("$targetDir/runtests.properties") exec.execute(args) Added: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Geronimo12Collector.groovy URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Geronimo12Collector.groovy?view=auto&rev=507776 ============================================================================== --- geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Geronimo12Collector.groovy (added) +++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Geronimo12Collector.groovy Wed Feb 14 18:06:08 2007 @@ -0,0 +1,101 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +// +// $Id$ +// + +package gbuild.config.projects.Geronimo_CTS + +/** + * ??? + */ +class Geronimo12Collector +{ + static def collect(ant, sourceDir, targetDir) { + assert ant + assert sourceDir + assert targetDir + + ant.copy(todir: "$targetDir/repository") { + fileset(dir: "$sourceDir/repository") { + include(name: 'activeio/**') + include(name: 'ant/**') + include(name: 'axis/**') + include(name: 'avalon-framework/**') + include(name: 'backport-util-concurrent/**') + include(name: 'commons-discovery/**') + include(name: 'commons-logging/**') + include(name: 'commons-jexl/**') + include(name: 'commons-lang/**') + include(name: 'cglib/**') + include(name: 'classworlds/**') + include(name: 'groovy/**') + include(name: 'oro/**') + include(name: 'mx4j/**') + include(name: 'plexus/**') + include(name: 'ognl/**') + include(name: 'stax/**') + include(name: 'regexp/**') + include(name: 'logkit/**') + include(name: 'log4j/**') + include(name: 'mockobjects/**') + include(name: 'javax/**') + include(name: 'junit/**') + include(name: 'jline/**') + include(name: 'org/objectweb/howl/**') + include(name: 'org/codehaus/plexus/**') + include(name: 'org/apache/geronimo/cts/**') + include(name: 'org/apache/geronimo/plugins/**') + include(name: 'org/apache/geronimo/geronimo/**') + include(name: 'org/apache/geronimo/specs/**') + include(name: 'org/apache/geronimo/genesis/**') + include(name: 'org/apache/geronimo/modules/geronimo-j2ee/**') + include(name: 'org/apache/geronimo/modules/geronimo-activemq-gbean/**') + include(name: 'org/apache/geronimo/modules/geronimo-naming/**') + include(name: 'org/apache/geronimo/modules/geronimo-management/**') + include(name: 'org/apache/geronimo/modules/geronimo-transaction/**') + include(name: 'org/apache/geronimo/modules/geronimo-security/**') + include(name: 'org/apache/geronimo/modules/geronimo-kernel/**') + include(name: 'org/apache/geronimo/modules/geronimo-activemq-gbean-management/**') + include(name: 'org/apache/geronimo/modules/geronimo-connector/**') + include(name: 'org/apache/geronimo/modules/geronimo-system/**') + include(name: 'org/apache/geronimo/modules/geronimo-common/**') + include(name: 'org/apache/geronimo/modules/geronimo-util/**') + include(name: 'org/apache/geronimo/modules/geronimo-deploy-jsr88/**') + include(name: 'org/apache/geronimo/modules/geronimo-deploy-config/**') + include(name: 'org/apache/geronimo/modules/geronimo-deployment/**') + include(name: 'org/apache/geronimo/modules/geronimo-interceptor/**') + include(name: 'org/apache/geronimo/modules/geronimo-core/**') + include(name: 'org/apache/geronimo/modules/modules/**') + include(name: 'org/apache/activemq/**') + include(name: 'org/apache/maven/**') + include(name: 'org/apache/xbean/**') + include(name: 'org/apache/apache/**') + include(name: 'com/sun/j2eetck/**') + include(name: 'com/jcraft/jsch/**') + include(name: 'velocity/**') + include(name: 'xstream/**') + include(name: 'xmlbeans/**') + include(name: 'xpp3/**') + include(name: 'xml-resolver/**') + } + } + } +} Propchange: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Geronimo12Collector.groovy ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Geronimo12Collector.groovy ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision HeadURL Propchange: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Geronimo12Collector.groovy ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/commands/MavenCommand.groovy URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/commands/MavenCommand.groovy?view=diff&rev=507776&r1=507775&r2=507776 ============================================================================== --- geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/commands/MavenCommand.groovy (original) +++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/commands/MavenCommand.groovy Wed Feb 14 18:06:08 2007 @@ -79,6 +79,10 @@ log.info "Repository: $repoDir" // + // TODO: Hookup GProxy support + // + + // // TODO: Need to generate a settings.xml and set -Dorg.apache.maven.global-settings // to point to it, -Dmaven.repo.local is deprecated :-( //