mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
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
This commit is contained in:
parent
537c29c2fa
commit
651ac2a83b
@ -171,7 +171,11 @@
|
|||||||
</jar>
|
</jar>
|
||||||
</target>
|
</target>
|
||||||
<target name="deploy-axis" depends="-init-awsapi">
|
<target name="deploy-axis" depends="-init-awsapi">
|
||||||
<unwar overwrite="true" src="${base.dir}/deps/awsapi-lib/axis2-webapp-1.5.1.war" dest="${server.deploy.to.dir}/webapps7080/awsapi" />
|
<unwar overwrite="true" src="${base.dir}/deps/awsapi-lib/axis2-webapp-1.5.1.war" dest="${server.deploy.to.dir}/webapps7080/awsapi" >
|
||||||
|
<patternset>
|
||||||
|
<exclude name="WEB-INF/lib/log4j-1.2.15.jar"/>
|
||||||
|
</patternset>
|
||||||
|
</unwar>
|
||||||
</target>
|
</target>
|
||||||
<condition property="access_key.private.notpresent">
|
<condition property="access_key.private.notpresent">
|
||||||
<not>
|
<not>
|
||||||
|
|||||||
@ -186,6 +186,8 @@
|
|||||||
<fileset dir="${deps.dir}/">
|
<fileset dir="${deps.dir}/">
|
||||||
<include name="*.jar"/>
|
<include name="*.jar"/>
|
||||||
<exclude name="servlet*.jar"/>
|
<exclude name="servlet*.jar"/>
|
||||||
|
<exclude name="axis2*.jar"/>
|
||||||
|
<exclude name="*slf4j*.jar"/>
|
||||||
</fileset>
|
</fileset>
|
||||||
</copy>
|
</copy>
|
||||||
<touch file="${server.deploy.to.dir}/webapps/client/WEB-INF/lib/scripts/vm/hypervisor/xenserver/version"/>
|
<touch file="${server.deploy.to.dir}/webapps/client/WEB-INF/lib/scripts/vm/hypervisor/xenserver/version"/>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user