From 831d0a83f56f6ad7e9d16c8090aca32da83d1ba6 Mon Sep 17 00:00:00 2001
From: Heng Sin Low <hengsin@gmail.com>
Date: Tue, 13 Jul 2010 16:15:53 +0800
Subject: [PATCH] Fixed classpath to depends only on plugin dependency. Modify
 build file for osgi deployment

---
 webStore/.classpath           |  2 ++
 webStore/META-INF/MANIFEST.MF |  2 +-
 webStore/build.xml            | 14 ++++++++------
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/webStore/.classpath b/webStore/.classpath
index 86f32ef0b9..e6d43632b6 100644
--- a/webStore/.classpath
+++ b/webStore/.classpath
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="build"/>
 </classpath>
diff --git a/webStore/META-INF/MANIFEST.MF b/webStore/META-INF/MANIFEST.MF
index e7f7812c81..503a40e6b3 100644
--- a/webStore/META-INF/MANIFEST.MF
+++ b/webStore/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 0.0.0.1
 Require-Bundle: org.eclipse.osgi.services;bundle-version="3.1.100",
  org.eclipse.core.runtime;bundle-version="3.5.0",
  com.springsource.javax.servlet;bundle-version="2.5.0",
- JasperReports;bundle-version="1.0.0",
+ org.adempiere.JasperReports;bundle-version="1.0.0",
  org.adempiere.client;bundle-version="0.0.0",
  org.adempiere.base;bundle-version="0.0.0",
  org.adempiere.tools;bundle-version="0.0.0",
diff --git a/webStore/build.xml b/webStore/build.xml
index 81886bbeca..811ad07d72 100644
--- a/webStore/build.xml
+++ b/webStore/build.xml
@@ -4,7 +4,7 @@
 <!-- ======================================================== -->
 <!-- $Header: /cvs/adempiere/webStore/build.xml,v 1.2 2006/06/10 21:59:22 jjanke Exp $-->
 
-<project name="adempiereWebStore" default="plugin-dist" basedir=".">
+<project name="adempiereWebStore" default="plugin" basedir=".">
 
   <!--<property environment="env"/>-->
   <import file="../utils_dev/properties.xml"/>
@@ -16,11 +16,11 @@
   <!-- =================================================================== -->
   <!-- Creates the plugin                                            -->
   <!-- =================================================================== -->
-  <target name="plugin-dist">
-		<buildPlugin workspaceDirectory=".."
-			             projectName="wstore"
+  <target name="plugin">
+		<buildPlugin workspaceDirectory="${workspace}"
+			             projectName="webStore"
 			             targetPlatformId="target.platform"
-			             destination="${env.ADEMPIERE_ROOT}/Adempiere/osgi"
+			             destination="../lib"
 			 			 buildSourceJar="false"
 						 clean="no"/>
   </target>
@@ -30,7 +30,9 @@
   <!-- =================================================================== -->
   <target name="clean">
     <delete>
-    	<fileset includes="${env.ADEMPIERE_ROOT}/Adempiere/osgi/*wstore*.jar"></fileset>
+    	<fileset dir="../lib/plugins">
+			<include name="org.adempiere.wstore*.jar"/>
+		</fileset>
     </delete>
   </target>