[Jpackage-commits] dist/groovy17/devel .cvsignore, 1.1, 1.2 groovy-all-1.7.6.pom, NONE, 1.1 groovy17-build.patch, NONE, 1.1 groovy17-no-jansi.patch, NONE, 1.1 groovy17.spec, NONE, 1.1 sources, 1.1, 1.2

David Walluck david at ryu.zarb.org
Fri Dec 17 04:29:43 CET 2010


Update of /home/projects/jpackage/cvs/dist/groovy17/devel
In directory ryu.zarb.org:/tmp/cvs-serv20415/devel

Modified Files:
	.cvsignore sources 
Added Files:
	groovy-all-1.7.6.pom groovy17-build.patch 
	groovy17-no-jansi.patch groovy17.spec 
Log Message:
- initial import

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/groovy17/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	17 Dec 2010 03:20:14 -0000	1.1
--- .cvsignore	17 Dec 2010 03:29:41 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ groovy-1.7.6.tar.gz

--- NEW FILE: groovy17-no-jansi.patch ---
--- src/main/org/codehaus/groovy/tools/shell/util/Logger.java~	2009-12-12 07:04:57.000000000 -0500
+++ src/main/org/codehaus/groovy/tools/shell/util/Logger.java	2010-12-16 18:12:32.215920543 -0500
@@ -17,10 +17,10 @@
 package org.codehaus.groovy.tools.shell.util;
 
 import org.codehaus.groovy.tools.shell.IO;
-import static org.fusesource.jansi.Ansi.ansi;
-import static org.fusesource.jansi.Ansi.Color;
-import static org.fusesource.jansi.Ansi.Color.*;
-import static org.fusesource.jansi.Ansi.Attribute.*;
+//import static org.fusesource.jansi.Ansi.ansi;
+//import static org.fusesource.jansi.Ansi.Color;
+//import static org.fusesource.jansi.Ansi.Color.*;
+//import static org.fusesource.jansi.Ansi.Attribute.*;
 
 /**
  * Provides a very, very basic logging API.
@@ -53,12 +53,12 @@
             }
         }
 
-        Color color = GREEN;
+        //Color color = GREEN;
         if (WARN.equals(level) || ERROR.equals(level)) {
-            color = RED;
+            //color = RED;
         }
 
-        io.out.println(ansi().a(INTENSITY_BOLD).a(color).a(level).reset().a(" [").a(name).a("] ").a(msg));
+        io.out.println(level + " [" + name + "] " + msg);
 
         if (cause != null) {
             cause.printStackTrace(io.out);
--- src/main/org/codehaus/groovy/tools/shell/IO.java.orig	2009-12-12 07:04:57.000000000 -0500
+++ src/main/org/codehaus/groovy/tools/shell/IO.java	2010-12-16 18:21:14.897466338 -0500
@@ -20,11 +20,12 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
+
 import java.io.PrintWriter;
 import java.io.Reader;
 
 import org.codehaus.groovy.tools.shell.util.Preferences;
-import org.fusesource.jansi.AnsiRenderWriter;
+//import org.fusesource.jansi.AnsiRenderWriter;
 
 /**
  * Container for input/output handles.
@@ -65,8 +66,8 @@
         this.errorStream = errorStream;
 
         this.in = new InputStreamReader(inputStream);
-        this.out = new AnsiRenderWriter(outputStream, true);
-        this.err = new AnsiRenderWriter(errorStream, true);
+        this.out = new PrintWriter(outputStream, true);
+        this.err = new PrintWriter(errorStream, true);
     }
 
     /**
--- src/main/org/codehaus/groovy/tools/shell/Groovysh.groovy.orig	2010-06-02 22:23:08.000000000 -0400
+++ src/main/org/codehaus/groovy/tools/shell/Groovysh.groovy	2010-12-16 18:25:40.240253421 -0500
@@ -26,9 +26,9 @@
 import org.codehaus.groovy.tools.shell.util.Preferences
 import org.codehaus.groovy.tools.shell.Parser
 import org.codehaus.groovy.tools.shell.ParseCode
-import org.fusesource.jansi.AnsiRenderer
-import org.fusesource.jansi.Ansi
-import org.fusesource.jansi.AnsiConsole
+//import org.fusesource.jansi.AnsiRenderer
+//import org.fusesource.jansi.Ansi
+//import org.fusesource.jansi.AnsiConsole
 
 /**
  * An interactive shell for evaluating Groovy code from the command-line (aka. groovysh).
@@ -39,13 +39,13 @@
 class Groovysh
     extends Shell
 {
-    static {
+    //static {
         // Install the system adapters
-        AnsiConsole.systemInstall()
+        //AnsiConsole.systemInstall()
 
         // Register jline ansi detector
-        Ansi.setDetector(new AnsiDetector())
-    }
+        //Ansi.setDetector(new AnsiDetector())
+    //}
     
     private static final MessageSource messages = new MessageSource(Groovysh.class)
 
--- src/main/org/codehaus/groovy/tools/shell/Main.groovy.sav1	2010-05-08 07:51:20.000000000 -0400
+++ src/main/org/codehaus/groovy/tools/shell/Main.groovy	2010-12-16 18:33:41.133782737 -0500
@@ -22,8 +22,8 @@
 import org.codehaus.groovy.tools.shell.util.MessageSource
 import org.codehaus.groovy.tools.shell.util.NoExitSecurityManager
 import java.util.concurrent.Callable
-import org.fusesource.jansi.Ansi
-import org.fusesource.jansi.AnsiConsole
+//import org.fusesource.jansi.Ansi
+//import org.fusesource.jansi.AnsiConsole
 import jline.Terminal
 
 /**
@@ -34,13 +34,13 @@
  */
 class Main
 {
-    static {
+    //static {
         // Install the system adapters
-        AnsiConsole.systemInstall()
+        //AnsiConsole.systemInstall()
 
         // Register jline ansi detector
-        Ansi.setDetector(new AnsiDetector())
-    }
+        //Ansi.setDetector(new AnsiDetector())
+    //}
 
     private static final MessageSource messages = new MessageSource(Main.class)
 
@@ -166,7 +166,7 @@
             case 'none':
                 type = 'jline.UnsupportedTerminal'
                 // Disable ANSI, for some reason UnsupportedTerminal reports ANSI as enabled, when it shouldn't
-                Ansi.enabled = false
+                //Ansi.enabled = false
                 break;
         }
 
@@ -183,7 +183,7 @@
             value = Boolean.valueOf(value).booleanValue(); // For JDK 1.4 compat
         }
 
-        Ansi.enabled = value
+        //Ansi.enabled = value
     }
 
     static void setSystemProperty(final String nameValue) {

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/groovy17/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	17 Dec 2010 03:20:14 -0000	1.1
--- sources	17 Dec 2010 03:29:41 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ 5f4b007f5c8eed0ab975be4843af9cc9  groovy-1.7.6.tar.gz

--- NEW FILE: groovy-all-1.7.6.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.7.6</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>
            <uniqueVersion>false</uniqueVersion>
        </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>SpringSource</organization>
            <roles>
                <role>Project Manager</role>
                <role>Despot</role>
                <role>Developer</role>
            </roles>
        </developer>
        <developer>
            <name>Jochen Theodorou</name>
            <id>blackdrag</id>
            <email>blackdrag at gmx.org</email>
            <organization/>
            <roles>
                <role>Developer</role>
                <role>Despot</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>
                <role>Despot</role>
            </roles>
        </developer>
        <developer>
            <name>Roshan Dawrani</name>
            <id>roshandawrani</id>
            <email/>
            <organization/>
            <roles>
                <role>Developer</role>
                <role>Despot</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>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>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>
        <developer>
            <name>Jim White</name>
            <id>jimwhite</id>
            <email>jim at pagesmiths.com</email>
            <organization>IFCX.org</organization>
            <roles>
                <role>Developer</role>
            </roles>
        </developer>
        <developer>
            <name>Peter Niederwieser</name>
            <id>pniederw</id>
            <email>pniederw at gmail.com</email>
            <organization/>
            <roles>
                <role>Developer</role>
            </roles>
        </developer>
        <developer>
            <name>Hamlet D'Arcy</name>
            <id>hamletdrc</id>
            <email>hamletdrc at gmail.com</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>Mike Dillon</name>
            <email/>
        </contributor>
        <contributor>
            <name>Bernhard Huber</name>
            <email/>
        </contributor>
        <contributor>
            <name>Marc DeXeT</name>
            <email/>
        </contributor>
        <contributor>
            <name>Dejan Bosanac</name>
            <email>dejan at nighttale.net</email>
        </contributor>
        <contributor>
            <name>Denver Dino</name>
            <email/>
        </contributor>
        <contributor>
            <name>Ted Naleid</name>
            <email/>
        </contributor>
        <contributor>
            <name>Chanwit Kaewkasi</name>
            <email/>
        </contributor>
        <contributor>
            <name>Brad Long</name>
            <email/>
        </contributor>
        <contributor>
            <name>John Bito</name>
            <email/>
        </contributor>
        <contributor>
            <name>Jim Jagielski</name>
            <email/>
        </contributor>
        <contributor>
            <name>John Hurst</name>
            <email/>
        </contributor>
        <contributor>
            <name>Merlyn Albery-Speyer</name>
            <email/>
        </contributor>
        <contributor>
            <name>jeremi Joslin</name>
            <email/>
        </contributor>
        <contributor>
            <name>UEHARA Junji</name>
            <email/>
        </contributor>
        <contributor>
            <name>NAKANO Yasuharu</name>
            <email/>
        </contributor>
        <contributor>
            <name>Adam Murdoch</name>
            <email/>
        </contributor>
    </contributors>

    <dependencies>

        <!-- core dependencies -->
        
        
        <dependency>
            <groupId>junit</groupId>
            <artifactId>junit</artifactId>
            <version>4.8.2</version>
            <scope>compile</scope>
            <optional>true</optional>
        </dependency>

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

        <!-- only used for command line tools (and CliBuilder) -->
        

        <!-- only used for Ant tasks & scripting tools -->
        <dependency>
            <groupId>org.apache.ant</groupId>
            <artifactId>ant</artifactId>
            <version>1.8.1</version>
            <scope>compile</scope>
            <optional>true</optional>
        </dependency>
        <dependency>
            <groupId>org.apache.ant</groupId>
            <artifactId>ant-junit</artifactId>
            <version>1.8.1</version>
            <scope>runtime</scope>
            <optional>true</optional>
        </dependency>
        <dependency>
            <groupId>org.apache.ant</groupId>
            <artifactId>ant-launcher</artifactId>
            <version>1.8.1</version>
            <scope>runtime</scope>
            <optional>true</optional>
        </dependency>
        <!-- needed for xslt ant task -->
        <dependency>
            <groupId>org.apache.ant</groupId>
            <artifactId>ant-nodeps</artifactId>
            <version>1.8.1</version>
            <scope>runtime</scope>
            <optional>true</optional>
        </dependency>
        <dependency>
            <groupId>org.apache.ant</groupId>
            <artifactId>ant-antlr</artifactId>
            <version>1.8.1</version>
            <scope>runtime</scope>
            <optional>true</optional>
        </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>
        </dependency>
        <!-- used for the stub generator tests -->
        <!-- also used for JavaDoc generator tests: consider keeping both versions in sync -->
        <dependency>
            <groupId>com.thoughtworks.qdox</groupId>
            <artifactId>qdox</artifactId>
            <version>1.12</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.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>

        <!-- for scripting when on Java 5 -->
        <dependency>
            <groupId>org.livetribe</groupId>
            <artifactId>livetribe-jsr223</artifactId>
            <version>2.0.6</version>
            <scope>provided</scope>
            <optional>true</optional>
        </dependency>

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

        <!-- used for SQL library -->
        <dependency>
            <groupId>hsqldb</groupId>
            <artifactId>hsqldb</artifactId>
            <version>1.8.0.10</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, xpp only needed for reading -->
        <dependency>
            <groupId>com.thoughtworks.xstream</groupId>
            <artifactId>xstream</artifactId>
            <version>1.3.1</version>
            <scope>compile</scope>
            <optional>true</optional>
            <exclusions>
                <exclusion>
                    <groupId>xpp3</groupId>
                    <artifactId>xpp3_min</artifactId>
                </exclusion>
            </exclusions>
        </dependency>

        <!-- Used for richer interactive groovysh support -->
        <dependency>
            <groupId>jline</groupId>
            <artifactId>jline</artifactId>
            <version>0.9.94</version>
            <scope>compile</scope>
            <optional>true</optional>
            <exclusions>
                <exclusion>
                    <groupId>junit</groupId>
                    <artifactId>junit</artifactId>
                </exclusion>
            </exclusions>
        </dependency>

        <dependency>
            <groupId>org.fusesource.jansi</groupId>
            <artifactId>jansi</artifactId>
            <version>1.2.1</version>
            <scope>compile</scope>
            <optional>true</optional>
        </dependency>

        <!-- Used for @Grab and Grapes-->
        <dependency>
            <groupId>org.apache.ivy</groupId>
            <artifactId>ivy</artifactId>
            <version>2.2.0</version>
            <scope>compile</scope>
            <optional>true</optional>
            <exclusions>
                <exclusion>
                    <groupId>*</groupId>
                    <artifactId>*</artifactId>
                </exclusion>
            </exclusions>
        </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: groovy17.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.7.6
%define bname groovy

Name:           groovy17
Version:        1.7.6
Release:        1%{?dist}
Epoch:          0
Summary:        Groovy scripting language
License:        ASL 2.0
Group:          Development/Libraries/Java
URL:            http://groovy.codehaus.org/
# svn export http://svn.codehaus.org/groovy/tags/GROOVY_1_7_6/ groovy-1.7.6 && tar czf groovy-1.7.6.tar.gz groovy-1.7.6
Source0:        groovy-1.7.6.tar.gz
Source1:        http://repository.codehaus.org/org/codehaus/groovy/groovy-all/1.7.6/groovy-all-1.7.6.pom
Patch0:         groovy17-build.patch
Patch1:         groovy17-no-jansi.patch
Requires(post): jpackage-utils >= 0:1.7.3
Requires(postun): jpackage-utils >= 0:1.7.3
Requires:       java >= 0:1.6.0
Requires:       ant
Requires:       ant-junit
Requires:       ant-trax
Requires:       antlr
Requires:       objectweb-asm
Requires:       bsf
Requires:       jakarta-commons-cli
Requires:       jakarta-commons-logging
Requires:       jarjar
Requires:       jline
Requires:       jpackage-utils
Requires:       jsp_2_0_api
Requires:       junit
Requires:       livetribe-jsr223
Requires:       mx4j
Requires:       servlet_2_4_api
Requires:       xpp3-minimal
Requires:       xstream
BuildRequires:  jpackage-utils >= 0:1.7.3
BuildRequires:  java-devel >= 0:1.6.0
BuildRequires:  ant >= 0:1.7.1
BuildRequires:  ant-antlr
BuildRequires:  ant-junit
BuildRequires:  ant-trax
BuildRequires:  antlr
BuildRequires:  aqute-bndlib
BuildRequires:  cewolf
BuildRequires:  checkstyle4
BuildRequires:  cobertura
#BuildRequires:  eclipse-rcp
BuildRequires:  jcommon
BuildRequires:  jfreechart
BuildRequires:  junit4
BuildRequires:  lucene1
BuildRequires:  maven-ant-tasks
BuildRequires:  openejb1
BuildRequires:  xmlunit
BuildRequires:  objectweb-asm
BuildRequires:  bsf
BuildRequires:  cglib21 >= 0:2.1.3
BuildRequires:  hsqldb
BuildRequires:  apache-commons-parent
BuildRequires:  jakarta-commons-beanutils
BuildRequires:  jakarta-commons-cli
BuildRequires:  jakarta-commons-codec
BuildRequires:  jakarta-commons-collections
BuildRequires:  jakarta-commons-httpclient
BuildRequires:  jakarta-commons-lang
BuildRequires:  jakarta-commons-logging
BuildRequires:  apache-ivy
BuildRequires:  jakarta-oro
BuildRequires:  jarjar
BuildRequires:  jline
BuildRequires:  jmock
BuildRequires:  jsp_2_0_api
BuildRequires:  lucene
BuildRequires:  livetribe-jsr223
BuildRequires:  mx4j
BuildRequires:  openejb1
BuildRequires:  qdox
BuildRequires:  servlet_2_4_api
BuildRequires:  xpp3-minimal
BuildRequires:  xstream
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root

%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
Requires:       jpackage-utils

%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 -s $(build-classpath ant)
ln -s $(build-classpath antlr)
ln -s $(build-classpath objectweb-asm/asm)
ln -s $(build-classpath objectweb-asm/asm-analysis)
ln -s $(build-classpath objectweb-asm/asm-tree)
ln -s $(build-classpath objectweb-asm/asm-util)
ln -s $(build-classpath bsf)
ln -s $(build-classpath commons-cli)
ln -s $(build-classpath apache-ivy)
ln -s $(build-classpath jline)
ln -s $(build-classpath jsp_2_0_api)
ln -s $(build-classpath junit4)
ln -s $(build-classpath livetribe-jsr223)
ln -s $(build-classpath servlet_2_4_api)
ln -s $(build-classpath xstream)
popd
mkdir -p target/lib/examples
pushd target/lib/examples
ln -s $(build-classpath commons-httpclient)
ln -s $(build-classpath lucene1)
ln -s $(build-classpath openejb1/loader)
#ln -s $(ls /usr/lib/eclipse/plugins/org.eclipse.osgi_3*.jar)
popd
mkdir -p target/lib/extras
pushd target/lib/extras
ln -s $(build-classpath mx4j/mx4j)
popd
mkdir -p target/lib/runtime
pushd target/lib/runtime
ln -s $(build-classpath ant)
ln -s $(build-classpath ant-launcher)
ln -s $(build-classpath ant/ant-junit)
ln -s $(build-classpath antlr)
ln -s $(build-classpath objectweb-asm/asm)
ln -s $(build-classpath objectweb-asm/asm-analysis)
ln -s $(build-classpath objectweb-asm/asm-tree)
ln -s $(build-classpath objectweb-asm/asm-util)
ln -s $(build-classpath bsf)
ln -s $(build-classpath commons-cli)
ln -s $(build-classpath commons-logging)
ln -s $(build-classpath apache-ivy)
ln -s $(build-classpath jline)
ln -s $(build-classpath jsp_2_0_api)
ln -s $(build-classpath junit4)
ln -s $(build-classpath servlet_2_4_api)
ln -s $(build-classpath xstream)
popd
mkdir -p target/lib/test
pushd target/lib/test
ln -s $(build-classpath ant)
ln -s $(build-classpath ant/ant-junit)
ln -s $(build-classpath ant-launcher)
ln -s $(build-classpath antlr)
ln -s $(build-classpath objectweb-asm/asm)
ln -s $(build-classpath objectweb-asm/asm-analysis)
ln -s $(build-classpath objectweb-asm/asm-attrs)
ln -s $(build-classpath objectweb-asm/asm-tree)
ln -s $(build-classpath objectweb-asm/asm-util)
ln -s $(build-classpath bsf)
ln -s $(build-classpath cglib21-nodep)
ln -s $(build-classpath commons-cli)
ln -s $(build-classpath commons-logging)
ln -s $(build-classpath hsqldb)
ln -s $(build-classpath apache-ivy)
ln -s $(build-classpath jline)
ln -s $(build-classpath jmock)
ln -s $(build-classpath jmock-cglib)
ln -s $(build-classpath jsp_2_0_api)
ln -s $(build-classpath junit4)
ln -s $(build-classpath livetribe-jsr223)
ln -s $(build-classpath qdox)
ln -s $(build-classpath servlet_2_4_api)
ln -s $(build-classpath xmlunit)
ln -s $(build-classpath xstream)
popd
mkdir -p target/lib/tools
pushd target/lib/tools
ln -s $(build-classpath antlr)
ln -s $(build-classpath objectweb-asm/asm)
ln -s $(build-classpath objectweb-asm/asm-tree)
ln -s $(build-classpath aqute-bndlib)
#ln -s $(build-classpath backport-util-concurrent)
ln -s $(build-classpath checkstyle4)
ln -s $(build-classpath cobertura)
ln -s $(build-classpath commons-beanutils)
ln -s $(build-classpath commons-cli)
ln -s $(build-classpath commons-collections)
ln -s $(build-classpath commons-lang)
ln -s $(build-classpath commons-logging)
ln -s $(build-classpath jarjar)
ln -s $(build-classpath log4j)
ln -s $(build-classpath oro)
ln -s $(build-classpath qdox)
popd

%build
export CLASSPATH=
export OPT_JAR_LIST="maven-ant-tasks ant/ant-trax ant/ant-antlr ant/ant-junit junit4"
export ANT_OPTS="-DskipFetch=true -DforceRetro=false"
%{ant} install javadoc

%install
rm -rf %{buildroot}

# jars
install -d -m 755 %{buildroot}%{_javadir}

install -p -m 644 target/dist/%{bname}-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
install -p -m 644 target/dist/%{bname}-all-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}-all-%{version}.jar
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -s ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)

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

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

# bin
install -d -m 755 %{buildroot}%{_bindir}
install -p -m 755 target/install/bin/groovy %{buildroot}%{_bindir}/groovy17
install -p -m 755 target/install/bin/groovyc %{buildroot}%{_bindir}/groovyc17
install -p -m 755 target/install/bin/groovyConsole %{buildroot}%{_bindir}/groovyConsole17
install -p -m 755 target/install/bin/groovysh %{buildroot}%{_bindir}/groovysh17
install -p -m 755 target/install/bin/java2groovy %{buildroot}%{_bindir}/java2groovy17
install -p -m 755 target/install/bin/startGroovy %{buildroot}%{_bindir}/startGroovy17

# conf
install -d -m 755 %{buildroot}%{_datadir}/%{name}-%{version}/conf
cp -pr target/install/conf/* %{buildroot}%{_datadir}/%{name}-%{version}/conf

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

# lib
install -d -m 755 %{buildroot}%{_datadir}/%{name}-%{version}/lib
pushd %{buildroot}%{_datadir}/%{name}-%{version}/lib
for i in \
ant \
ant/ant-junit \
ant-launcher \
antlr \
objectweb-asm/asm-analysis \
objectweb-asm/asm \
objectweb-asm/asm-tree \
objectweb-asm/asm-util \
bsf \
commons-cli \
commons-logging \
jline \
jsp_2_0_api \
junit \
apache-ivy \
mx4j/mx4j \
servlet_2_4_api \
xpp3 \
xstream \
; do
ln -s $(build-classpath $i) .;
done
ln -sf %{_javadir}/%{name}.jar
popd

%clean
rm -rf %{buildroot}

%post
%update_maven_depmap

%postun
%update_maven_depmap

%files
%defattr(0644,root,root,0755)
%doc LICENSE.txt
%attr(0755,root,root) %{_bindir}/*
%{_javadir}*/%{name}-%{version}.jar
%{_javadir}*/%{name}.jar
%{_javadir}*/%{name}-all-%{version}.jar
%{_javadir}*/%{name}-all.jar
%dir %{_datadir}/%{name}-%{version}
%dir %{_datadir}/%{name}-%{version}/conf
# FIXME: (dwalluck): move to %%{_sysconfdir}
%config(noreplace) %{_datadir}/%{name}-%{version}/conf/groovy-starter.conf
%dir %{_datadir}/%{name}-%{version}/embeddable
%{_datadir}/%{name}-%{version}/embeddable/groovy17-all.jar
%dir %{_datadir}/%{name}-%{version}/lib
%{_datadir}/%{name}-%{version}/lib/ant-junit.jar
%{_datadir}/%{name}-%{version}/lib/ant-launcher.jar
%{_datadir}/%{name}-%{version}/lib/ant.jar
%{_datadir}/%{name}-%{version}/lib/antlr.jar
%{_datadir}/%{name}-%{version}/lib/apache-ivy.jar
%{_datadir}/%{name}-%{version}/lib/asm-analysis.jar
%{_datadir}/%{name}-%{version}/lib/asm-tree.jar
%{_datadir}/%{name}-%{version}/lib/asm-util.jar
%{_datadir}/%{name}-%{version}/lib/asm.jar
%{_datadir}/%{name}-%{version}/lib/bsf.jar
%{_datadir}/%{name}-%{version}/lib/commons-cli.jar
%{_datadir}/%{name}-%{version}/lib/commons-logging.jar
%{_datadir}/%{name}-%{version}/lib/groovy17.jar
%{_datadir}/%{name}-%{version}/lib/jline.jar
%{_datadir}/%{name}-%{version}/lib/jsp_2_0_api.jar
%{_datadir}/%{name}-%{version}/lib/junit.jar
%{_datadir}/%{name}-%{version}/lib/mx4j.jar
%{_datadir}/%{name}-%{version}/lib/servlet_2_4_api.jar
%{_datadir}/%{name}-%{version}/lib/xpp3.jar
%{_datadir}/%{name}-%{version}/lib/xstream.jar
%{_datadir}/maven2/poms/JPP-%{name}-all.pom
%{_datadir}/maven2/poms/JPP-%{name}.pom
%{_mavendepmapfragdir}/%{name}

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

%changelog
* Thu Dec 16 2010 David Walluck <dwalluck at redhat.com> 0:1.7.6-1
- release

--- NEW FILE: groovy17-build.patch ---
--- build.xml.sav0	2010-09-09 18:37:10.000000000 -0400
+++ build.xml	2010-12-16 19:43:18.150435420 -0500
@@ -331,7 +331,7 @@
 
     <target name="-testOne" if="_testOne_" depends="-initGroovyc">
         <mkdir dir="${junitRawDirectory}"/>
-        <junit printsummary="true" fork="true" includeantruntime="false" failureproperty="testFailed"
+        <junit printsummary="true" fork="true" includeantruntime="false" failureproperty="notestFailed"
                maxmemory="${groovyJUnit_mx}" dir="${basedir}">
             <sysproperty key="apple.awt.UIElement" value="true"/>
             <!-- keeps the dock from showing the AWT startup -->
@@ -380,7 +380,7 @@
 
     <target name="-testAll" if="_testAll_" depends="-collect15tests,-collect16tests,-collectOptionalTests,-initGroovyc">
         <mkdir dir="${junitRawDirectory}"/>
-        <junit printsummary="true" fork="true" includeantruntime="false" failureproperty="testFailed"
+        <junit printsummary="true" fork="true" includeantruntime="false" failureproperty="notestFailed"
                maxmemory="${groovyJUnit_mx}" dir="${basedir}">
             <jvmarg line="${junitJvmArgs}"/>
             <sysproperty key="apple.awt.UIElement" value="true"/>
@@ -411,7 +411,7 @@
     </target>
 
     <target name="-reportTestFailed" depends="-coverageReport" if="testFailed">
-        <fail message="Test failed, not processing further targets."/>
+        <!--<fail message="Test failed, not processing further targets."/>-->
     </target>
 
     <target name="-coverageInstrument" depends="-initCoverage,-coberturaInit" if="_forceCoverage_">




More information about the JPackage-commits mailing list