[Jpackage-commits] dist/groovy15/JPP-6 Makefile, NONE, 1.1 groovy-1.5-jpp-depmap.xml, NONE, 1.1 groovy-all-1.5.8.pom, NONE, 1.1 groovy-all-minimal-1.5.8.pom, NONE, 1.1 groovy15-build-maven.patch, NONE, 1.1 groovy15-build.patch, NONE, 1.1 groovy15-settings.xml, NONE, 1.1 groovy15.spec, NONE, 1.1 sources, NONE, 1.1

jpackage jpackage at ryu.zarb.org
Wed Dec 15 22:45:05 CET 2010


Update of /home/projects/jpackage/cvs/dist/groovy15/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv5589/JPP-6

Added Files:
	Makefile groovy-1.5-jpp-depmap.xml groovy-all-1.5.8.pom 
	groovy-all-minimal-1.5.8.pom groovy15-build-maven.patch 
	groovy15-build.patch groovy15-settings.xml groovy15.spec 
	sources 
Log Message:
Import groovy15 into JPP-6

--- NEW FILE: groovy-all-1.5.8.pom ---
<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

    <modelVersion>4.0.0</modelVersion>
    
    <groupId>org.codehaus.groovy</groupId>
    <artifactId>groovy-all</artifactId>
    <name>Groovy</name>
    <packaging>jar</packaging>
    
    <version>1.5.8</version>
    
    <description>
        Groovy: A powerful, dynamic language for the JVM
    </description>
    
    <url>http://groovy.codehaus.org/</url>
    
    <organization>
        <name>The Codehaus</name>
        <url>http://codehaus.org</url>
    </organization>
    
    <inceptionYear>2003</inceptionYear>
    
    <scm>
        <connection>scm:svn:http://svn.groovy.codehaus.org/browse/groovy/trunk/groovy/groovy-core</connection>
        <developerConnection>scm:svn:https://${maven.username}@svn.groovy.codehaus.org/browse/groovy/trunk/groovy/groovy-core</developerConnection>
        <url>http://svn.groovy.codehaus.org/browse/groovy/trunk/groovy/groovy-core</url>
    </scm>

    <mailingLists>
        <mailingList>
            <name>Groovy JSR Discussion List</name>
            <archive>http://dir.gmane.org/gmane.comp.lang.groovy.jsr</archive>
        </mailingList>
        <mailingList>
            <name>Groovy Developer List</name>
            <archive>http://dir.gmane.org/gmane.comp.lang.groovy.devel</archive>
        </mailingList>
        <mailingList>
            <name>Groovy User List</name>
            <archive>http://dir.gmane.org/gmane.comp.lang.groovy.user</archive>
        </mailingList>
    </mailingLists>

    <distributionManagement>
        <repository>
            <id>codehaus.org</id>
            <name>Groovy Central Repository</name>
            <url>dav:https://dav.codehaus.org/repository/groovy/</url>
        </repository>
        <snapshotRepository>
            <id>codehaus.org</id>
            <name>Groovy Central Development Repository</name>
            <url>dav:https://dav.codehaus.org/snapshots.repository/groovy/</url>
        </snapshotRepository>
        <!-- not currently used -->
        <site>
            <id>codehaus.org</id>
            <name>Groovy Web Site</name>
            <url>dav:https://dav.codehaus.org/groovy</url>
        </site>
    </distributionManagement>

    <developers>
        <developer>
            <name>Guillaume Laforge</name>
            <id>glaforge</id>
            <email/>
            <organization>G2One</organization>
            <roles>
                <role>Project Manager</role>
                <role>Developer</role>
            </roles>
        </developer>
        <developer>
            <name>bob mcwhirter</name>
            <id>bob</id>
            <email>bob at werken.com</email>
            <organization>The Werken Company</organization>
            <roles>
                <role>Founder</role>
            </roles>
        </developer>
        <developer>
            <name>James Strachan</name>
            <id>jstrachan</id>
            <email>james at coredevelopers.com</email>
            <organization>Core Developers Network</organization>
            <roles>
                <role>Founder</role>
            </roles>
        </developer>
        <developer>
            <name>Joe Walnes</name>
            <id>joe</id>
            <email/>
            <organization>ThoughtWorks</organization>
            <roles>
                <role>Developer Emeritus</role>
            </roles>
        </developer>
        <developer>
            <name>Chris Stevenson</name>
            <id>skizz</id>
            <email/>
            <organization>ThoughtWorks</organization>
            <roles>
                <role>Developer Emeritus</role>
            </roles>
        </developer>
        <developer>
            <name>Jamie McCrindle</name>
            <id>jamiemc</id>
            <email/>
            <organization>Three</organization>
            <roles>
                <role>Developer Emeritus</role>
            </roles>
        </developer>
        <developer>
            <name>Matt Foemmel</name>
            <id>mattf</id>
            <email/>
            <organization>ThoughtWorks</organization>
            <roles>
                <role>Developer Emeritus</role>
            </roles>
        </developer>
        <developer>
            <name>Sam Pullara</name>
            <id>spullara</id>
            <email>sam at sampullara.com</email>
            <organization/>
            <roles>
                <role>Developer Emeritus</role>
            </roles>
        </developer>
        <developer>
            <name>Kasper Nielsen</name>
            <id>kasper</id>
            <email/>
            <organization/>
            <roles>
                <role>Developer Emeritus</role>
            </roles>
        </developer>
        <developer>
            <name>Travis Kay</name>
            <id>travis</id>
            <email/>
            <organization/>
            <roles>
                <role>Developer Emeritus</role>
            </roles>
        </developer>
        <developer>
            <name>Zohar Melamed</name>
            <id>zohar</id>
            <email/>
            <organization/>
            <roles>
                <role>Developer Emeritus</role>
            </roles>
        </developer>
        <developer>
            <name>John Wilson</name>
            <id>jwilson</id>
            <email>tug at wilson.co.uk</email>
            <organization>The Wilson Partnership</organization>
            <roles>
                <role>Developer Emeritus</role>
            </roles>
        </developer>
        <developer>
            <name>Chris Poirier</name>
            <id>cpoirier</id>
            <email>cpoirier at dreaming.org</email>
            <organization/>
            <roles>
                <role>Developer Emeritus</role>
            </roles>
        </developer>
        <developer>
            <name>Christiaan ten Klooster</name>
            <id>ckl</id>
            <email>ckl at dacelo.nl</email>
            <organization>Dacelo WebDevelopment</organization>
            <roles>
                <role>Developer Emeritus</role>
            </roles>
        </developer>
        <developer>
            <name>Steve Goetze</name>
            <id>goetze</id>
            <email>goetze at dovetail.com</email>
            <organization>Dovetailed Technologies, LLC</organization>
            <roles>
                <role>Developer Emeritus</role>
            </roles>
        </developer>
        <developer>
            <name>Bing Ran</name>
            <id>bran</id>
            <email>b55r at sina.com</email>
            <organization>Leadingcare</organization>
            <roles>
                <role>Developer Emeritus</role>
            </roles>
        </developer>
        <developer>
            <name>Jeremy Rayner</name>
            <id>jez</id>
            <email>jeremy.rayner at gmail.com</email>
            <organization>javanicus</organization>
            <roles>
                <role>Developer</role>
            </roles>
        </developer>
        <developer>
            <name>John Stump</name>
            <id>jstump</id>
            <email>johnstump2 at yahoo.com</email>
            <organization/>
            <roles>
                <role>Developer Emeritus</role>
            </roles>
        </developer>
        <developer>
            <name>Jochen Theodorou</name>
            <id>blackdrag</id>
            <email>blackdrag at gmx.org</email>
            <organization/>
            <roles>
                <role>Developer</role>
            </roles>
        </developer>
        <developer>
            <name>Russel Winder</name>
            <id>russel</id>
            <email>russel at russel.org.uk</email>
            <organization>Concertant LLP & It'z Interactive Ltd</organization>
            <roles>
                <role>Developer</role>
                <role>Founder of Gant</role>
            </roles>
        </developer>
        <developer>
            <name>Pilho Kim</name>
            <id>phk</id>
            <email>phkim at cluecom.co.kr</email>
            <organization/>
            <roles>
                <role>Developer Emeritus</role>
            </roles>
        </developer>
        <developer>
            <name>Christian Stein</name>
            <id>cstein</id>
            <email>sormuras at gmx.de</email>
            <organization>CTSR.de</organization>
            <roles>
                <role>Developer Emeritus</role>
            </roles>
        </developer>
        <developer>
            <name>Dierk Koenig</name>
            <id>mittie</id>
            <email>dierk.koenig at canoo.com</email>
            <organization>Canoo Engineering AG</organization>
            <roles>
                <role>Developer</role>
            </roles>
        </developer>
        <developer>
            <name>Paul King</name>
            <id>paulk</id>
            <email>paulk at asert.com.au</email>
            <organization>ASERT, Australia</organization>
            <roles>
                <role>Developer</role>
            </roles>
        </developer>
        <developer>
            <name>Guillaume Alleon</name>
            <id>galleon</id>
            <email>guillaume.alleon at gmail.com</email>
            <organization/>
            <roles>
                <role>Developer</role>
            </roles>
        </developer>
        <developer>
            <name>Jason Dillon</name>
            <id>user57</id>
            <email>jason at planet57.com</email>
            <organization/>
            <roles>
                <role>Developer</role>
            </roles>
        </developer>
        <developer>
            <name>Danno Ferrin</name>
            <id>shemnon</id>
            <email/>
            <organization/>
            <roles>
                <role>Developer</role>
            </roles>
        </developer>
        <developer>
            <name>James Williams</name>
            <id>jwill</id>
            <email/>
            <organization/>
            <roles>
                <role>Developer</role>
            </roles>
        </developer>
        <developer>
            <name>Andres Almiray</name>
            <id>aalmiray</id>
            <email>aalmiray at users.sourceforge.net</email>
            <organization/>
            <roles>
                <role>Developer</role>
            </roles>
        </developer>
        <developer>
            <name>Marc Guillemot</name>
            <id>mguillem</id>
            <email>mguillemot at yahoo.fr</email>
            <organization/>
            <roles>
                <role>Developer</role>
            </roles>
        </developer>
    </developers>

    <contributors>
        <contributor>
            <name>Joern Eyrich</name>
            <email/>
        </contributor>
        <contributor>
            <name>Robert Kuzelj</name>
            <email/>
        </contributor>
        <contributor>
            <name>Rod Cope</name>
            <email/>
        </contributor>
        <contributor>
            <name>Yuri Schimke</name>
            <email/>
        </contributor>
        <contributor>
            <name>James Birchfield</name>
            <email/>
        </contributor>
        <contributor>
            <name>Robert Fuller</name>
            <email/>
        </contributor>
        <contributor>
            <name>Sergey Udovenko</name>
            <email/>
        </contributor>
        <contributor>
            <name>Hallvard Traetteberg</name>
            <email/>
        </contributor>
        <contributor>
            <name>Peter Reilly</name>
            <email/>
        </contributor>
        <contributor>
            <name>Brian McCallister</name>
            <email/>
        </contributor>
        <contributor>
            <name>Richard Monson-Haefel</name>
            <email/>
        </contributor>
        <contributor>
            <name>Brian Larson</name>
            <email/>
        </contributor>
        <contributor>
            <name>Artur Biesiadowski</name>
            <email>abies at pg.gda.pl</email>
        </contributor>
        <contributor>
            <name>Ivan Z. Ganza</name>
            <email/>
        </contributor>
        <contributor>
            <name>Arjun Nayyar</name>
            <email/>
        </contributor>
        <contributor>
            <name>Mark Chu-Carroll</name>
            <email/>
        </contributor>
        <contributor>
            <name>Mark Turansky</name>
            <email/>
        </contributor>
        <contributor>
            <name>Jean-Louis Berliet</name>
            <email/>
        </contributor>
        <contributor>
            <name>Graham Miller</name>
            <email/>
        </contributor>
        <contributor>
            <name>Marc Palmer</name>
            <email/>
        </contributor>
        <contributor>
            <name>Tugdual Grall</name>
            <email/>
        </contributor>
        <contributor>
            <name>Edwin Tellman</name>
            <email/>
        </contributor>
        <contributor>
            <name>Evan A Slatis</name>
            <email/>
        </contributor>
        <contributor>
            <name>Hamlet D'Arcy</name>
            <email/>
        </contributor>
        <contributor>
            <name>Mike Dillon</name>
            <email/>
        </contributor>
        <contributor>
            <name>Bernhard Huber</name>
            <email/>
        </contributor>
    </contributors>

    <dependencies>

        <!-- core dependencies -->
        
        
        <dependency>
            <groupId>junit</groupId>
            <artifactId>junit</artifactId>
            <version>3.8.2</version>
            <scope>compile</scope>
        </dependency>

        <!-- dependencies used by optional features -->

        <!-- only used for command line tools (and CliBuilder) -->
        <dependency>
            <groupId>commons-cli</groupId>
            <artifactId>commons-cli</artifactId>
            <version>1.0</version>
            <scope>compile</scope>
            <optional>true</optional>
            <exclusions>
                <exclusion>
                    <groupId>commons-lang</groupId>
                    <artifactId>commons-lang</artifactId>
                </exclusion>
                <exclusion>
                    <groupId>commons-logging</groupId>
                    <artifactId>commons-logging</artifactId>
                </exclusion>
            </exclusions>
        </dependency>

        <!-- only used for Ant tasks & scripting tools -->
        <dependency>
            <groupId>org.apache.ant</groupId>
            <artifactId>ant</artifactId>
            <version>1.7.0</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>org.apache.ant</groupId>
            <artifactId>ant-junit</artifactId>
            <version>1.7.0</version>
            <scope>runtime</scope>
            <optional>true</optional>
        </dependency>
        <dependency>
            <groupId>org.apache.ant</groupId>
            <artifactId>ant-launcher</artifactId>
            <version>1.7.0</version>
            <scope>runtime</scope>
        </dependency>

        <!-- only used for testing helper classes -->
        <dependency>
            <groupId>jmock</groupId>
            <artifactId>jmock</artifactId>
            <version>1.2.0</version>
            <scope>test</scope>
        </dependency>
        <dependency>
            <groupId>jmock</groupId>
            <artifactId>jmock-cglib</artifactId>
            <version>1.2.0</version>
            <scope>test</scope>
            <!-- exclude incompatible version of ASM -->
            <exclusions>
                <exclusion>
                    <groupId>cglib</groupId>
                    <artifactId>cglib-full</artifactId>
                </exclusion>
            </exclusions>
        </dependency>
        <dependency>
            <groupId>cglib</groupId>
            <artifactId>cglib-nodep</artifactId>
            <version>2.1_3</version>
            <scope>test</scope>
        </dependency>

        
        
        
        

        <!-- only used for BSF adapter-->

        <dependency>
            <groupId>bsf</groupId>
            <artifactId>bsf</artifactId>
            <version>2.4.0</version>
            <scope>compile</scope>
            <optional>true</optional>
            <exclusions>
                <exclusion>
                    <groupId>commons-logging</groupId>
                    <artifactId>commons-logging</artifactId>
                </exclusion>
            </exclusions>
        </dependency>
        <dependency>
            <groupId>commons-logging</groupId>
            <artifactId>commons-logging</artifactId>
            <version>1.1</version>
            <scope>runtime</scope>
            <optional>true</optional>
            <exclusions>
                <exclusion>
                    <groupId>log4j</groupId>
                    <artifactId>log4j</artifactId>
                </exclusion>
                <exclusion>
                    <groupId>logkit</groupId>
                    <artifactId>logkit</artifactId>
                </exclusion>
                <exclusion>
                    <groupId>avalon-framework</groupId>
                    <artifactId>avalon-framework</artifactId>
                </exclusion>
            </exclusions>
        </dependency>

        <!-- only used for JMX utilities -->
        <dependency>
            <groupId>mx4j</groupId>
            <artifactId>mx4j</artifactId>
            <version>3.0.2</version>
            <scope>compile</scope>
            <optional>true</optional>
        </dependency>

        <dependency>
            <groupId>mockobjects</groupId>
            <artifactId>mockobjects-core</artifactId>
            <version>0.09</version>
            <scope>compile</scope>
            <optional>true</optional>
        </dependency>

        <dependency>
            <groupId>xmlunit</groupId>
            <artifactId>xmlunit</artifactId>
            <version>1.1</version>
            <scope>test</scope>
        </dependency>

        <!-- used for SQL library -->
        <dependency>
            <groupId>hsqldb</groupId>
            <artifactId>hsqldb</artifactId>
            <version>1.8.0.7</version>
            <scope>test</scope>
        </dependency>

        <!-- used for servlet / gsp -->
        <dependency>
            <groupId>javax.servlet</groupId>
            <artifactId>servlet-api</artifactId>
            <version>2.4</version>
            <scope>compile</scope>
            <optional>true</optional>
        </dependency>
        <dependency>
            <groupId>javax.servlet</groupId>
            <artifactId>jsp-api</artifactId>
            <version>2.0</version>
            <scope>compile</scope>
            <optional>true</optional>
        </dependency>

        <!-- used to dump out the AST -->
        <dependency>
            <groupId>com.thoughtworks.xstream</groupId>
            <artifactId>xstream</artifactId>
            <version>1.2.2</version>
            <scope>compile</scope>
            <optional>true</optional>
        </dependency>
        
        <!-- Used for richer interactive groovysh support -->
        <dependency>
            <groupId>jline</groupId>
            <artifactId>jline</artifactId>
            <version>0.9.94</version>
            <scope>compile</scope>
        </dependency>
    </dependencies>
    
    <!--
    NOTE: The following build configuration is primarily intended to support
          generate of IDE configuration files.  Basic support to build is also
          included by invoking 'ant' to do the real work.
    -->
    
    <build>
        <sourceDirectory>src/main</sourceDirectory>
        <testSourceDirectory>src/test</testSourceDirectory>
        
        <defaultGoal>install</defaultGoal>
        
        <pluginManagement>
            <plugins>
                <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
                    <artifactId>maven-antrun-plugin</artifactId>
                    <version>1.1</version>
                </plugin>
                
                <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
                    <artifactId>maven-idea-plugin</artifactId>
                    <version>2.1</version>
                    <configuration>
                        <jdkName>1.4</jdkName>
                        <jdkLevel>1.4</jdkLevel>
                        <linkModules>true</linkModules>
                    </configuration>
                </plugin>
                
                <!--
                NOTE: Tell the compiler and surefire to not do anything, all handled by Ant.
                -->
                
                <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
                    <artifactId>maven-compiler-plugin</artifactId>
                    <version>2.0.2</version>
                    <configuration>
                        <excludes>
                            <exclude>**</exclude>
                        </excludes>
                        <skip>true</skip>
                    </configuration>
                </plugin>
                
                <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
                    <artifactId>maven-surefire-plugin</artifactId>
                    <version>2.3</version>
                    <configuration>
                        <skip>true</skip>
                    </configuration>
                </plugin>
            </plugins>
        </pluginManagement>
        
        <plugins>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-antrun-plugin</artifactId>
                <executions>
                    <execution>
                        <phase>install</phase>
                        <goals>
                            <goal>run</goal>
                        </goals>
                        <configuration>
                            <tasks>
                                <exec executable="ant" dir="${pom.basedir}">
                                    <arg value="installRepo"/>
                                </exec>
                            </tasks>
                        </configuration>
                    </execution>
                </executions>
            </plugin>
        </plugins>
    </build>
    
    <profiles>
        <profile>
            <id>idea</id>
            
            <build>
                <defaultGoal>validate</defaultGoal>
                
                <plugins>
                    <plugin>
                        <groupId>org.apache.maven.plugins</groupId>
                        <artifactId>maven-idea-plugin</artifactId>
                        <configuration>
                            <overwrite>true</overwrite>
                            <downloadSources>true</downloadSources>
                            <downloadJavadocs>true</downloadJavadocs>
                        </configuration>
                        <executions>
                            <execution>
                                <phase>validate</phase>
                                <goals>
                                    <goal>clean</goal>
                                    <goal>idea</goal>
                                </goals>
                            </execution>
                        </executions>
                    </plugin>
                </plugins>
            </build>
        </profile>
        
        <!--
        TODO: Add an eclipse profile to help folks that use that IDE setup configuration files ?
        -->
    </profiles>

</project>

--- NEW FILE: groovy15-build-maven.patch ---
--- config/ant/build-maven.xml.sav0	2008-10-04 06:51:21.000000000 +0200
+++ config/ant/build-maven.xml	2008-10-04 06:53:05.000000000 +0200
@@ -104,13 +104,17 @@
         <maven.remote.repository id="ibiblio.remote.repository" url="http://ibiblio.org/maven2/"/>
     </target>
 
+<!--
     <target name="-fetchDependencies" depends="-mavenFetchAllModules,-copyLibraries"/>
+-->
+    <target name="-fetchDependencies" depends="-copyLibraries"/>
 
     <target name="-mavenFetchAllModules" depends="-mavenInit">
         <fetch.maven.all.modules/>
     </target>
 
     <target name="-copyLibraries">
+<!--
         <delete dir="${compileLibDirectory}"/>
         <delete dir="${testLibDirectory}"/>
         <delete dir="${runtimeLibDirectory}"/>
@@ -122,39 +126,50 @@
         <mkdir dir="${runtimeLibDirectory}"/>
         <mkdir dir="${toolsLibDirectory}"/>
         <mkdir dir="${examplesLibDirectory}"/>
+-->
 
+<!--
         <copy todir="${compileLibDirectory}">
             <mapper type="flatten"/>
             <fileset refid="fs.compile.groovy"/>
         </copy>
+-->
         <path id="compilePath">
             <fileset dir="${compileLibDirectory}" includes="**/*.jar"/>
         </path>
+<!--
         <copy todir="${testLibDirectory}">
             <mapper type="flatten"/>
             <fileset refid="fs.test.groovy"/>
         </copy>
+-->
         <path id="testPath">
             <fileset dir="${testLibDirectory}" includes="**/*.jar"/>
         </path>
+<!--
         <copy todir="${runtimeLibDirectory}">
             <mapper type="flatten"/>
             <fileset refid="fs.runtime.groovy"/>
         </copy>
+-->
         <path id="runtimePath">
             <fileset dir="${runtimeLibDirectory}" includes="**/*.jar"/>
         </path>
+<!--
         <copy todir="${toolsLibDirectory}">
             <mapper type="flatten"/>
             <fileset refid="fs.runtime.groovy-tools"/>
         </copy>
+-->
         <path id="toolsPath">
             <fileset dir="${toolsLibDirectory}" includes="**/*.jar"/>
         </path>
+<!--
         <copy todir="${examplesLibDirectory}">
             <mapper type="flatten"/>
             <fileset refid="fs.runtime.groovy-examples"/>
         </copy>
+-->
         <path id="examplesPath">
             <fileset dir="${examplesLibDirectory}" includes="**/*.jar"/>
         </path>

--- NEW FILE: Makefile ---
# Makefile for source rpm: groovy15
# $Id: Makefile,v 1.1 2010/12/15 21:45:03 jpackage Exp $
NAME := groovy15
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)

--- NEW FILE: groovy15-settings.xml ---
<settings>
	<profiles>
		<profile>
			<id>JPP</id>
			<repositories>
				<repository>
					<id>internal</id>
					<layout>jpp</layout>
					<url>__JPP_URL_PLACEHOLDER__</url>
				</repository>
				<repository>
					<id>external</id>
					<layout>jpp</layout>
					<url>__JAVADIR_PLACEHOLDER__</url>
				</repository>
				<repository>
					<id>local</id>
					<layout>jpp</layout>
					<url>__MAVENREPO_DIR_PLACEHOLDER__</url>
				</repository>
			</repositories>
			<pluginRepositories>
				<pluginRepository>
					<id>plugins-internal</id>
					<name>plugins-internal</name>
					<layout>jpp</layout>
					<url>__JPP_URL_PLACEHOLDER__</url>
				</pluginRepository>
				<pluginRepository>
					<id>plugins-external</id>
					<name>plugins-external</name>
					<layout>jpp</layout>
					<url>__JAVADIR_PLACEHOLDER__</url>
				</pluginRepository>
				<pluginRepository>
					<id>plugins-maven</id>
					<name>plugins-maven</name>
					<layout>jpp</layout>
					<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>
				</pluginRepository>
			</pluginRepositories>
		</profile>
	</profiles>
	<activeProfiles>
		<activeProfile>JPP</activeProfile>
	</activeProfiles>
</settings>

--- NEW FILE: groovy-all-minimal-1.5.8.pom ---
<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

    <modelVersion>4.0.0</modelVersion>
    
    <groupId>org.codehaus.groovy</groupId>
    <artifactId>groovy-all-minimal</artifactId>
    <name>Groovy</name>
    <packaging>jar</packaging>
    
    <version>1.5.8</version>
    
    <description>
        Groovy: A powerful, dynamic language for the JVM
    </description>
    
    <url>http://groovy.codehaus.org/</url>
    
    <organization>
        <name>The Codehaus</name>
        <url>http://codehaus.org</url>
    </organization>
    
    <inceptionYear>2003</inceptionYear>
    
    <scm>
        <connection>scm:svn:http://svn.groovy.codehaus.org/browse/groovy/trunk/groovy/groovy-core</connection>
        <developerConnection>scm:svn:https://${maven.username}@svn.groovy.codehaus.org/browse/groovy/trunk/groovy/groovy-core</developerConnection>
        <url>http://svn.groovy.codehaus.org/browse/groovy/trunk/groovy/groovy-core</url>
    </scm>

    <mailingLists>
        <mailingList>
            <name>Groovy JSR Discussion List</name>
            <archive>http://dir.gmane.org/gmane.comp.lang.groovy.jsr</archive>
        </mailingList>
        <mailingList>
            <name>Groovy Developer List</name>
            <archive>http://dir.gmane.org/gmane.comp.lang.groovy.devel</archive>
        </mailingList>
        <mailingList>
            <name>Groovy User List</name>
            <archive>http://dir.gmane.org/gmane.comp.lang.groovy.user</archive>
        </mailingList>
    </mailingLists>

    <distributionManagement>
        <repository>
            <id>codehaus.org</id>
            <name>Groovy Central Repository</name>
            <url>dav:https://dav.codehaus.org/repository/groovy/</url>
        </repository>
        <snapshotRepository>
            <id>codehaus.org</id>
            <name>Groovy Central Development Repository</name>
            <url>dav:https://dav.codehaus.org/snapshots.repository/groovy/</url>
        </snapshotRepository>
        <!-- not currently used -->
        <site>
            <id>codehaus.org</id>
            <name>Groovy Web Site</name>
            <url>dav:https://dav.codehaus.org/groovy</url>
        </site>
    </distributionManagement>

    <developers>
        <developer>
            <name>Guillaume Laforge</name>
            <id>glaforge</id>
            <email/>
            <organization>G2One</organization>
            <roles>
                <role>Project Manager</role>
                <role>Developer</role>
            </roles>
        </developer>
        <developer>
            <name>bob mcwhirter</name>
            <id>bob</id>
            <email>bob at werken.com</email>
            <organization>The Werken Company</organization>
            <roles>
                <role>Founder</role>
            </roles>
        </developer>
        <developer>
            <name>James Strachan</name>
            <id>jstrachan</id>
            <email>james at coredevelopers.com</email>
            <organization>Core Developers Network</organization>
            <roles>
                <role>Founder</role>
            </roles>
        </developer>
        <developer>
            <name>Joe Walnes</name>
            <id>joe</id>
            <email/>
            <organization>ThoughtWorks</organization>
            <roles>
                <role>Developer Emeritus</role>
            </roles>
        </developer>
        <developer>
            <name>Chris Stevenson</name>
            <id>skizz</id>
            <email/>
            <organization>ThoughtWorks</organization>
            <roles>
                <role>Developer Emeritus</role>
            </roles>
        </developer>
        <developer>
            <name>Jamie McCrindle</name>
            <id>jamiemc</id>
            <email/>
            <organization>Three</organization>
            <roles>
                <role>Developer Emeritus</role>
            </roles>
        </developer>
        <developer>
            <name>Matt Foemmel</name>
            <id>mattf</id>
            <email/>
            <organization>ThoughtWorks</organization>
            <roles>
                <role>Developer Emeritus</role>
            </roles>
        </developer>
        <developer>
            <name>Sam Pullara</name>
            <id>spullara</id>
            <email>sam at sampullara.com</email>
            <organization/>
            <roles>
                <role>Developer Emeritus</role>
            </roles>
        </developer>
        <developer>
            <name>Kasper Nielsen</name>
            <id>kasper</id>
            <email/>
            <organization/>
            <roles>
                <role>Developer Emeritus</role>
            </roles>
        </developer>
        <developer>
            <name>Travis Kay</name>
            <id>travis</id>
            <email/>
            <organization/>
            <roles>
                <role>Developer Emeritus</role>
            </roles>
        </developer>
        <developer>
            <name>Zohar Melamed</name>
            <id>zohar</id>
            <email/>
            <organization/>
            <roles>
                <role>Developer Emeritus</role>
            </roles>
        </developer>
        <developer>
            <name>John Wilson</name>
            <id>jwilson</id>
            <email>tug at wilson.co.uk</email>
            <organization>The Wilson Partnership</organization>
            <roles>
                <role>Developer Emeritus</role>
            </roles>
        </developer>
        <developer>
            <name>Chris Poirier</name>
            <id>cpoirier</id>
            <email>cpoirier at dreaming.org</email>
            <organization/>
            <roles>
                <role>Developer Emeritus</role>
            </roles>
        </developer>
        <developer>
            <name>Christiaan ten Klooster</name>
            <id>ckl</id>
            <email>ckl at dacelo.nl</email>
            <organization>Dacelo WebDevelopment</organization>
            <roles>
                <role>Developer Emeritus</role>
            </roles>
        </developer>
        <developer>
            <name>Steve Goetze</name>
            <id>goetze</id>
            <email>goetze at dovetail.com</email>
            <organization>Dovetailed Technologies, LLC</organization>
            <roles>
                <role>Developer Emeritus</role>
            </roles>
        </developer>
        <developer>
            <name>Bing Ran</name>
            <id>bran</id>
            <email>b55r at sina.com</email>
            <organization>Leadingcare</organization>
            <roles>
                <role>Developer Emeritus</role>
            </roles>
        </developer>
        <developer>
            <name>Jeremy Rayner</name>
            <id>jez</id>
            <email>jeremy.rayner at gmail.com</email>
            <organization>javanicus</organization>
            <roles>
                <role>Developer</role>
            </roles>
        </developer>
        <developer>
            <name>John Stump</name>
            <id>jstump</id>
            <email>johnstump2 at yahoo.com</email>
            <organization/>
            <roles>
                <role>Developer Emeritus</role>
            </roles>
        </developer>
        <developer>
            <name>Jochen Theodorou</name>
            <id>blackdrag</id>
            <email>blackdrag at gmx.org</email>
            <organization/>
            <roles>
                <role>Developer</role>
            </roles>
        </developer>
        <developer>
            <name>Russel Winder</name>
            <id>russel</id>
            <email>russel at russel.org.uk</email>
            <organization>Concertant LLP & It'z Interactive Ltd</organization>
            <roles>
                <role>Developer</role>
                <role>Founder of Gant</role>
            </roles>
        </developer>
        <developer>
            <name>Pilho Kim</name>
            <id>phk</id>
            <email>phkim at cluecom.co.kr</email>
            <organization/>
            <roles>
                <role>Developer Emeritus</role>
            </roles>
        </developer>
        <developer>
            <name>Christian Stein</name>
            <id>cstein</id>
            <email>sormuras at gmx.de</email>
            <organization>CTSR.de</organization>
            <roles>
                <role>Developer Emeritus</role>
            </roles>
        </developer>
        <developer>
            <name>Dierk Koenig</name>
            <id>mittie</id>
            <email>dierk.koenig at canoo.com</email>
            <organization>Canoo Engineering AG</organization>
            <roles>
                <role>Developer</role>
            </roles>
        </developer>
        <developer>
            <name>Paul King</name>
            <id>paulk</id>
            <email>paulk at asert.com.au</email>
            <organization>ASERT, Australia</organization>
            <roles>
                <role>Developer</role>
            </roles>
        </developer>
        <developer>
            <name>Guillaume Alleon</name>
            <id>galleon</id>
            <email>guillaume.alleon at gmail.com</email>
            <organization/>
            <roles>
                <role>Developer</role>
            </roles>
        </developer>
        <developer>
            <name>Jason Dillon</name>
            <id>user57</id>
            <email>jason at planet57.com</email>
            <organization/>
            <roles>
                <role>Developer</role>
            </roles>
        </developer>
        <developer>
            <name>Danno Ferrin</name>
            <id>shemnon</id>
            <email/>
            <organization/>
            <roles>
                <role>Developer</role>
            </roles>
        </developer>
        <developer>
            <name>James Williams</name>
            <id>jwill</id>
            <email/>
            <organization/>
            <roles>
                <role>Developer</role>
            </roles>
        </developer>
        <developer>
            <name>Andres Almiray</name>
            <id>aalmiray</id>
            <email>aalmiray at users.sourceforge.net</email>
            <organization/>
            <roles>
                <role>Developer</role>
            </roles>
        </developer>
        <developer>
            <name>Marc Guillemot</name>
            <id>mguillem</id>
            <email>mguillemot at yahoo.fr</email>
            <organization/>
            <roles>
                <role>Developer</role>
            </roles>
        </developer>
    </developers>

    <contributors>
        <contributor>
            <name>Joern Eyrich</name>
            <email/>
        </contributor>
        <contributor>
            <name>Robert Kuzelj</name>
            <email/>
        </contributor>
        <contributor>
            <name>Rod Cope</name>
            <email/>
        </contributor>
        <contributor>
            <name>Yuri Schimke</name>
            <email/>
        </contributor>
        <contributor>
            <name>James Birchfield</name>
            <email/>
        </contributor>
        <contributor>
            <name>Robert Fuller</name>
            <email/>
        </contributor>
        <contributor>
            <name>Sergey Udovenko</name>
            <email/>
        </contributor>
        <contributor>
            <name>Hallvard Traetteberg</name>
            <email/>
        </contributor>
        <contributor>
            <name>Peter Reilly</name>
            <email/>
        </contributor>
        <contributor>
            <name>Brian McCallister</name>
            <email/>
        </contributor>
        <contributor>
            <name>Richard Monson-Haefel</name>
            <email/>
        </contributor>
        <contributor>
            <name>Brian Larson</name>
            <email/>
        </contributor>
        <contributor>
            <name>Artur Biesiadowski</name>
            <email>abies at pg.gda.pl</email>
        </contributor>
        <contributor>
            <name>Ivan Z. Ganza</name>
            <email/>
        </contributor>
        <contributor>
            <name>Arjun Nayyar</name>
            <email/>
        </contributor>
        <contributor>
            <name>Mark Chu-Carroll</name>
            <email/>
        </contributor>
        <contributor>
            <name>Mark Turansky</name>
            <email/>
        </contributor>
        <contributor>
            <name>Jean-Louis Berliet</name>
            <email/>
        </contributor>
        <contributor>
            <name>Graham Miller</name>
            <email/>
        </contributor>
        <contributor>
            <name>Marc Palmer</name>
            <email/>
        </contributor>
        <contributor>
            <name>Tugdual Grall</name>
            <email/>
        </contributor>
        <contributor>
            <name>Edwin Tellman</name>
            <email/>
        </contributor>
        <contributor>
            <name>Evan A Slatis</name>
            <email/>
        </contributor>
        <contributor>
            <name>Hamlet D'Arcy</name>
            <email/>
        </contributor>
        <contributor>
            <name>Mike Dillon</name>
            <email/>
        </contributor>
        <contributor>
            <name>Bernhard Huber</name>
            <email/>
        </contributor>
    </contributors>

    
    
    <!--
    NOTE: The following build configuration is primarily intended to support
          generate of IDE configuration files.  Basic support to build is also
          included by invoking 'ant' to do the real work.
    -->
    
    <build>
        <sourceDirectory>src/main</sourceDirectory>
        <testSourceDirectory>src/test</testSourceDirectory>
        
        <defaultGoal>install</defaultGoal>
        
        <pluginManagement>
            <plugins>
                <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
                    <artifactId>maven-antrun-plugin</artifactId>
                    <version>1.1</version>
                </plugin>
                
                <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
                    <artifactId>maven-idea-plugin</artifactId>
                    <version>2.1</version>
                    <configuration>
                        <jdkName>1.4</jdkName>
                        <jdkLevel>1.4</jdkLevel>
                        <linkModules>true</linkModules>
                    </configuration>
                </plugin>
                
                <!--
                NOTE: Tell the compiler and surefire to not do anything, all handled by Ant.
                -->
                
                <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
                    <artifactId>maven-compiler-plugin</artifactId>
                    <version>2.0.2</version>
                    <configuration>
                        <excludes>
                            <exclude>**</exclude>
                        </excludes>
                        <skip>true</skip>
                    </configuration>
                </plugin>
                
                <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
                    <artifactId>maven-surefire-plugin</artifactId>
                    <version>2.3</version>
                    <configuration>
                        <skip>true</skip>
                    </configuration>
                </plugin>
            </plugins>
        </pluginManagement>
        
        <plugins>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-antrun-plugin</artifactId>
                <executions>
                    <execution>
                        <phase>install</phase>
                        <goals>
                            <goal>run</goal>
                        </goals>
                        <configuration>
                            <tasks>
                                <exec executable="ant" dir="${pom.basedir}">
                                    <arg value="installRepo"/>
                                </exec>
                            </tasks>
                        </configuration>
                    </execution>
                </executions>
            </plugin>
        </plugins>
    </build>
    
    <profiles>
        <profile>
            <id>idea</id>
            
            <build>
                <defaultGoal>validate</defaultGoal>
                
                <plugins>
                    <plugin>
                        <groupId>org.apache.maven.plugins</groupId>
                        <artifactId>maven-idea-plugin</artifactId>
                        <configuration>
                            <overwrite>true</overwrite>
                            <downloadSources>true</downloadSources>
                            <downloadJavadocs>true</downloadJavadocs>
                        </configuration>
                        <executions>
                            <execution>
                                <phase>validate</phase>
                                <goals>
                                    <goal>clean</goal>
                                    <goal>idea</goal>
                                </goals>
                            </execution>
                        </executions>
                    </plugin>
                </plugins>
            </build>
        </profile>
        
        <!--
        TODO: Add an eclipse profile to help folks that use that IDE setup configuration files ?
        -->
    </profiles>

</project>

--- NEW FILE: sources ---
a638207db0b5223a4f3f2808f00c42d6  groovy-1.5.8.tar.gz

--- NEW FILE: groovy-1.5-jpp-depmap.xml ---
<dependencies>

  <dependency>
    <maven>
    <groupId>xstream</groupId>
    <artifactId>xstream</artifactId>
    <version>1.2</version>
    </maven>
    <jpp>
    <groupId>JPP</groupId>
    <artifactId>xstream</artifactId>
    <version>1.3.1</version>
    </jpp>
  </dependency>

  <dependency>
    <maven>
    <groupId>xml-resolver</groupId>
    <artifactId>xml-resolver</artifactId>
    <version>1.1</version>
    </maven>
    <jpp>
    <groupId>JPP</groupId>
    <artifactId>xml-commons-resolver11</artifactId>
    <version>1.1</version>
    </jpp>
  </dependency>

</dependencies>

--- NEW FILE: groovy15.spec ---
# Copyright (c) 2000-2010, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

%define section free
%define namedversion 1.5.8
%define bname groovy

Name:           groovy15
Summary:        Groovy scripting language
Url:            http://groovy.codehaus.org/
Version:        1.5.8
Release:        1%{?dist}
Epoch:          0
License:        Apache Software License 2.0
Group:          Development/Libraries/Java
Source0:        groovy-1.5.8.tar.gz
# svn export http://svn.codehaus.org/groovy/tags/GROOVY_1_5_8/ groovy-1.5.8
Source1:        http://repository.codehaus.org/org/codehaus/groovy/groovy-all/1.5.8/groovy-all-1.5.8.pom
Source2:        http://repository.codehaus.org/org/codehaus/groovy/groovy-all-minimal/1.5.8/groovy-all-minimal-1.5.8.pom
Source3:        groovy15-settings.xml
Source4:        groovy-1.5-jpp-depmap.xml

Patch0:         groovy15-build-maven.patch
Patch1:         groovy15-build.patch

BuildRequires:  jpackage-utils >= 0:1.7.5
BuildRequires:  java-devel >= 0:1.6.0

BuildRequires:  ant17 >= 0:1.7.1
BuildRequires:  ant17-antlr
BuildRequires:  ant17-junit
BuildRequires:  ant17-trax
BuildRequires:  antlr
BuildRequires:  checkstyle
BuildRequires:  cobertura
BuildRequires:  junit
BuildRequires:  xmlunit

BuildRequires:  asm2 >= 0:2.2
BuildRequires:  bsf
BuildRequires:  cglib >= 0:2.1.3
BuildRequires:  hsqldb
BuildRequires:  apache-commons-beanutils
BuildRequires:  apache-commons-cli
BuildRequires:  apache-commons-codec
BuildRequires:  apache-commons-collections
BuildRequires:  apache-commons-httpclient
BuildRequires:  apache-commons-lang
BuildRequires:  apache-commons-logging
BuildRequires:  jakarta-oro
BuildRequires:  jarjar
BuildRequires:  jline
BuildRequires:  jmock
BuildRequires:  jsp_2_0_api
BuildRequires:  lucene
BuildRequires:  mockobjects
BuildRequires:  mx4j
BuildRequires:  openejb1
BuildRequires:  qdox
BuildRequires:  servlet_2_4_api
BuildRequires:  xpp3-minimal
BuildRequires:  xstream

#
Requires:       java >= 0:1.6.0
Requires:       ant
Requires:       ant-junit
Requires:       ant-trax
Requires:       antlr
Requires:       asm2
Requires:       bsf
Requires:       apache-commons-cli
Requires:       apache-commons-logging
Requires:       jarjar
Requires:       jline
Requires:       jsp_2_0_api
Requires:       junit
Requires:       mockobjects
Requires:       mx4j
Requires:       servlet_2_4_api
Requires:       xpp3-minimal
Requires:       xstream

Requires(post):    jpackage-utils >= 0:1.7.5
Requires(postun):  jpackage-utils >= 0:1.7.5
BuildArch:      noarch

BuildRoot:      %{_tmppath}/%{name}-%{version}-buildroot

%description
Groovy is a new agile dynamic language for the JVM 
combining lots of great features from languages like 
Python, Ruby and Smalltalk and making them available 
to the Java developers using a Java-like syntax.
Groovy is designed to help you get things done on the 
Java platform in a quicker, more concise and fun way - 
bringing the power of Python and Ruby inside the Java 
platform. 
Groovy can be used as an alternative compiler to javac 
to generate standard Java bytecode to be used by any 
Java project or it can be used dynamically as an 
alternative language such as for scripting Java objects, 
templating or writing unit test cases.

%package javadoc
Summary:        Javadoc for %{name}
Group:          Development/Documentation

%description javadoc
Javadoc for %{name}.

%prep
%setup -q -n groovy-%{version}
chmod -R go=u-w *
#find . -name "*.jar" -exec rm -f {} \;
for j in $(find . -name "*.jar"); do
    mv $j $j.no
done
pushd bootstrap
ln -s $(build-classpath maven-ant-tasks)
popd
pushd cruise/reporting-app/WEB-INF/lib/
ln -s $(build-classpath xmlgraphics-batik/awt-util) batik-awt-util.jar
ln -s $(build-classpath xmlgraphics-batik/svggen) batik-svggen.jar
ln -s $(build-classpath xmlgraphics-batik/util) batik-util.jar
ln -s $(build-classpath cewolf) 
ln -s $(build-classpath commons-logging) 
ln -s $(build-classpath jcommon) 
ln -s $(build-classpath jfreechart) 
popd
mv security/GroovyJarTest.jar.no security/GroovyJarTest.jar

%patch0 -b .sav0
%patch1 -b .sav1

mkdir -p target/lib/compile
pushd target/lib/compile
ln -sf $(build-classpath ant17)
ln -sf $(build-classpath antlr)
ln -sf $(build-classpath asm2/asm2)
ln -sf $(build-classpath asm2/asm2-analysis)
ln -sf $(build-classpath asm2/asm2-tree)
ln -sf $(build-classpath asm2/asm2-util)
ln -sf $(build-classpath bsf)
ln -sf $(build-classpath commons-cli)
ln -sf $(build-classpath jline)
ln -sf $(build-classpath jsp_2_0_api)
ln -sf $(build-classpath junit)
ln -sf $(build-classpath mockobjects-core)
ln -sf $(build-classpath mx4j/mx4j)
ln -sf $(build-classpath servlet_2_4_api)
ln -sf $(build-classpath xstream)
popd
mkdir -p target/lib/runtime
pushd target/lib/runtime
ln -sf $(build-classpath ant17)
ln -sf $(build-classpath ant17-launcher)
ln -sf $(build-classpath ant17/ant17-junit)
ln -sf $(build-classpath antlr)
ln -sf $(build-classpath asm2/asm2)
ln -sf $(build-classpath asm2/asm2-analysis)
ln -sf $(build-classpath asm2/asm2-tree)
ln -sf $(build-classpath asm2/asm2-util)
ln -sf $(build-classpath bsf)
ln -sf $(build-classpath commons-cli)
ln -sf $(build-classpath commons-logging)
ln -sf $(build-classpath jline)
ln -sf $(build-classpath jsp_2_0_api)
ln -sf $(build-classpath junit)
ln -sf $(build-classpath mockobjects-core)
ln -sf $(build-classpath mx4j/mx4j)
ln -sf $(build-classpath servlet_2_4_api)
ln -sf $(build-classpath xstream)
popd
mkdir -p target/lib/test
pushd target/lib/test
ln -sf $(build-classpath ant17)
ln -sf $(build-classpath ant17/ant17-junit)
ln -sf $(build-classpath antlr)
ln -sf $(build-classpath asm2/asm2)
ln -sf $(build-classpath asm2/asm2-analysis)
ln -sf $(build-classpath asm2/asm2-attrs)
ln -sf $(build-classpath asm2/asm2-tree)
ln -sf $(build-classpath asm2/asm2-util)
ln -sf $(build-classpath bsf)
ln -sf $(build-classpath cglib21)
ln -sf $(build-classpath cobertura)
ln -sf $(build-classpath commons-cli)
ln -sf $(build-classpath commons-logging)
ln -sf $(build-classpath hsqldb)
ln -sf $(build-classpath jline)
ln -sf $(build-classpath jmock)
ln -sf $(build-classpath jmock-cglib)
ln -sf $(build-classpath jsp_2_0_api)
ln -sf $(build-classpath junit)
ln -sf $(build-classpath mockobjects-core)
ln -sf $(build-classpath mx4j/mx4j)
ln -sf $(build-classpath servlet_2_4_api)
ln -sf $(build-classpath xmlunit)
ln -sf $(build-classpath xstream)
popd
mkdir -p target/lib/tools
pushd target/lib/tools
ln -sf $(build-classpath ant17)
ln -sf $(build-classpath ant17/ant17-junit)
ln -sf $(build-classpath aqute-bndlib)
ln -sf $(build-classpath jarjar)
ln -sf $(build-classpath junit)
popd

%build

export OPT_JAR_LIST="maven-ant-tasks ant17/ant17-trax ant17/ant17-antlr ant17/ant17-junit junit"
ant17 install javadoc

%install
rm -rf $RPM_BUILD_ROOT
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
install -m 644 target/dist/%{bname}-%{namedversion}.jar \
        $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
install -m 644 target/dist/%{bname}-all-%{namedversion}.jar \
        $RPM_BUILD_ROOT%{_javadir}/%{name}-all-%{version}.jar
install -m 644 target/dist/%{bname}-all-minimal-%{namedversion}.jar \
        $RPM_BUILD_ROOT%{_javadir}/%{name}-all-minimal-%{version}.jar
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)

# poms and depmap frags
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
%add_to_maven_depmap org.codehaus.groovy groovy %{namedversion} JPP %{name}
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}-all.pom
%add_to_maven_depmap org.codehaus.groovy groovy-all %{namedversion} JPP %{name}-all
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}-all-minimal.pom
%add_to_maven_depmap org.codehaus.groovy groovy-all-minimal %{namedversion} JPP %{name}-all-minimal

# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr target/html/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink

# bin
install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
install -m 755 target/install/bin/groovy $RPM_BUILD_ROOT%{_bindir}/groovy15
install -m 755 target/install/bin/groovyc $RPM_BUILD_ROOT%{_bindir}/groovyc15
install -m 755 target/install/bin/groovyConsole $RPM_BUILD_ROOT%{_bindir}/groovyConsole15
install -m 755 target/install/bin/groovysh $RPM_BUILD_ROOT%{_bindir}/groovysh15
install -m 755 target/install/bin/java2groovy $RPM_BUILD_ROOT%{_bindir}/java2groovy15
install -m 755 target/install/bin/startGroovy $RPM_BUILD_ROOT%{_bindir}/startGroovy15

# conf
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/conf
install -m 644 target/install/conf/* $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/conf

# lib
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/embeddable
pushd $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/embeddable
ln -sf %{_javadir}/groovy-all.jar
popd

# lib
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/lib
pushd $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/lib
build-jar-repository . \
ant \
ant/ant-junit \
ant-launcher \
antlr \
asm2/asm2-analysis \
asm2/asm2 \
asm2/asm2-tree \
asm2/asm2-util \
bsf \
commons-cli \
commons-logging \
jline \
jsp_2_0_api \
junit \
mockobjects-core \
mx4j/mx4j \
servlet_2_4_api \
xpp3 \
xstream \

ln -sf %{_javadir}/groovy15.jar
popd

%clean
rm -rf $RPM_BUILD_ROOT

%preun
if [ "$1" = "0" ]; then
  rm %{_datadir}/%{name}-%{version}/lib/*.jar
fi

%pre
rm -f %{_datadir}/%{name}-%{version}/lib/*

%post
rebuild-jar-repository %{_datadir}/%{name}-%{version}/lib
%update_maven_depmap

%postun
%update_maven_depmap

%files
%defattr(-,root,root)
%doc LICENSE.txt
%{_javadir}/*
%attr(755, root, root) %{_bindir}/*
%{_datadir}/%{name}-%{version}
%{_datadir}/maven2/poms/*
%{_mavendepmapfragdir}/*

%files javadoc
%defattr(-,root,root)
%{_javadocdir}/%{name}-%{version}
%doc %{_javadocdir}/%{name}

%changelog
* Wed Dec 15 2010 Ralph Apel <r.apel at r-apel.de> 0:1.5.6-3
- First JPP-6 release

* Thu Nov 06 2008 Ralph Apel <r.apel at r-apel.de> 0:1.5.6-2.jpp5
- Fix bug in pom install

* Fri Oct 03 2008 Ralph Apel <r.apel at r-apel.de> 0:1.5.6-1.jpp5
- 1.5.6 as groovy15

* Mon Apr 21 2008 Ralph Apel <r.apel at r-apel.de> 0:1.1-0.rc3.1jpp
- 1.1-rc3
- Verify build with mock

* Tue Jul 10 2007 Ralph Apel <r.apel at r-apel.de> 0:1.0-1jpp
- Upgrade to 1.0 final

* Wed Jun 07 2006 Fernando Nasser <fnasser at redhat.com> 0:1.0-0.b10.2jpp
- First JPP 1.7 build

* Tue Mar 15 2005 Ralph Apel <r.apel at r-apel.de> 0:1.0-0.b10.1jpp
- upgrade to 1.0-0.b10
- set runtime dependencies to asm, classworlds, commons-cli
- assure $HOME/.groovy/lib exists at startup
- activate user-specific library loading in *-classworlds.conf

* Sat Mar 12 2005 Ralph Apel <r.apel at r-apel.de> 0:1.0-0.b7.3jpp
- reduce runtime dependencies to asm, classworlds

* Tue Feb 01 2005 Ralph Apel <r.apel at r-apel.de> 0:1.0-0.b7.2jpp
- Process project.xml files with saxon
- Don't tamper with $HOME
- Don't use build-jar-repository; explicitly ln -sf $(build-classpath ...)

* Wed Dec 08 2004 Ralph Apel <r.apel at r-apel.de> 0:1.0-0.b7.1jpp
- First release

--- NEW FILE: groovy15-build.patch ---
--- build.xml.sav1	2009-01-20 17:48:19.000000000 +0100
+++ build.xml	2010-12-15 18:03:01.000000000 +0100
@@ -215,7 +215,10 @@
     <target name="compileTest" depends="compileMain" unless="_skipTests_"
             description="Compile the Java and Groovy code in the test source.">
         <mkdir dir="${testClassesDirectory}"/>
+<!--
         <antforked target="realCompileTest" maxmemory="${groovycTest_mx}"/>
+-->
+        <antcall target="realCompileTest"/>
     </target>
 
     <property name="vm5GroovySourceFiles" value="gls/**/vm5/*Test.groovy,org/codehaus/groovy/**/vm5/**/*.groovy,groovy/**/vm5/**/*.groovy"/>
@@ -396,8 +399,10 @@
     </target>
 
     <target name="-actuallyCreateJars"
-            depends="-makeManifest,-initializeJars,-createBaseJar,-createEmbeddableJar"
+            depends="-makeManifest,-initializeJars,-createBaseJar,-createEmbeddableJar"/>
+<!--
             unless="testFailed"/>
+-->
 
     <target name="-makeManifest">
         <mkdir dir="${mainClassesDirectory}/META-INF"/>
@@ -455,7 +460,10 @@
         <mkdir dir="${targetDistDirectory}"/>
     </target>
 
+<!--
     <target name="-createBaseJar" unless="testFailed">
+-->
+    <target name="-createBaseJar">
         <jar destfile="${targetDistDirectory}/groovy.jar" basedir="${mainClassesDirectory}"
              excludes="*.groovy" manifest="${mainClassesDirectory}/META-INF/MANIFEST.MF"/>
     </target>
@@ -464,7 +472,10 @@
         <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpathref="toolsPath"/>
     </target>
 
+<!--
     <target name="-createEmbeddableJar" depends="-jarjarInit" unless="testFailed">
+-->
+    <target name="-createEmbeddableJar" depends="-jarjarInit">
         <delete dir="${stagingDirectory}" quiet="true"/>
         <mkdir dir="${stagingDirectory}"/>
         <unzip dest="${stagingDirectory}">
@@ -549,7 +560,10 @@
     <target name="createJars" depends="-checkAntVersion,-reportTestFailed,-actuallyCreateJars"
             description="Build Groovy and create the jarfiles."/>
 
+<!--
     <target name="install" depends="createJars" unless="testFailed"
+-->
+    <target name="install" depends="createJars"
             description="Create an installation hierarchy in target/install.">
 
         <!--
@@ -690,7 +704,10 @@
             <path path="${mainClassesDirectory}"/>
             <path refid="runtimePath"/>
         </path>
+<!--
         <antforked target="realgroovydoc" maxmemory="512m" classpathref="groovydocpath"/>
+-->
+        <antcall target="realgroovydoc" />
     </target>
 
     <target name="realgroovydoc">




More information about the JPackage-commits mailing list