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
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/651ac2a8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/651ac2a8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/651ac2a8 Branch: refs/heads/javelin Commit: 651ac2a83baae1d5e7af24efa929ca264f655f14 Parents: 537c29c Author: Chiradeep Vittal <[email protected]> Authored: Wed Sep 12 15:50:53 2012 -0700 Committer: Chiradeep Vittal <[email protected]> Committed: Wed Sep 12 15:51:03 2012 -0700 ---------------------------------------------------------------------- build/build-aws-api.xml | 6 +++++- build/developer.xml | 2 ++ 2 files changed, 7 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/651ac2a8/build/build-aws-api.xml ---------------------------------------------------------------------- diff --git a/build/build-aws-api.xml b/build/build-aws-api.xml index dc9bb00..d5bf729 100644 --- a/build/build-aws-api.xml +++ b/build/build-aws-api.xml @@ -171,7 +171,11 @@ </jar> </target> <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> <condition property="access_key.private.notpresent"> <not> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/651ac2a8/build/developer.xml ---------------------------------------------------------------------- diff --git a/build/developer.xml b/build/developer.xml index 814a1f3..3121813 100755 --- a/build/developer.xml +++ b/build/developer.xml @@ -186,6 +186,8 @@ <fileset dir="${deps.dir}/"> <include name="*.jar"/> <exclude name="servlet*.jar"/> + <exclude name="axis2*.jar"/> + <exclude name="*slf4j*.jar"/> </fileset> </copy> <touch file="${server.deploy.to.dir}/webapps/client/WEB-INF/lib/scripts/vm/hypervisor/xenserver/version"/>
