From cb05ee2e1655946250517f0188d441761adf730d Mon Sep 17 00:00:00 2001
From: "bernd.ruecker" <bernd.ruecker@51b7ce9a-3489-0410-86de-dc9a27cf12c7>
Date: Mon, 25 Oct 2010 18:46:50 +0000
Subject: [PATCH] moved cycle.jar into lib folder, otherwise there is a NPE in
 ant demo.setup (strange!)

---
 distro/build.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/distro/build.xml b/distro/build.xml
index d16f348112..1208aa067d 100644
--- a/distro/build.xml
+++ b/distro/build.xml
@@ -78,10 +78,12 @@
         <include name="activiti-spring-*.jar"/>
       </fileset>
     	<!--added to copy activiti-cycle-*.jar
+    	  we have to include it, otherwise we get a NPE in the ant setup (why??)
+    	-->
         <fileset dir="../modules/activiti-cycle/target">
           <include name="activiti-cycle-*.jar"/>
         </fileset>
-        -->
+        
     </copy>
       	
     <mkdir dir="${target.distro.root}/setup/files/webapps/activiti-probe.war" />
@@ -116,7 +118,9 @@
     <!-- Copy activiti-cycle, spring-surf and xstream jars to lib directory of activiti-rest -->
     <copy todir="${target.distro.root}/setup/files/webapps/activiti-rest.war/WEB-INF/lib">
     	<fileset dir="../modules/activiti-cycle/target">
+    	  <!-- exlude it, since it must be copied into the lib directory (see above)
     		<include name="activiti-cycle-*.jar"/>
+    		-->
     		<include name="spring-surf-*.jar"/>
     	</fileset>
     	<fileset dir="../modules/activiti-webapp-rest/target/activiti-webapp-rest-${activiti.version}/WEB-INF/lib/">
-- 
GitLab