From 07c6778db4f5ad7e790193801834d48d90cfaad0 Mon Sep 17 00:00:00 2001
From: carnold <carnold@dev.java.net>
Date: Tue, 31 Jul 2007 00:23:58 +0000
Subject: Bug 1761534: Add gump.xml for a no-ivy option

git-svn-id: file:///home/sven/projects/JOGL/temp/ant-contrib/svn/ant-contrib-code/ant-contrib/trunk@129 32d7a393-a5a9-423c-abd3-5d954feb1f2f
---
 ant-body.xml     | 224 ++++++++++++++++++++++++++++++++++++++++++++++++++
 ant-prologue.xml |  33 ++++++++
 build.xml        | 245 ++++++-------------------------------------------------
 gump.xml         |  60 ++++++++++++++
 4 files changed, 340 insertions(+), 222 deletions(-)
 create mode 100644 ant-body.xml
 create mode 100644 ant-prologue.xml
 create mode 100644 gump.xml

diff --git a/ant-body.xml b/ant-body.xml
new file mode 100644
index 0000000..c0125cc
--- /dev/null
+++ b/ant-body.xml
@@ -0,0 +1,224 @@
+<!--
+ Licensed to the Ant-Contrib Project under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The Ant-Contrib Project licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+    
+	<target name="compile" depends="classpath">
+		<mkdir dir="${target.classes.dir}" />
+		<javac srcdir="${src.java.dir}"
+		       destdir="${target.classes.dir}"
+		       debug="true"
+		       classpathref="compile.classpath"
+		       source="${jdk.source}"
+		       target="${jdk.target}"
+		  />
+		
+		<copy todir="${target.classes.dir}">
+		    <fileset dir="${src.java.dir}"
+		             includes="**/*.properties,**/*.xml" />
+		</copy>
+    </target>
+		
+	<target name="compile-tests" depends="classpath,compile">
+		<mkdir dir="${target.test-classes.dir}" />
+		<javac srcdir="${test.src.dir}"
+		       destdir="${target.test-classes.dir}"
+		       debug="true"
+		       source="${jdk.source}"
+		       target="${jdk.target}">
+			<classpath>
+				<path refid="test.classpath" />
+				<pathelement location="${target.classes.dir}" />
+			</classpath>
+		</javac>
+		
+		<copy todir="${target.test-classes.dir}">
+		    <fileset dir="${test.src.dir}"
+		             includes="**/*.properties,**/*.xml" />
+		    <fileset dir="${test.resources.dir}"
+		             includes="**/*.java,**/*.properties,**/*.xml"
+		             excludes="**/design/src/**/*" />
+		    <fileset dir="${test.resources.dir}/design/src"
+		             includes="**/design/src/**/*" />
+		</copy>
+    </target>
+
+    <target name="jar" depends="compile">
+		<mkdir dir="${target.dir}" />
+    	<tstamp>
+    	    <format property="tstamp" pattern="dd/MM/yyyy HH:mm:ss" />
+    	</tstamp>
+		<jar file="${target.dir}/${jar.name}">
+			<manifest>
+                <attribute name="Version" value="${project.version}"/>
+                <attribute name="Build-Timestamp" value="${tstamp}"/>
+			</manifest>
+			<fileset dir="${target.classes.dir}" />
+		</jar>
+	</target>
+		
+	<target name="clean">
+		<delete includeemptydirs="true">
+			<fileset dir="${target.dir}" includes="**/*" />
+			<fileset dir="${dist.dir}" includes="**/*" />
+		</delete>
+	</target>
+	
+	<target name="javadoc" depends="classpath">
+	    <javadoc sourcepath="${src.java.dir}"
+	             destdir="${target.docs.dir}/api"
+	             packagenames="net.sf.antcontrib.*"
+	             author="true"
+	             version="true"
+	             windowtitle="Ant Contrib"
+	    	classpathref="compile.classpath">
+	      <tag name="ant.task" enabled="false" description="Task:" scope="types"/>
+	      <tag name="ant.datatype" enabled="false"
+	           description="Data type:" scope="types"/>
+	      <tag name="ant.attribute" enabled="false"
+	           description="Attribute:" scope="types"/>
+	      <tag name="ant.attribute.group" enabled="false"
+	           description="Attribute group:" scope="types"/>
+	      <tag name="ant.element" enabled="false"
+	           description="Nested element:" scope="types"/>
+	    </javadoc>
+	</target>
+		
+	<target name="docs" depends="javadoc">
+		<mkdir dir="${target.docs.dir}" />
+		<copy todir="${target.docs.dir}">
+			<fileset dir="${docs.dir}" includes="**/*" />
+		</copy>
+    </target>
+		
+	<target name="dist-stage" depends="jar,docs">
+		<mkdir dir="${target.stage.dir}" />
+		<mkdir dir="${target.stage.dir}/lib" />
+		
+                <copy file="${target.dir}/${jar.name}" 
+                      tofile="${target.stage.dir}/${jar.name.versioned}" />
+
+		<copy todir="${target.stage.dir}">
+			<fileset dir="${root.dir}" includes="README.txt" />
+			<fileset dir="${target.dir}" includes="docs/**/*" />
+		</copy>		
+		<copy todir="${target.stage.dir}/lib" flatten="true">
+		    <fileset refid="runtime.fileset" />
+		</copy>		
+	</target>
+		
+	<target name="zip" depends="dist-stage">
+		<mkdir dir="${dist.dir}" />
+		<zip file="${dist.dir}/${project.name}-${project.version}-bin.zip">
+			<zipfileset prefix="ant-contrib" dir="${target.stage.dir}" 
+			    includes="**/*" />
+		</zip>
+		
+		<zip file="${dist.dir}/${project.name}-${project.version}-src.zip">
+			<zipfileset prefix="ant-contrib"
+				dir="${root.dir}" 
+			    includes="**/*"
+			    excludes="target,target/**/*,dist,dist/**/*" />
+		</zip>
+	</target>
+
+	<target name="tar.gz" depends="dist-stage">
+		<mkdir dir="${dist.dir}" />
+
+		<tar destfile="${dist.dir}/${project.name}-${project.version}-bin.tar.gz"
+			 compression="gzip">
+			<tarfileset prefix="ant-contrib"
+				dir="${target.stage.dir}" 
+			    includes="**/*" />
+		</tar>
+		
+		<tar destfile="${dist.dir}/${project.name}-${project.version}-bin.tar.bz2"
+			 compression="bzip2">
+			<tarfileset prefix="ant-contrib"
+				dir="${target.stage.dir}" 
+			    includes="**/*" />
+		</tar>
+
+		<tar destfile="${dist.dir}/${project.name}-${project.version}-src.tar.gz"
+			 compression="gzip">
+			<tarfileset prefix="ant-contrib"
+				dir="${root.dir}" 
+			    includes="**/*"
+			    excludes="target,target/**/*,dist,dist/**/*" />
+		</tar>
+		
+		<tar destfile="${dist.dir}/${project.name}-${project.version}-src.tar.bz2"
+			 compression="bzip2">
+			<tarfileset prefix="ant-contrib"
+				dir="${root.dir}" 
+			    includes="**/*"
+			    excludes="target,target/**/*,dist,dist/**/*" />
+		</tar>
+
+	</target>
+	
+	<target name="package" depends="tar.gz,zip">
+        <checksum fileext=".md5">
+            <fileset dir="${dist.dir}">
+                <include name="*.zip"/>
+                <include name="*.tar.bz2"/>
+                <include name="*.tar.gz"/>
+            </fileset>
+        </checksum>
+	</target>
+	
+	<target name="dist" depends="package">
+	</target>
+	
+	<target name="run-test" depends="compile-tests, jar">
+	    <junit haltonfailure="false" haltonerror="false"
+	           errorproperty="junit.error" failureproperty="junit.failure">
+	      <formatter type="brief" usefile="false"/>
+	      <batchtest>
+	        <fileset dir="${target.test-classes.dir}" excludes="${skip-tests}">
+	          <exclude name="**/antclipse/**" unless="eclipse.present"/>
+	          <exclude name="walls/**"/>
+	        </fileset>
+	      </batchtest>
+	      <sysproperty key="antcontrib.jar" file="${target.dir}/${jar.name}"/>
+		  <classpath>
+			  <path refid="test.classpath" />
+			  <pathelement location="${target.classes.dir}" />
+			  <pathelement location="${target.test-classes.dir}" />
+		  </classpath>
+	    </junit>
+
+	      <fail message="JUnit error (${junit.error}) encountered." if="junit.error" />
+	      <fail message="JUnit failure (${junit.failure}) encountered." if="junit.failure" />
+	</target>
+	
+	<target name="test-all" depends="compile-tests">
+	    <antcall target="run-test">
+	        <param name="skip-tests" value="**/BuildFileTestBase.class"/>
+	    </antcall>
+	</target>
+
+
+	<target name="gump-safe-test" depends="compile-tests">
+	      <!--   all AntServerTest tests started failing on Gump 
+	             with IOException at 2004-12-06T15:00:16 
+	            after successfully completing at 2004-12-06T03:00:19 -->
+	    <antcall target="run-test">
+	      <param name="skip-tests" value="**/AntServerTest.class **/BuildFileTest*.class"/>
+	    </antcall>
+	</target>
+	  
+	  <target name="test" depends="gump-safe-test"/>
diff --git a/ant-prologue.xml b/ant-prologue.xml
new file mode 100644
index 0000000..0f5164f
--- /dev/null
+++ b/ant-prologue.xml
@@ -0,0 +1,33 @@
+<!--
+ Licensed to the Ant-Contrib Project under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The Ant-Contrib Project licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+	<property file="build.properties" />
+	
+	<property name="root.dir" location="." />
+	<property name="src.dir" location="src" />
+	<property name="src.java.dir" location="${src.dir}/java" />
+	<property name="test.dir" location="test" />
+	<property name="test.src.dir" location="${test.dir}/src" />
+	<property name="test.resources.dir" location="${test.dir}/resources" />
+	<property name="docs.dir" location="docs" />
+	<property name="target.dir" location="target" />
+	<property name="target.classes.dir" location="${target.dir}/classes" />
+	<property name="target.test-classes.dir" location="${target.dir}/test-classes" />
+	<property name="target.docs.dir" location="${target.dir}/docs" />
+	<property name="dist.dir" location="dist" />
+	<property name="target.stage.dir" location="${target.dir}/stage" />
+	
diff --git a/build.xml b/build.xml
index 863059d..92073a5 100644
--- a/build.xml
+++ b/build.xml
@@ -1,24 +1,30 @@
-<project
+<!--
+ Licensed to the Ant-Contrib Project under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The Ant-Contrib Project licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<!DOCTYPE project [
+<!ENTITY prologue SYSTEM "ant-prologue.xml">
+<!ENTITY body SYSTEM "ant-body.xml">
+]><project
 	name="ant-contrib"
 	default="dist"
 	basedir="."
 	xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
 
-	<property file="build.properties" />
-	
-	<property name="root.dir" location="." />
-	<property name="src.dir" location="src" />
-	<property name="src.java.dir" location="${src.dir}/java" />
-	<property name="test.dir" location="test" />
-	<property name="test.src.dir" location="${test.dir}/src" />
-	<property name="test.resources.dir" location="${test.dir}/resources" />
-	<property name="docs.dir" location="docs" />
-	<property name="target.dir" location="target" />
-	<property name="target.classes.dir" location="${target.dir}/classes" />
-	<property name="target.test-classes.dir" location="${target.dir}/test-classes" />
-	<property name="target.docs.dir" location="${target.dir}/docs" />
-	<property name="dist.dir" location="dist" />
-	<property name="target.stage.dir" location="${target.dir}/stage" />
+    &prologue;
 	
 	<target name="init" unless="no-ivy">
         <path id="ivy.lib.path">
@@ -52,211 +58,6 @@
 		<ivy:cachefileset setid="test.fileset" type="jar" conf="test" />
 	</target>
 		
-	<target name="compile" depends="classpath">
-		<mkdir dir="${target.classes.dir}" />
-		<javac srcdir="${src.java.dir}"
-		       destdir="${target.classes.dir}"
-		       debug="true"
-		       classpathref="compile.classpath"
-		       source="${jdk.source}"
-		       target="${jdk.target}"
-		  />
-		
-		<copy todir="${target.classes.dir}">
-		    <fileset dir="${src.java.dir}"
-		             includes="**/*.properties,**/*.xml" />
-		</copy>
-    </target>
-		
-	<target name="compile-tests" depends="classpath,compile">
-		<mkdir dir="${target.test-classes.dir}" />
-		<javac srcdir="${test.src.dir}"
-		       destdir="${target.test-classes.dir}"
-		       debug="true"
-		       source="${jdk.source}"
-		       target="${jdk.target}">
-			<classpath>
-				<path refid="test.classpath" />
-				<pathelement location="${target.classes.dir}" />
-			</classpath>
-		</javac>
-		
-		<copy todir="${target.test-classes.dir}">
-		    <fileset dir="${test.src.dir}"
-		             includes="**/*.properties,**/*.xml" />
-		    <fileset dir="${test.resources.dir}"
-		             includes="**/*.java,**/*.properties,**/*.xml"
-		             excludes="**/design/src/**/*" />
-		    <fileset dir="${test.resources.dir}/design/src"
-		             includes="**/design/src/**/*" />
-		</copy>
-    </target>
-
-    <target name="jar" depends="compile">
-		<mkdir dir="${target.dir}" />
-    	<tstamp>
-    	    <format property="tstamp" pattern="dd/MM/yyyy HH:mm:ss" />
-    	</tstamp>
-		<jar file="${target.dir}/${jar.name}">
-			<manifest>
-                <attribute name="Version" value="${project.version}"/>
-                <attribute name="Build-Timestamp" value="${tstamp}"/>
-			</manifest>
-			<fileset dir="${target.classes.dir}" />
-		</jar>
-	</target>
-		
-	<target name="clean">
-		<delete includeemptydirs="true">
-			<fileset dir="${target.dir}" includes="**/*" />
-			<fileset dir="${dist.dir}" includes="**/*" />
-		</delete>
-	</target>
-	
-	<target name="javadoc" depends="classpath">
-	    <javadoc sourcepath="${src.java.dir}"
-	             destdir="${target.docs.dir}/api"
-	             packagenames="net.sf.antcontrib.*"
-	             author="true"
-	             version="true"
-	             windowtitle="Ant Contrib"
-	    	classpathref="compile.classpath">
-	      <tag name="ant.task" enabled="false" description="Task:" scope="types"/>
-	      <tag name="ant.datatype" enabled="false"
-	           description="Data type:" scope="types"/>
-	      <tag name="ant.attribute" enabled="false"
-	           description="Attribute:" scope="types"/>
-	      <tag name="ant.attribute.group" enabled="false"
-	           description="Attribute group:" scope="types"/>
-	      <tag name="ant.element" enabled="false"
-	           description="Nested element:" scope="types"/>
-	    </javadoc>
-	</target>
-		
-	<target name="docs" depends="javadoc">
-		<mkdir dir="${target.docs.dir}" />
-		<copy todir="${target.docs.dir}">
-			<fileset dir="${docs.dir}" includes="**/*" />
-		</copy>
-    </target>
-		
-	<target name="dist-stage" depends="jar,docs">
-		<mkdir dir="${target.stage.dir}" />
-		<mkdir dir="${target.stage.dir}/lib" />
-		
-                <copy file="${target.dir}/${jar.name}" 
-                      tofile="${target.stage.dir}/${jar.name.versioned}" />
-
-		<copy todir="${target.stage.dir}">
-			<fileset dir="${root.dir}" includes="README.txt" />
-			<fileset dir="${target.dir}" includes="docs/**/*" />
-		</copy>		
-		<copy todir="${target.stage.dir}/lib" flatten="true">
-		    <fileset refid="runtime.fileset" />
-		</copy>		
-	</target>
-		
-	<target name="zip" depends="dist-stage">
-		<mkdir dir="${dist.dir}" />
-		<zip file="${dist.dir}/${project.name}-${project.version}-bin.zip">
-			<zipfileset prefix="ant-contrib" dir="${target.stage.dir}" 
-			    includes="**/*" />
-		</zip>
-		
-		<zip file="${dist.dir}/${project.name}-${project.version}-src.zip">
-			<zipfileset prefix="ant-contrib"
-				dir="${root.dir}" 
-			    includes="**/*"
-			    excludes="target,target/**/*,dist,dist/**/*" />
-		</zip>
-	</target>
-
-	<target name="tar.gz" depends="dist-stage">
-		<mkdir dir="${dist.dir}" />
-
-		<tar destfile="${dist.dir}/${project.name}-${project.version}-bin.tar.gz"
-			 compression="gzip">
-			<tarfileset prefix="ant-contrib"
-				dir="${target.stage.dir}" 
-			    includes="**/*" />
-		</tar>
-		
-		<tar destfile="${dist.dir}/${project.name}-${project.version}-bin.tar.bz2"
-			 compression="bzip2">
-			<tarfileset prefix="ant-contrib"
-				dir="${target.stage.dir}" 
-			    includes="**/*" />
-		</tar>
-
-		<tar destfile="${dist.dir}/${project.name}-${project.version}-src.tar.gz"
-			 compression="gzip">
-			<tarfileset prefix="ant-contrib"
-				dir="${root.dir}" 
-			    includes="**/*"
-			    excludes="target,target/**/*,dist,dist/**/*" />
-		</tar>
-		
-		<tar destfile="${dist.dir}/${project.name}-${project.version}-src.tar.bz2"
-			 compression="bzip2">
-			<tarfileset prefix="ant-contrib"
-				dir="${root.dir}" 
-			    includes="**/*"
-			    excludes="target,target/**/*,dist,dist/**/*" />
-		</tar>
-
-	</target>
-	
-	<target name="package" depends="tar.gz,zip">
-        <checksum fileext=".md5">
-            <fileset dir="${dist.dir}">
-                <include name="*.zip"/>
-                <include name="*.tar.bz2"/>
-                <include name="*.tar.gz"/>
-            </fileset>
-        </checksum>
-	</target>
-	
-	<target name="dist" depends="package">
-	</target>
-	
-	<target name="run-test" depends="compile-tests, jar">
-	    <junit haltonfailure="false" haltonerror="false"
-	           errorproperty="junit.error" failureproperty="junit.failure">
-	      <formatter type="brief" usefile="false"/>
-	      <batchtest>
-	        <fileset dir="${target.test-classes.dir}" excludes="${skip-tests}">
-	          <exclude name="**/antclipse/**" unless="eclipse.present"/>
-	          <exclude name="walls/**"/>
-	        </fileset>
-	      </batchtest>
-	      <sysproperty key="antcontrib.jar" file="${target.dir}/${jar.name}"/>
-		  <classpath>
-			  <path refid="test.classpath" />
-			  <pathelement location="${target.classes.dir}" />
-			  <pathelement location="${target.test-classes.dir}" />
-		  </classpath>
-	    </junit>
-
-	      <fail message="JUnit error (${junit.error}) encountered." if="junit.error" />
-	      <fail message="JUnit failure (${junit.failure}) encountered." if="junit.failure" />
-	</target>
-	
-	<target name="test-all" depends="compile-tests">
-	    <antcall target="run-test">
-	        <param name="skip-tests" value="**/BuildFileTestBase.class"/>
-	    </antcall>
-	</target>
-
-
-	<target name="gump-safe-test" depends="compile-tests">
-	      <!--   all AntServerTest tests started failing on Gump 
-	             with IOException at 2004-12-06T15:00:16 
-	            after successfully completing at 2004-12-06T03:00:19 -->
-	    <antcall target="run-test">
-	      <param name="skip-tests" value="**/AntServerTest.class **/BuildFileTest*.class"/>
-	    </antcall>
-	</target>
-	  
-	  <target name="test" depends="gump-safe-test"/>
+    &body;
 	
 </project>
diff --git a/gump.xml b/gump.xml
new file mode 100644
index 0000000..67783a8
--- /dev/null
+++ b/gump.xml
@@ -0,0 +1,60 @@
+<!--
+ Licensed to the Ant-Contrib Project under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The Ant-Contrib Project licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<!DOCTYPE project [
+<!ENTITY prologue SYSTEM "ant-prologue.xml">
+<!ENTITY body SYSTEM "ant-body.xml">
+]>
+<project
+	name="ant-contrib"
+	default="dist"
+	basedir=".">
+
+     &prologue;
+	 
+	<property name="m2_repo" location="${user.home}/.m2/repository"/>
+	<property name="bcel.version" value="5.1"/>
+	<property name="bcel.jar" value="${m2_repo}/bcel/bcel/${bcel.version}/bcel-${bcel.version}.jar"/>
+	<property name="httpclient.version" value="3.0.1"/>
+	<property name="httpclient.jar" value="${m2_repo}/commons-httpclient/commons-httpclient/${httpclient.version}/commons-httpclient-${httpclient.version}.jar"/>
+	<property name="ivy.version" value="1.4.1"/>
+	<property name="ivy.jar" value="lib/ivy/jars/ivy-${ivy.version}.jar"/>
+	<property name="junit.version" value="3.8.1"/>
+	<property name="junit.jar" value="${m2_repo}/junit/junit/${junit.version}/junit-${junit.version}.jar"/>
+	<property name="ant.version" value="1.6.5"/>
+	<property name="ant.jar" value="${m2_repo}/ant/ant/${ant.version}/ant-${ant.version}.jar"/>
+
+	
+	<path id="compile.classpath">
+	    <pathelement location="${bcel.jar}"/>
+	    <pathelement location="${httpclient.jar}"/>
+	    <pathelement location="${ivy.jar}"/>
+	    <pathelement location="${ant.jar}"/>
+	</path>
+	
+	<path id="test.classpath">
+	    <path refid="compile.classpath"/>
+		<pathelement location="${junit.jar}"/>
+	</path>
+
+	<fileset id="runtime.fileset" dir="lib"/>
+
+	<target name="classpath">
+	</target>
+	
+	&body;
+</project>
-- 
cgit v1.2.3