Skip to content

Commit 651ac2a

Browse files
committed
Fix ant debug developer target. The excluded jars in /usr/local/apache-tomcat-6.0.32/lib either conflict with the ones in awsapi webapp or the slf4j jars cause an infinite class loading loop
1 parent 537c29c commit 651ac2a

2 files changed

Lines changed: 7 additions & 1 deletion

File tree

build/build-aws-api.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,11 @@
171171
</jar>
172172
</target>
173173
<target name="deploy-axis" depends="-init-awsapi">
174-
<unwar overwrite="true" src="${base.dir}/deps/awsapi-lib/axis2-webapp-1.5.1.war" dest="${server.deploy.to.dir}/webapps7080/awsapi" />
174+
<unwar overwrite="true" src="${base.dir}/deps/awsapi-lib/axis2-webapp-1.5.1.war" dest="${server.deploy.to.dir}/webapps7080/awsapi" >
175+
<patternset>
176+
<exclude name="WEB-INF/lib/log4j-1.2.15.jar"/>
177+
</patternset>
178+
</unwar>
175179
</target>
176180
<condition property="access_key.private.notpresent">
177181
<not>

build/developer.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,8 @@
186186
<fileset dir="${deps.dir}/">
187187
<include name="*.jar"/>
188188
<exclude name="servlet*.jar"/>
189+
<exclude name="axis2*.jar"/>
190+
<exclude name="*slf4j*.jar"/>
189191
</fileset>
190192
</copy>
191193
<touch file="${server.deploy.to.dir}/webapps/client/WEB-INF/lib/scripts/vm/hypervisor/xenserver/version"/>

0 commit comments

Comments
 (0)