From 5a1800e47c5489911bb4235c7b73967e3d2362b1 Mon Sep 17 00:00:00 2001
From: Arik Hadas <arik.hadas@openu.ac.il>
Date: Fri, 13 Mar 2015 18:06:42 +0200
Subject: [PATCH] add apache commons-collections into ejp's weaver so
 pointcutargs will work in Eclipse

---
 build.xml         | 13 +++++++++++++
 ejp_compile.scrpt |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index c2e3810..8863ef3 100644
--- a/build.xml
+++ b/build.xml
@@ -94,6 +94,19 @@
                         </manifest>
                 </jar>
 
+                <if>
+                        <isset property="deps"/>
+                        <then>
+                                <for list="${deps}" param="dep">
+                                        <sequential>
+                                                <jar destfile="dist/awesome_weaver.jar" update="yes">
+						         <zipfileset src="@{dep}"/>
+                                                </jar>
+                                        </sequential>
+                                </for>
+                        </then>
+                </if>
+
                 <copy file="dist/awesome_weaver.jar" tofile="dist/org.aspectj.weaver_1.7.3.20130613144500-a.jar"/>
 	</target>
 
diff --git a/ejp_compile.scrpt b/ejp_compile.scrpt
index 5a6de88..ebb1c00 100755
--- a/ejp_compile.scrpt
+++ b/ejp_compile.scrpt
@@ -1,4 +1,4 @@
 ant clean
 ant tools -Ddeps=libs/strategoxt.jar -Dfrontends=ejpf/target/ejpf-1.0-SNAPSHOT.jar
-ant weaver -Dmechanisms=ejpm/target/ejpm-1.0-SNAPSHOT.jar,aspectjm/target/aspectjm-1.0-SNAPSHOT.jar
+ant weaver -Dmechanisms=ejpm/target/ejpm-1.0-SNAPSHOT.jar,aspectjm/target/aspectjm-1.0-SNAPSHOT.jar -Ddeps=libs/commons-collections-3.2.1.jar
 ant runtime -Dmechanisms=ejpm/target/ejpm-1.0-SNAPSHOT.jar