SF.net SVN: ant-contrib: [131] ant-contrib/trunk

[email protected] Mon, 30 Jul 2007 20:22:55 -0700
Newsgroups gmane.comp.java.ant-contrib.devel
Message-ID <[email protected]>
Revision: 131
          http://ant-contrib.svn.sourceforge.net/ant-contrib/?rev=131&view=rev
Author:   carnold
Date:     2007-07-30 20:22:55 -0700 (Mon, 30 Jul 2007)

Log Message:
-----------
Bug 1760649: Initial Maven 2 build for ant-contrib

Modified Paths:
--------------
    ant-contrib/trunk/ant-body.xml
    ant-contrib/trunk/ant-prologue.xml

Added Paths:
-----------
    ant-contrib/trunk/src/main/resources/net/sf/antcontrib/antcontrib.properties
    ant-contrib/trunk/src/main/resources/net/sf/antcontrib/antlib.xml

Removed Paths:
-------------
    ant-contrib/trunk/src/main/java/net/sf/antcontrib/antcontrib.properties
    ant-contrib/trunk/src/main/java/net/sf/antcontrib/antlib.xml

Modified: ant-contrib/trunk/ant-body.xml
===================================================================
--- ant-contrib/trunk/ant-body.xml	2007-07-31 03:18:26 UTC (rev 130)
+++ ant-contrib/trunk/ant-body.xml	2007-07-31 03:22:55 UTC (rev 131)
@@ -27,7 +27,7 @@
 		  />
 		
 		<copy todir="${target.classes.dir}">
-		    <fileset dir="${src.java.dir}"
+		    <fileset dir="${src.resources.dir}"
 		             includes="**/*.properties,**/*.xml" />
 		</copy>
     </target>

Modified: ant-contrib/trunk/ant-prologue.xml
===================================================================
--- ant-contrib/trunk/ant-prologue.xml	2007-07-31 03:18:26 UTC (rev 130)
+++ ant-contrib/trunk/ant-prologue.xml	2007-07-31 03:22:55 UTC (rev 131)
@@ -18,8 +18,9 @@
 	<property file="build.properties" />
 	
 	<property name="root.dir" location="." />
-	<property name="src.dir" location="src" />
+	<property name="src.dir" location="src/main" />
 	<property name="src.java.dir" location="${src.dir}/java" />
+	<property name="src.resources.dir" location="${src.dir}/resources" />
 	<property name="test.dir" location="test" />
 	<property name="test.src.dir" location="${test.dir}/src" />
 	<property name="test.resources.dir" location="${test.dir}/resources" />

Deleted: ant-contrib/trunk/src/main/java/net/sf/antcontrib/antcontrib.properties
===================================================================
--- ant-contrib/trunk/src/main/java/net/sf/antcontrib/antcontrib.properties	2007-07-31 03:18:26 UTC (rev 130)
+++ ant-contrib/trunk/src/main/java/net/sf/antcontrib/antcontrib.properties	2007-07-31 03:22:55 UTC (rev 131)
@@ -1,56 +0,0 @@
-
-# Antclipse tasks
-antclipse=net.sf.antcontrib.antclipse.ClassPathTask
-
-# AntServer tasks
-antserver=net.sf.antcontrib.antserver.server.ServerTask
-remoteant=net.sf.antcontrib.antserver.client.ClientTask
-
-# Design Tasks
-verifydesign=net.sf.antcontrib.design.VerifyDesign
-
-# IniFile
-inifile=net.sf.antcontrib.inifile.IniFileTask
-
-# Logic tasks
-if=net.sf.antcontrib.logic.IfTask
-foreach=net.sf.antcontrib.logic.ForEach
-throw=net.sf.antcontrib.logic.Throw
-trycatch=net.sf.antcontrib.logic.TryCatchTask
-switch=net.sf.antcontrib.logic.Switch
-outofdate=net.sf.antcontrib.logic.OutOfDate
-runtarget=net.sf.antcontrib.logic.RunTargetTask
-timestampselector=net.sf.antcontrib.logic.TimestampSelector
-antcallback=net.sf.antcontrib.logic.AntCallBack
-antfetch=net.sf.antcontrib.logic.AntFetch
-assert=net.sf.antcontrib.logic.Assert
-relentless=net.sf.antcontrib.logic.Relentless
-
-# Math Tasks
-math=net.sf.antcontrib.math.MathTask
-
-# Net tasks
-post=net.sf.antcontrib.net.PostTask
-
-# Peformance Tasks
-stopwatch=net.sf.antcontrib.perf.StopWatchTask
-
-# Platform Tasks
-osfamily=net.sf.antcontrib.platform.OsFamily
-shellscript=net.sf.antcontrib.platform.ShellScriptTask
-
-# Process Tasks
-forget=net.sf.antcontrib.process.ForgetTask
-limit=net.sf.antcontrib.process.Limit
-
-# Property Tasks
-propertycopy=net.sf.antcontrib.property.PropertyCopy
-pathtofileset=net.sf.antcontrib.property.PathToFileSet
-propertyselector=net.sf.antcontrib.property.PropertySelector
-propertyregex=net.sf.antcontrib.property.RegexTask
-sortlist=net.sf.antcontrib.property.SortList
-urlencode=net.sf.antcontrib.property.URLEncodeTask
-var=net.sf.antcontrib.property.Variable
-
-# Walls Tasks
-compilewithwalls=net.sf.antcontrib.walls.CompileWithWalls

Deleted: ant-contrib/trunk/src/main/java/net/sf/antcontrib/antlib.xml
===================================================================
--- ant-contrib/trunk/src/main/java/net/sf/antcontrib/antlib.xml	2007-07-31 03:18:26 UTC (rev 130)
+++ ant-contrib/trunk/src/main/java/net/sf/antcontrib/antlib.xml	2007-07-31 03:22:55 UTC (rev 131)
@@ -1,48 +0,0 @@
-<antlib>
-    <!-- typedef the tasks that work for ant less than 1.6 -->
-    <taskdef resource="net/sf/antcontrib/antcontrib.properties"/>
-
-    <taskdef
-        name="for"
-        classname="net.sf.antcontrib.logic.ForTask"
-        onerror="ignore"/>
-        
-    <typedef
-        name="httpState"
-        classname="net.sf.antcontrib.net.httpclient.HttpStateType"
-        onerror="ignore" />
-    <typedef
-        name="httpClient"
-        classname="net.sf.antcontrib.net.httpclient.HttpClientType"
-        onerror="ignore" />        
-    <taskdef name="getCookie"
-        classname="net.sf.antcontrib.net.httpclient.GetCookieTask"
-        onerror="ignore" />
-    <taskdef name="addCookie"
-        classname="net.sf.antcontrib.net.httpclient.AddCookieTask"
-        onerror="ignore" />
-    <taskdef name="clearCookies"
-        classname="net.sf.antcontrib.net.httpclient.ClearCookiesTask"
-        onerror="ignore" />
-    <taskdef name="addCredentials"
-        classname="net.sf.antcontrib.net.httpclient.AddCredentialsTask"
-        onerror="ignore" />
-    <taskdef name="clearCredentials"
-        classname="net.sf.antcontrib.net.httpclient.ClearCredentialsTask"
-        onerror="ignore" />
-    <taskdef name="purgeExpiredCookies"
-        classname="net.sf.antcontrib.net.httpclient.PurgeExpiredCookiesTask"
-        onerror="ignore" />
-    <taskdef name="postMethod"
-        classname="net.sf.antcontrib.net.httpclient.PostMethodTask"
-        onerror="ignore" />
-    <taskdef name="getMethod"
-        classname="net.sf.antcontrib.net.httpclient.GetMethodTask"
-        onerror="ignore" />
-    <taskdef name="headMethod"
-        classname="net.sf.antcontrib.net.httpclient.HeadMethodTask"
-        onerror="ignore" />
-    <taskdef name="importurl"
-             classname="net.sf.antcontrib.net.URLImportTask"
-             onerror="ignore"/>
-</antlib>

Copied: ant-contrib/trunk/src/main/resources/net/sf/antcontrib/antcontrib.properties (from rev 130, ant-contrib/trunk/src/main/java/net/sf/antcontrib/antcontrib.properties)
===================================================================
--- ant-contrib/trunk/src/main/resources/net/sf/antcontrib/antcontrib.properties	                        (rev 0)
+++ ant-contrib/trunk/src/main/resources/net/sf/antcontrib/antcontrib.properties	2007-07-31 03:22:55 UTC (rev 131)
@@ -0,0 +1,56 @@
+
+# Antclipse tasks
+antclipse=net.sf.antcontrib.antclipse.ClassPathTask
+
+# AntServer tasks
+antserver=net.sf.antcontrib.antserver.server.ServerTask
+remoteant=net.sf.antcontrib.antserver.client.ClientTask
+
+# Design Tasks
+verifydesign=net.sf.antcontrib.design.VerifyDesign
+
+# IniFile
+inifile=net.sf.antcontrib.inifile.IniFileTask
+
+# Logic tasks
+if=net.sf.antcontrib.logic.IfTask
+foreach=net.sf.antcontrib.logic.ForEach
+throw=net.sf.antcontrib.logic.Throw
+trycatch=net.sf.antcontrib.logic.TryCatchTask
+switch=net.sf.antcontrib.logic.Switch
+outofdate=net.sf.antcontrib.logic.OutOfDate
+runtarget=net.sf.antcontrib.logic.RunTargetTask
+timestampselector=net.sf.antcontrib.logic.TimestampSelector
+antcallback=net.sf.antcontrib.logic.AntCallBack
+antfetch=net.sf.antcontrib.logic.AntFetch
+assert=net.sf.antcontrib.logic.Assert
+relentless=net.sf.antcontrib.logic.Relentless
+
+# Math Tasks
+math=net.sf.antcontrib.math.MathTask
+
+# Net tasks
+post=net.sf.antcontrib.net.PostTask
+
+# Peformance Tasks
+stopwatch=net.sf.antcontrib.perf.StopWatchTask
+
+# Platform Tasks
+osfamily=net.sf.antcontrib.platform.OsFamily
+shellscript=net.sf.antcontrib.platform.ShellScriptTask
+
+# Process Tasks
+forget=net.sf.antcontrib.process.ForgetTask
+limit=net.sf.antcontrib.process.Limit
+
+# Property Tasks
+propertycopy=net.sf.antcontrib.property.PropertyCopy
+pathtofileset=net.sf.antcontrib.property.PathToFileSet
+propertyselector=net.sf.antcontrib.property.PropertySelector
+propertyregex=net.sf.antcontrib.property.RegexTask
+sortlist=net.sf.antcontrib.property.SortList
+urlencode=net.sf.antcontrib.property.URLEncodeTask
+var=net.sf.antcontrib.property.Variable
+
+# Walls Tasks
+compilewithwalls=net.sf.antcontrib.walls.CompileWithWalls

Copied: ant-contrib/trunk/src/main/resources/net/sf/antcontrib/antlib.xml (from rev 130, ant-contrib/trunk/src/main/java/net/sf/antcontrib/antlib.xml)
===================================================================
--- ant-contrib/trunk/src/main/resources/net/sf/antcontrib/antlib.xml	                        (rev 0)
+++ ant-contrib/trunk/src/main/resources/net/sf/antcontrib/antlib.xml	2007-07-31 03:22:55 UTC (rev 131)
@@ -0,0 +1,48 @@
+<antlib>
+    <!-- typedef the tasks that work for ant less than 1.6 -->
+    <taskdef resource="net/sf/antcontrib/antcontrib.properties"/>
+
+    <taskdef
+        name="for"
+        classname="net.sf.antcontrib.logic.ForTask"
+        onerror="ignore"/>
+        
+    <typedef
+        name="httpState"
+        classname="net.sf.antcontrib.net.httpclient.HttpStateType"
+        onerror="ignore" />
+    <typedef
+        name="httpClient"
+        classname="net.sf.antcontrib.net.httpclient.HttpClientType"
+        onerror="ignore" />        
+    <taskdef name="getCookie"
+        classname="net.sf.antcontrib.net.httpclient.GetCookieTask"
+        onerror="ignore" />
+    <taskdef name="addCookie"
+        classname="net.sf.antcontrib.net.httpclient.AddCookieTask"
+        onerror="ignore" />
+    <taskdef name="clearCookies"
+        classname="net.sf.antcontrib.net.httpclient.ClearCookiesTask"
+        onerror="ignore" />
+    <taskdef name="addCredentials"
+        classname="net.sf.antcontrib.net.httpclient.AddCredentialsTask"
+        onerror="ignore" />
+    <taskdef name="clearCredentials"
+        classname="net.sf.antcontrib.net.httpclient.ClearCredentialsTask"
+        onerror="ignore" />
+    <taskdef name="purgeExpiredCookies"
+        classname="net.sf.antcontrib.net.httpclient.PurgeExpiredCookiesTask"
+        onerror="ignore" />
+    <taskdef name="postMethod"
+        classname="net.sf.antcontrib.net.httpclient.PostMethodTask"
+        onerror="ignore" />
+    <taskdef name="getMethod"
+        classname="net.sf.antcontrib.net.httpclient.GetMethodTask"
+        onerror="ignore" />
+    <taskdef name="headMethod"
+        classname="net.sf.antcontrib.net.httpclient.HeadMethodTask"
+        onerror="ignore" />
+    <taskdef name="importurl"
+             classname="net.sf.antcontrib.net.URLImportTask"
+             onerror="ignore"/>
+</antlib>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/