zkwebui now deployable again in standard deployment

https://sourceforge.net/tracker/?func=detail&aid=2700937&group_id=176962&atid=879334
This commit is contained in:
joergviola 2010-05-06 17:56:57 +00:00
parent e8c554fb89
commit c499e73fb1
6 changed files with 38 additions and 3 deletions

View File

@ -1,4 +1,4 @@
source.JasperReports.jar = src/
source.JasperReports.jar = src/, build/
bin.includes = META-INF/,\
lib/postgresql.jar,\
lib/ocrs12.jar,\

View File

@ -70,6 +70,14 @@ the following responsibilities:
</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}"/>
<copy overwrite="true" todir="${dist-webstart}" >

View File

@ -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 -->

View File

@ -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">

View File

@ -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">

View File

@ -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,\