From c499e73fb19b06027dbb2b5bac73993a1342af08 Mon Sep 17 00:00:00 2001
From: joergviola <devnull@localhost>
Date: Thu, 6 May 2010 17:56:57 +0000
Subject: [PATCH] zkwebui now deployable again in standard deployment

https://sourceforge.net/tracker/?func=detail&aid=2700937&group_id=176962&atid=879334
---
 JasperReports/build.properties |  2 +-
 equinox-target/build.xml       |  8 ++++++++
 install/Adempiere/build.xml    | 15 ++++++++++++++-
 install/build.xml              |  8 ++++++++
 utils_dev/build.xml            |  7 +++++++
 zkwebui/build.properties       |  1 -
 6 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/JasperReports/build.properties b/JasperReports/build.properties
index 4651ea48f1..e87b6126ed 100644
--- a/JasperReports/build.properties
+++ b/JasperReports/build.properties
@@ -1,4 +1,4 @@
-source.JasperReports.jar = src/
+source.JasperReports.jar = src/, build/
 bin.includes = META-INF/,\
                lib/postgresql.jar,\
                lib/ocrs12.jar,\
diff --git a/equinox-target/build.xml b/equinox-target/build.xml
index 8de1b62c7b..cdfa4c718b 100644
--- a/equinox-target/build.xml
+++ b/equinox-target/build.xml
@@ -69,6 +69,14 @@ the following responsibilities:
 			</fileset>
 		</copy>
 	</target>
+	
+	<target name="war" depends="dist-web">
+		<war destfile="../lib/bridge.war">
+			<fileset dir="${dist-web}">
+				<include name="**/*"/>
+			</fileset>
+		</war>
+	</target>
 
 	<target name="dist-webstart">
 		<mkdir dir="${dist-webstart}"/>
diff --git a/install/Adempiere/build.xml b/install/Adempiere/build.xml
index f2a0d63e77..648fa9b3d4 100644
--- a/install/Adempiere/build.xml
+++ b/install/Adempiere/build.xml
@@ -515,10 +515,23 @@
 	<!-- ==================================================== -->
 	<!-- Setup (Main)                                         -->
 	<!-- ==================================================== -->
-	<target name="setup" depends=""
+	<target name="setup" depends="setupWar"
 		description="Setup Adempiere">
 	</target>
 
+	<!-- ==================================================== -->
+	<!-- Setup (War)                                         -->
+	<!-- ==================================================== -->
+	<target name="setupWar" 
+		description="Setup Adempiere ZK Webui">
+		<unzip src="webapp/bridge.war" dest="webapp/bridge" />
+		<copy todir="webapp/bridge/WEB-INF/eclipse/plugins">
+			<fileset dir="osgi/plugins">
+			    <include name="**/*"/>
+			</fileset>
+		</copy>
+	</target>
+
 
 	<!-- ==================================================== -->
 	<!-- Test - Copy                                          -->
diff --git a/install/build.xml b/install/build.xml
index acda31c8e2..eed7ef889f 100644
--- a/install/build.xml
+++ b/install/build.xml
@@ -197,6 +197,14 @@
 		</fileset>
 	</copy>
   	
+  	<!-- Bridge webapp -->
+	<mkdir dir="${build.dir}/Adempiere/webapp"/>
+	<copy overwrite="true" todir="${build.dir}/Adempiere/webapp" >
+		<fileset dir="../lib">
+			<include name="bridge.war"/>
+		</fileset>
+	</copy>
+  	
 	<!-- Utils Directory		-->
 	<mkdir dir="${build.dir}/Adempiere/utils"/>
 	<copy todir="${build.dir}/Adempiere/utils">
diff --git a/utils_dev/build.xml b/utils_dev/build.xml
index e11afcca25..706d90869a 100644
--- a/utils_dev/build.xml
+++ b/utils_dev/build.xml
@@ -103,6 +103,13 @@
 		             destination="${env.ADEMPIERE_ROOT}/Adempiere/osgi"
 		 			 buildSourceJar="false"
 					 clean="no"/>
+	  	<!-- TODO make this faster -->
+		<buildPlugin workspaceDirectory=".."
+		             projectName="${plugin}"
+		             targetPlatformId="target.platform"
+		             destination="${env.ADEMPIERE_ROOT}/Adempiere/webapp/bridge/WEB-INF/eclipse"
+		 			 buildSourceJar="false"
+					 clean="no"/>
 	  </target>		
 
 	<target name="plugins">
diff --git a/zkwebui/build.properties b/zkwebui/build.properties
index df471ede22..b2ab62524a 100644
--- a/zkwebui/build.properties
+++ b/zkwebui/build.properties
@@ -25,7 +25,6 @@ bin.includes = META-INF/,\
                WEB-INF/lib/ognl.jar,\
                WEB-INF/lib/timelinez-sources.jar,\
                WEB-INF/lib/timeplotz.jar,\
-               WEB-INF/lib/xercesImpl.jar,\
                WEB-INF/lib/zcommon-sources.jar,\
                WEB-INF/lib/zcommons-el.jar,\
                WEB-INF/lib/zhtml-sources.jar,\