1 |
caster 09/11/01 23:06:46 |
2 |
|
3 |
Added: axis-1.4-targets.xml.patch |
4 |
axis-1.4-path_refs.xml.patch |
5 |
axis-1.4-tools-build.xml.patch build.properties |
6 |
axis-1.4-build.xml.patch |
7 |
Log: |
8 |
Version bump, bug #268603. |
9 |
(Portage version: 2.2_rc46/cvs/Linux x86_64) |
10 |
|
11 |
Revision Changes Path |
12 |
1.1 www-servers/axis/files/axis-1.4-targets.xml.patch |
13 |
|
14 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/axis/files/axis-1.4-targets.xml.patch?rev=1.1&view=markup |
15 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/axis/files/axis-1.4-targets.xml.patch?rev=1.1&content-type=text/plain |
16 |
|
17 |
Index: axis-1.4-targets.xml.patch |
18 |
=================================================================== |
19 |
--- xmls/targets.xml.orig 2006-10-01 15:08:41.000000000 +0200 |
20 |
+++ xmls/targets.xml 2006-10-01 15:14:27.000000000 +0200 |
21 |
@@ -84,6 +84,7 @@ |
22 |
<mkdir dir="${build.lib}"/> |
23 |
<mkdir dir="${build.dir}/work"/> |
24 |
|
25 |
+ <!-- |
26 |
<available property="servlet.present" |
27 |
classname="javax.servlet.Servlet" |
28 |
classpathref="classpath"/> |
29 |
@@ -135,18 +136,18 @@ |
30 |
<available property="httpunit.present" |
31 |
classname="com.meterware.httpunit.GetMethodWebRequest" |
32 |
classpathref="classpath"/> |
33 |
- |
34 |
+ --> |
35 |
<available property="jsse.present" |
36 |
classname="javax.net.ssl.SSLSocketFactory" |
37 |
classpathref="classpath"/> |
38 |
- |
39 |
+ <!-- |
40 |
<condition property="jetty.present" > |
41 |
<and> |
42 |
<available classname="javax.servlet.Servlet" classpathref="classpath" /> |
43 |
<available classname="org.mortbay.http.HttpServer" classpathref="classpath" /> |
44 |
</and> |
45 |
</condition> |
46 |
- |
47 |
+ --> |
48 |
<condition property="jdk14.jsse.present" > |
49 |
<and> |
50 |
<available classname="javax.net.ssl.X509TrustManager" classpathref="classpath" /> |
51 |
@@ -185,7 +186,7 @@ |
52 |
<condition property="sun.codec.present" > |
53 |
<available classname="sun.awt.image.codec.JPEGImageEncoderImpl" classpathref="classpath" /> |
54 |
</condition> |
55 |
- |
56 |
+ <!-- |
57 |
<condition property="jimi.present" > |
58 |
<available classname="com.sun.jimi.core.Jimi" classpathref="classpath" /> |
59 |
</condition> |
60 |
@@ -193,7 +194,7 @@ |
61 |
<condition property="merlinio.present" > |
62 |
<available classname="javax.imageio.ImageIO" classpathref="classpath" /> |
63 |
</condition> |
64 |
- |
65 |
+ --> |
66 |
<condition property="axis-ant.present" > |
67 |
<available classname="org.apache.axis.tools.ant.foreach.ForeachTask"> |
68 |
<classpath> |
69 |
@@ -201,7 +202,7 @@ |
70 |
</classpath> |
71 |
</available> |
72 |
</condition> |
73 |
- |
74 |
+ <!-- |
75 |
<condition property="jimiAndAttachments.present"> |
76 |
<and> |
77 |
<available classname="javax.activation.DataHandler" classpathref="classpath" /> |
78 |
@@ -220,7 +221,7 @@ |
79 |
<available classname="progress.message.jclient.Message" classpathref="classpath" /> |
80 |
</and> |
81 |
</condition> |
82 |
- |
83 |
+ --> |
84 |
<available property="post-compile.present" file="post-compile.xml" /> |
85 |
|
86 |
<property environment="env"/> |
87 |
@@ -229,7 +230,7 @@ |
88 |
<equals arg1="on" arg2="${env.debug}"/> |
89 |
</and> |
90 |
</condition> |
91 |
- |
92 |
+ <!-- |
93 |
<condition property="castor.present" > |
94 |
<available classname="org.exolab.castor.xml.MarshalException" classpathref="classpath" /> |
95 |
</condition> |
96 |
@@ -248,7 +249,7 @@ |
97 |
<condition property="combridge.present" > |
98 |
<available classname="org.apache.axis.components.bridge.COMBridge" classpathref="classpath" /> |
99 |
</condition> |
100 |
- |
101 |
+ --> |
102 |
<!-- look for WSDL support on the platform --> |
103 |
<condition property="wsdl.found"> |
104 |
<or> |
105 |
|
106 |
|
107 |
|
108 |
1.1 www-servers/axis/files/axis-1.4-path_refs.xml.patch |
109 |
|
110 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/axis/files/axis-1.4-path_refs.xml.patch?rev=1.1&view=markup |
111 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/axis/files/axis-1.4-path_refs.xml.patch?rev=1.1&content-type=text/plain |
112 |
|
113 |
Index: axis-1.4-path_refs.xml.patch |
114 |
=================================================================== |
115 |
--- xmls/path_refs.xml.orig 2006-04-23 03:56:52.000000000 +0200 |
116 |
+++ xmls/path_refs.xml 2006-10-01 15:31:34.000000000 +0200 |
117 |
@@ -1,4 +1,5 @@ |
118 |
<path id="classpath"> |
119 |
+ <!-- |
120 |
<pathelement location="${xercesImpl.jar}"/> |
121 |
<pathelement location="${xmlParserAPIs.jar}"/> |
122 |
<pathelement location="${xalan.jar}"/> |
123 |
@@ -14,10 +15,10 @@ |
124 |
<pathelement location="${j2ee.jar}"/> |
125 |
<pathelement location="${junit.jar}"/> |
126 |
<pathelement location="${servlet.jar}"/> |
127 |
+ --> |
128 |
<fileset dir="${lib.dir}"> |
129 |
<include name="**/*.jar"/> |
130 |
</fileset> |
131 |
- <pathelement path="${java.class.path}"/> |
132 |
<pathelement location="${build.dest}" /> |
133 |
<pathelement location="${build.dir}/tools" /> |
134 |
<pathelement location="${build.lib}/axis-ant.jar" /> |
135 |
|
136 |
|
137 |
|
138 |
1.1 www-servers/axis/files/axis-1.4-tools-build.xml.patch |
139 |
|
140 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/axis/files/axis-1.4-tools-build.xml.patch?rev=1.1&view=markup |
141 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/axis/files/axis-1.4-tools-build.xml.patch?rev=1.1&content-type=text/plain |
142 |
|
143 |
Index: axis-1.4-tools-build.xml.patch |
144 |
=================================================================== |
145 |
--- tools/build.xml.orig 2006-10-02 10:18:43.000000000 +0200 |
146 |
+++ tools/build.xml 2006-10-02 10:21:34.000000000 +0200 |
147 |
@@ -66,6 +66,7 @@ |
148 |
<javac srcdir="${tools.dir}" |
149 |
debug="${debug}" |
150 |
source="${source}" |
151 |
+ target="${target}" |
152 |
nowarn="${nowarn}" |
153 |
destdir="${tools.build.dir}"> |
154 |
<classpath refid="classpath"/> |
155 |
@@ -77,6 +78,7 @@ |
156 |
<javac srcdir="${tools.dir}" |
157 |
debug="${debug}" |
158 |
source="${source}" |
159 |
+ target="${target}" |
160 |
nowarn="${nowarn}" |
161 |
destdir="${tools.build.dir}"> |
162 |
<classpath refid="classpath"/> |
163 |
@@ -88,6 +90,7 @@ |
164 |
<javac srcdir="${tools.dir}" |
165 |
debug="${debug}" |
166 |
source="${source}" |
167 |
+ target="${target}" |
168 |
nowarn="${nowarn}" |
169 |
destdir="${tools.build.dir}"> |
170 |
<classpath> |
171 |
|
172 |
|
173 |
|
174 |
1.1 www-servers/axis/files/build.properties |
175 |
|
176 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/axis/files/build.properties?rev=1.1&view=markup |
177 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/axis/files/build.properties?rev=1.1&content-type=text/plain |
178 |
|
179 |
Index: build.properties |
180 |
=================================================================== |
181 |
source=1.4 |
182 |
target=1.4 |
183 |
|
184 |
activation.present=true |
185 |
commons-discovery.present=true |
186 |
commons-logging.present=true |
187 |
wsdl4j.present=true |
188 |
mailapi.present=true |
189 |
|
190 |
bsf.present=true |
191 |
castor.present=true |
192 |
commons-httpclient.present=true |
193 |
commons-net.present=true |
194 |
jimi.present=true |
195 |
servlet.present=true |
196 |
|
197 |
|
198 |
|
199 |
1.1 www-servers/axis/files/axis-1.4-build.xml.patch |
200 |
|
201 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/axis/files/axis-1.4-build.xml.patch?rev=1.1&view=markup |
202 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/axis/files/axis-1.4-build.xml.patch?rev=1.1&content-type=text/plain |
203 |
|
204 |
Index: axis-1.4-build.xml.patch |
205 |
=================================================================== |
206 |
--- build.xml.orig 2006-04-23 03:57:27.000000000 +0200 |
207 |
+++ build.xml 2006-10-01 21:18:20.000000000 +0200 |
208 |
@@ -223,10 +223,12 @@ |
209 |
</section> |
210 |
</manifest> |
211 |
</jar> |
212 |
+ <!-- |
213 |
<copy file="${wsdl4j.jar}" toDir="${build.lib}"/> |
214 |
<copy file="${commons-logging.jar}" toDir="${build.lib}"/> |
215 |
<copy file="${commons-discovery.jar}" toDir="${build.lib}"/> |
216 |
<copy file="${log4j-core.jar}" toDir="${build.lib}"/> |
217 |
+ --> |
218 |
<copy file="${src.dir}/log4j.properties" |
219 |
toDir="${build.lib}"/> |