]>
Commit | Line | Data |
---|---|---|
03210f6d | 1 | --- extras.xml.orig 2011-02-02 20:07:31.000000000 +0100 |
2 | +++ extras.xml 2011-02-04 20:28:23.759726852 +0100 | |
3 | @@ -108,44 +108,7 @@ | |
4 | <delete dir="${tomcat.extras}"/> | |
5 | </target> | |
c9bd99e6 | 6 | |
03210f6d | 7 | - <target name="commons-logging-prepare" |
8 | - depends="prepare" | |
9 | - description="Prepare to build web services extras package"> | |
10 | - | |
c9bd99e6 | 11 | - <antcall target="downloadfile"> |
12 | - <param name="sourcefile" value="${commons-logging-src.loc}"/> | |
03210f6d | 13 | - <param name="destfile" value="${commons-logging-src.tar.gz}"/> |
14 | - <param name="destdir" value="${commons-logging.home}"/> | |
15 | - </antcall> | |
16 | - | |
17 | - <antcall target="downloadfile"> | |
18 | - <param name="sourcefile" value="${avalon-framework.loc}"/> | |
19 | - <param name="destfile" value="${avalon-framework.jar}"/> | |
20 | - <param name="destdir" value="${avalon-framework.home}"/> | |
21 | - </antcall> | |
22 | - | |
23 | - <antcall target="downloadfile"> | |
24 | - <param name="sourcefile" value="${log4j.loc}"/> | |
25 | - <param name="destfile" value="${log4j.jar}"/> | |
26 | - <param name="destdir" value="${log4j.home}"/> | |
27 | - </antcall> | |
28 | - | |
29 | - <antcall target="downloadfile"> | |
30 | - <param name="sourcefile" value="${logkit.loc}"/> | |
31 | - <param name="destfile" value="${logkit.jar}"/> | |
32 | - <param name="destdir" value="${logkit.home}"/> | |
33 | - </antcall> | |
34 | - | |
35 | - <antcall target="downloadfile"> | |
36 | - <param name="sourcefile" value="${servletapi.loc}"/> | |
37 | - <param name="destfile" value="${servletapi.jar}"/> | |
38 | - <param name="destdir" value="${servletapi.home}"/> | |
c9bd99e6 | 39 | - </antcall> |
03210f6d | 40 | - |
41 | - </target> | |
42 | - | |
43 | <target name="commons-logging" | |
44 | - depends="commons-logging-prepare" | |
45 | description="Build JULI for log4j extras package"> | |
c9bd99e6 | 46 | |
03210f6d | 47 | <gunzip src="${commons-logging-src.tar.gz}" |
48 | @@ -236,18 +199,6 @@ | |
49 | depends="prepare" | |
50 | description="Prepare to build web services extras package"> | |
c9bd99e6 | 51 | |
52 | - <antcall target="downloadfile"> | |
03210f6d | 53 | - <param name="sourcefile" value="${jaxrpc-lib.loc}"/> |
54 | - <param name="destfile" value="${jaxrpc-lib.jar}"/> | |
55 | - <param name="destdir" value="${jaxrpc-lib.home}"/> | |
c9bd99e6 | 56 | - </antcall> |
57 | - | |
58 | - <antcall target="downloadfile"> | |
03210f6d | 59 | - <param name="sourcefile" value="${wsdl4j-lib.loc}"/> |
60 | - <param name="destfile" value="${wsdl4j-lib.jar}"/> | |
61 | - <param name="destdir" value="${wsdl4j-lib.home}"/> | |
c9bd99e6 | 62 | - </antcall> |
63 | - | |
03210f6d | 64 | <copy file="${jaxrpc-lib.jar}" |
65 | tofile="${tomcat.extras}/webservices/jaxrpc.jar" /> | |
66 | <copy file="${wsdl4j-lib.jar}" | |
67 | @@ -326,25 +277,11 @@ | |
68 | </condition> | |
69 | </target> | |
70 | ||
71 | - <target name="setproxy" depends="proxyflags" if="useproxy"> | |
72 | - <taskdef name="setproxy" | |
73 | - classname="org.apache.tools.ant.taskdefs.optional.net.SetProxy" /> | |
74 | - <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" | |
75 | - proxyuser="${proxy.user}" proxypassword="${proxy.password}" /> | |
76 | - <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/> | |
77 | - </target> | |
78 | - | |
79 | <target name="testexist"> | |
80 | <echo message="Testing for ${destfile}"/> | |
81 | <available file="${destfile}" property="exist"/> | |
82 | </target> | |
83 | ||
84 | - <target name="downloadfile" unless="exist" depends="setproxy,testexist"> | |
85 | - <!-- Download extract the file --> | |
86 | - <mkdir dir="${destdir}" /> | |
87 | - <get src="${sourcefile}" dest="${destfile}" /> | |
88 | - </target> | |
89 | - | |
90 | <!-- Helper target, used to create a md5 checksum file --> | |
91 | <!-- Requires 'file' as a parameter. --> | |
92 | <target name="md5sum"> | |
93 | --- extras.xml~ 2011-02-04 20:30:36.817322838 +0100 | |
94 | +++ extras.xml 2011-02-04 20:48:43.431125625 +0100 | |
95 | @@ -195,18 +195,7 @@ | |
96 | </antcall> | |
97 | </target> | |
98 | ||
99 | - <target name="webservices-prepare" | |
100 | - depends="prepare" | |
101 | - description="Prepare to build web services extras package"> | |
102 | - | |
103 | - <copy file="${jaxrpc-lib.jar}" | |
104 | - tofile="${tomcat.extras}/webservices/jaxrpc.jar" /> | |
105 | - <copy file="${wsdl4j-lib.jar}" | |
106 | - tofile="${tomcat.extras}/webservices/wsdl4j.jar" /> | |
107 | - </target> | |
108 | - | |
109 | <target name="webservices" | |
110 | - depends="webservices-prepare" | |
111 | description="Build web services extras package"> | |
112 | ||
c9bd99e6 | 113 | <!-- Classpath --> |