modify build for osgi base deployment.

utils_dev/build.properties

@@ -6,5 +6,4 @@ env.ADEMPIERE_VERSION=ADempiere
 env.ADEMPIERE_VERSION_FILE=400pr01
 env.ADEMPIERE_VENDOR=ADempiere
 env.ENCODING=UTF-8
-env.XDOCLET_HOME=${env.ADEMPIERE_SOURCE}/tools
 env.ADEMPIERE_ENV=Y

utils_dev/build.xml

@@ -15,6 +15,11 @@
 		<echo message="=========== Build Adempiere - ${env.ENCODING}"/>
 		<!-- Create the time stamp -->
 		<tstamp/>
+		<delete>
+	   		<fileset dir="lib/plugins">
+				<include name="*.jar"/>
+			</fileset>
+	   	</delete>
 	</target>
 	<target name="jar" depends="init">
 		<ant inheritAll="false" dir="tools"/>
@@ -22,16 +27,13 @@
 		<ant inheritAll="false" dir="extend"/>
 		<ant inheritAll="false" dir="client"/>
 		<ant inheritAll="false" dir="JasperReports"/>
-		<ant inheritAll="false" dir="JasperReportsWebApp"/>
+		<ant inheritAll="false" dir="JasperReportsTools"/>
 		<ant inheritAll="false" dir="serverRoot"/>
 		<ant inheritAll="false" dir="serverApps"/>
 		<ant inheritAll="false" dir="webStore"/>
-		<ant inheritAll="false" dir="webCM"/>
-		<ant inheritAll="false" dir="sqlj"/>
-		<ant inheritAll="false" dir="posterita/posterita"/>
 		<ant inheritAll="false" dir="zkwebui"/>
 	</target>
-	<target name="build" depends="plugins">
+	<target name="build" depends="jar">
 		<ant inheritAll="false" dir="install"/>
 	</target>
 
@@ -40,14 +42,10 @@
 		<ant inheritAll="false" dir="base" target="clean"/>
 		<ant inheritAll="false" dir="extend" target="clean"/>
 		<ant inheritAll="false" dir="JasperReports" target="clean"/>
-		<ant inheritAll="false" dir="JasperReportsWebApp" target="clean"/>
 		<ant inheritAll="false" dir="client" target="clean"/>
 		<ant inheritAll="false" dir="serverRoot" target="clean"/>
 		<ant inheritAll="false" dir="serverApps" target="clean"/>
 		<ant inheritAll="false" dir="webStore" target="clean"/>
-		<ant inheritAll="false" dir="webCM" target="clean"/>
-		<ant inheritAll="false" dir="sqlj" target="clean"/>
-		<ant inheritAll="false" dir="posterita/posterita" target="clean"/>
 		<ant inheritAll="false" dir="install" target="clean"/>
 		<ant inheritAll="false" dir="zkwebui" target="clean"/>
 	</target>
@@ -96,22 +94,6 @@
 	<!-- ================================================ -->
 	<!-- Adempiere OSGi Update                            -->
 	<!-- ================================================ -->
-	  <target name="plugin">
-		<buildPlugin workspaceDirectory=".."
-		             projectName="${plugin}"
-		             targetPlatformId="target.platform"
-		             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">
 		<ant4eclipse:executeProjectSet workspaceDirectory=".." allWorkspaceProjects="true">
 			<ant4eclipse:forEachProject filter="(executeProjectSet.org.eclipse.pde.PluginNature=*)">

utils_dev/properties.xml

@@ -11,8 +11,8 @@
 
     <dirname property="adempiere.base" file="${ant.file.properties}/.."/>
     <property file="${user.home}/.adempiere.properties"/>
-    <property file="${adempiere.base}/utils_dev/mybuild.properties"/>
     <property file="${adempiere.base}/utils_dev/build.properties"/>
+	<property file="${adempiere.base}/utils_dev/mybuild.properties"/>
 
     <!-- Here we could add most common buildpaths -->
 
@@ -32,8 +32,6 @@
 
 	<ant4eclipse:targetPlatform id="target.platform">
 		<location dir="${workspace}/equinox-target/plugins" />
-		<location dir="${workspace}/equinox-target/webapp/plugins" />
-		<location dir="${workspace}/equinox-target/jetty/plugins" />
 		<location dir="${workspace}/equinox-target/spring/plugins" />
 	</ant4eclipse:targetPlatform>
 </project>