summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpeterkittreilly <[email protected]>2006-10-08 21:13:53 +0000
committerpeterkittreilly <[email protected]>2006-10-08 21:13:53 +0000
commit95e3c277acff9cf454a3842042b9f859731e338b (patch)
tree6e313bc5e4aee1007ed96d73a34d854730b76d83
parent3ca3ee55f5e37e17222c2e3865950554c8c87671 (diff)
1) move importurl from properties to antlib.xml as
it depends on another jar file - ivy 2) change the onerror flag from report to ignore. Report will cause warnings even if the build file does not use the task, ignore (despite its name) will warn when the build build tries to use the task. git-svn-id: file:///home/sven/projects/JOGL/temp/ant-contrib/svn/ant-contrib-code/trunk/ant-contrib@49 32d7a393-a5a9-423c-abd3-5d954feb1f2f
-rw-r--r--src/java/net/sf/antcontrib/antcontrib.properties1
-rw-r--r--src/java/net/sf/antcontrib/antlib.xml73
2 files changed, 38 insertions, 36 deletions
diff --git a/src/java/net/sf/antcontrib/antcontrib.properties b/src/java/net/sf/antcontrib/antcontrib.properties
index 6544999..b42b4ec 100644
--- a/src/java/net/sf/antcontrib/antcontrib.properties
+++ b/src/java/net/sf/antcontrib/antcontrib.properties
@@ -31,7 +31,6 @@ math=net.sf.antcontrib.math.MathTask
# Net tasks
post=net.sf.antcontrib.net.PostTask
-importurl=net.sf.antcontrib.net.URLImportTask
# Peformance Tasks
stopwatch=net.sf.antcontrib.perf.StopWatchTask
diff --git a/src/java/net/sf/antcontrib/antlib.xml b/src/java/net/sf/antcontrib/antlib.xml
index d002682..203b12e 100644
--- a/src/java/net/sf/antcontrib/antlib.xml
+++ b/src/java/net/sf/antcontrib/antlib.xml
@@ -5,41 +5,44 @@
<taskdef
name="for"
classname="net.sf.antcontrib.logic.ForTask"
- onerror="report"/>
-
- <typedef
- name="httpState"
- classname="net.sf.antcontrib.net.httpclient.HttpStateType"
- onerror="report" />
- <typedef
- name="httpClient"
- classname="net.sf.antcontrib.net.httpclient.HttpClientType"
- onerror="report" />
+ 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="report" />
- <taskdef name="addCookie"
- classname="net.sf.antcontrib.net.httpclient.AddCookieTask"
- onerror="report" />
- <taskdef name="clearCookies"
- classname="net.sf.antcontrib.net.httpclient.ClearCookiesTask"
- onerror="report" />
- <taskdef name="addCredentials"
- classname="net.sf.antcontrib.net.httpclient.AddCredentialsTask"
- onerror="report" />
- <taskdef name="clearCredentials"
- classname="net.sf.antcontrib.net.httpclient.ClearCredentialsTask"
- onerror="report" />
- <taskdef name="purgeExpiredCookies"
- classname="net.sf.antcontrib.net.httpclient.PurgeExpiredCookiesTask"
- onerror="report" />
- <taskdef name="postMethod"
- classname="net.sf.antcontrib.net.httpclient.PostMethodTask"
- onerror="report" />
- <taskdef name="getMethod"
- classname="net.sf.antcontrib.net.httpclient.GetMethodTask"
- onerror="report" />
- <taskdef name="headMethod"
- classname="net.sf.antcontrib.net.httpclient.HeadMethodTask"
- onerror="report" />
+ 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>