From 651ac2a83baae1d5e7af24efa929ca264f655f14 Mon Sep 17 00:00:00 2001
From: Chiradeep Vittal <chiradeep@apache.org>
Date: Wed, 12 Sep 2012 15:50:53 -0700
Subject: [PATCH] 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

---
 build/build-aws-api.xml | 6 +++++-
 build/developer.xml     | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/build/build-aws-api.xml b/build/build-aws-api.xml
index dc9bb00fd4b..d5bf729a9c6 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>
diff --git a/build/developer.xml b/build/developer.xml
index 814a1f34b18..3121813040c 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"/>