From fd23d8427ca809823075f8d6e269421b5938b63f Mon Sep 17 00:00:00 2001
From: Heng Sin Low <hengsin@gmail.com>
Date: Fri, 17 Oct 2014 09:26:55 +0800
Subject: [PATCH] IDEMPIERE-2245 Platform Upgrade for r3. Fix the need to have
 -Dosgi.user.area, -Dosgi.user.area.default and
 -Dosgi.configuration.area.default entries in eclipse.ini. Fix basedir for ant
 file.

---
 org.adempiere.sdk-feature/adempiere.cquery                  | 3 +++
 org.adempiere.server-feature/buckminster.properties         | 4 ++++
 .../buckminster_linux_gtk_x86.properties                    | 4 ++++
 .../buckminster_linux_gtk_x86_64.properties                 | 5 +++++
 .../buckminster_macosx_x86.properties                       | 4 ++++
 .../buckminster_solaris_gtk_x86.properties                  | 4 ++++
 .../buckminster_win32_x86.properties                        | 4 ++++
 org.adempiere.tomcat.config/bin/.hgignore                   | 0
 org.adempiere.tomcat.config/src/.hgignore                   | 0
 org.zkoss.zk.library/copyjars.xml                           | 6 +++---
 org.zkoss.zk.library/copysources.xml                        | 6 +++---
 11 files changed, 34 insertions(+), 6 deletions(-)
 delete mode 100644 org.adempiere.tomcat.config/bin/.hgignore
 delete mode 100644 org.adempiere.tomcat.config/src/.hgignore

diff --git a/org.adempiere.sdk-feature/adempiere.cquery b/org.adempiere.sdk-feature/adempiere.cquery
index 0c39bb7d82..23c78cc84b 100644
--- a/org.adempiere.sdk-feature/adempiere.cquery
+++ b/org.adempiere.sdk-feature/adempiere.cquery
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?><cq:componentQuery xmlns:cq="http://www.eclipse.org/buckminster/CQuery-1.0" resourceMap="adempiere.rmap">
     <cq:rootRequest name="org.adempiere.sdk" componentType="eclipse.feature"/>
     <cq:property key="buckminster.download.source" value="true"/>
+    <cq:property key="osgi.configuration.area.default" value="configuration"/>
+    <cq:property key="osgi.user.area" value="${user.home}"/>
+    <cq:property key="osgi.user.area.default" value="${user.home}"/>
     <cq:property key="target.arch" value="*"/>
     <cq:property key="target.os" value="*"/>
     <cq:property key="target.ws" value="*"/>
diff --git a/org.adempiere.server-feature/buckminster.properties b/org.adempiere.server-feature/buckminster.properties
index 85062e7afd..8ed6e52f98 100644
--- a/org.adempiere.server-feature/buckminster.properties
+++ b/org.adempiere.server-feature/buckminster.properties
@@ -13,3 +13,7 @@ target.arch=*
 product.features=org.idempiere.eclipse.platform.feature.group, org.idempiere.fitnesse.feature.group  
 product.profile=DefaultProfile
 product.id=org.adempiere.server.product
+
+osgi.user.area=${user.home}
+osgi.user.area.default=${user.home}
+osgi.configuration.area.default=configuration
diff --git a/org.adempiere.server-feature/buckminster_linux_gtk_x86.properties b/org.adempiere.server-feature/buckminster_linux_gtk_x86.properties
index 734b87a812..5fd88424ac 100644
--- a/org.adempiere.server-feature/buckminster_linux_gtk_x86.properties
+++ b/org.adempiere.server-feature/buckminster_linux_gtk_x86.properties
@@ -13,3 +13,7 @@ target.arch=x86
 product.features=org.idempiere.eclipse.platform.feature.group, org.idempiere.fitnesse.feature.group  
 product.profile=DefaultProfile
 product.id=org.adempiere.server.product
+
+osgi.user.area=${user.home}
+osgi.user.area.default=${user.home}
+osgi.configuration.area.default=configuration
diff --git a/org.adempiere.server-feature/buckminster_linux_gtk_x86_64.properties b/org.adempiere.server-feature/buckminster_linux_gtk_x86_64.properties
index 4695ef0fee..3d952a40b5 100644
--- a/org.adempiere.server-feature/buckminster_linux_gtk_x86_64.properties
+++ b/org.adempiere.server-feature/buckminster_linux_gtk_x86_64.properties
@@ -13,3 +13,8 @@ target.arch=x86_64
 product.features=org.idempiere.eclipse.platform.feature.group, org.idempiere.fitnesse.feature.group  
 product.profile=DefaultProfile
 product.id=org.adempiere.server.product
+
+osgi.user.area=${user.home}
+osgi.user.area.default=${user.home}
+osgi.configuration.area.default=configuration
+
diff --git a/org.adempiere.server-feature/buckminster_macosx_x86.properties b/org.adempiere.server-feature/buckminster_macosx_x86.properties
index 351f709838..b4de619240 100644
--- a/org.adempiere.server-feature/buckminster_macosx_x86.properties
+++ b/org.adempiere.server-feature/buckminster_macosx_x86.properties
@@ -13,3 +13,7 @@ target.arch=x86
 product.features=org.idempiere.eclipse.platform.feature.group, org.idempiere.fitnesse.feature.group  
 product.profile=DefaultProfile
 product.id=org.adempiere.server.product
+
+osgi.user.area=${user.home}
+osgi.user.area.default=${user.home}
+osgi.configuration.area.default=configuration
diff --git a/org.adempiere.server-feature/buckminster_solaris_gtk_x86.properties b/org.adempiere.server-feature/buckminster_solaris_gtk_x86.properties
index 018c0d2474..154c3d39b1 100644
--- a/org.adempiere.server-feature/buckminster_solaris_gtk_x86.properties
+++ b/org.adempiere.server-feature/buckminster_solaris_gtk_x86.properties
@@ -13,3 +13,7 @@ target.arch=x86
 product.features=org.idempiere.eclipse.platform.feature.group, org.idempiere.fitnesse.feature.group  
 product.profile=DefaultProfile
 product.id=org.adempiere.server.product
+
+osgi.user.area=${user.home}
+osgi.user.area.default=${user.home}
+osgi.configuration.area.default=configuration
diff --git a/org.adempiere.server-feature/buckminster_win32_x86.properties b/org.adempiere.server-feature/buckminster_win32_x86.properties
index a390f75ae2..cd31709746 100644
--- a/org.adempiere.server-feature/buckminster_win32_x86.properties
+++ b/org.adempiere.server-feature/buckminster_win32_x86.properties
@@ -13,3 +13,7 @@ target.arch=x86
 product.features=org.idempiere.eclipse.platform.feature.group, org.idempiere.fitnesse.feature.group  
 product.profile=DefaultProfile
 product.id=org.adempiere.server.product
+
+osgi.user.area=${user.home}
+osgi.user.area.default=${user.home}
+osgi.configuration.area.default=configuration
diff --git a/org.adempiere.tomcat.config/bin/.hgignore b/org.adempiere.tomcat.config/bin/.hgignore
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/org.adempiere.tomcat.config/src/.hgignore b/org.adempiere.tomcat.config/src/.hgignore
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/org.zkoss.zk.library/copyjars.xml b/org.zkoss.zk.library/copyjars.xml
index f213fbbdeb..bcf61884fe 100644
--- a/org.zkoss.zk.library/copyjars.xml
+++ b/org.zkoss.zk.library/copyjars.xml
@@ -1,4 +1,4 @@
-<project name="zklibrary" basedir=".." default="copy">
+<project name="zklibrary" basedir="." default="copy">
 	<target name="copy">
 	      <get src="http://mavensync.zkoss.org/maven2/org/zkoss/zk/zk/7.0.3/zk-7.0.3.jar" dest="lib" usetimestamp="true" verbose="true" retries="5"/>
 	      <get src="http://mavensync.zkoss.org/maven2/org/zkoss/zk/zul/7.0.3/zul-7.0.3.jar" dest="lib" usetimestamp="true" verbose="true" retries="5"/>
@@ -13,7 +13,7 @@
 	      <get src="http://mavensync.zkoss.org/maven2/org/zkoss/zkforge/timelinez/2.3.1_50/timelinez-2.3.1_50.jar" dest="lib" usetimestamp="true" verbose="true" retries="5"/>
 	      <get src="http://mavensync.zkoss.org/maven2/org/zkoss/zkforge/timeplotz/1.1_50/timeplotz-1.1_50.jar" dest="lib" usetimestamp="true" verbose="true" retries="5"/>
 	      <get src="http://mavensync.zkoss.org/maven2/org/zkoss/calendar/calendar/2.1.4/calendar-2.1.4.jar" dest="lib" usetimestamp="true" verbose="true" retries="5"/>
-	      <get src="http://repo1.maven.org/maven2/org/python/jython/2.5.3/jython-2.5.3.jar" dest="lib" usetimestamp="true" verbose="true" retries="5"/>
-	      <get src="http://repo1.maven.org/maven2/org/jruby/jruby-complete/1.7.15/jruby-complete-1.7.15.jar" dest="lib" usetimestamp="true" verbose="true" retries="5"/>
+	      <get src="http://repo1.maven.org/maven2/org/python/jython/2.5.3/jython-2.5.3.jar" dest="lib" usetimestamp="true" verbose="true" retries="5" maxtime="600"/>
+	      <get src="http://repo1.maven.org/maven2/org/jruby/jruby-complete/1.7.15/jruby-complete-1.7.15.jar" dest="lib" usetimestamp="true" verbose="true" retries="5" maxtime="600"/>
 	</target>
 </project>
diff --git a/org.zkoss.zk.library/copysources.xml b/org.zkoss.zk.library/copysources.xml
index f4ff4062e5..77deb30186 100644
--- a/org.zkoss.zk.library/copysources.xml
+++ b/org.zkoss.zk.library/copysources.xml
@@ -1,4 +1,4 @@
-<project name="zklibrary" basedir=".." default="copy">
+<project name="zklibrary" basedir="." default="copy">
 	<target name="copy">
 	      <get src="http://mavensync.zkoss.org/maven2/org/zkoss/zk/zk/7.0.3/zk-7.0.3-sources.jar" dest="lib/src" usetimestamp="true" verbose="true" retries="5"/>
 	      <get src="http://mavensync.zkoss.org/maven2/org/zkoss/zk/zul/7.0.3/zul-7.0.3-sources.jar" dest="lib/src" usetimestamp="true" verbose="true" retries="5"/>
@@ -13,7 +13,7 @@
 	      <get src="http://mavensync.zkoss.org/maven2/org/zkoss/zkforge/timelinez/2.3.1_50/timelinez-2.3.1_50-sources.jar" dest="lib/src" usetimestamp="true" verbose="true" retries="5"/>
 	      <get src="http://mavensync.zkoss.org/maven2/org/zkoss/zkforge/timeplotz/1.1_50/timeplotz-1.1_50-sources.jar" dest="lib/src" usetimestamp="true" verbose="true" retries="5"/>
 	      <get src="http://mavensync.zkoss.org/maven2/org/zkoss/calendar/calendar/2.1.4/calendar-2.1.4-sources.jar" dest="lib/src" usetimestamp="true" verbose="true" retries="5"/>
-	      <get src="http://repo1.maven.org/maven2/org/python/jython/2.5.3/jython-2.5.3-sources.jar" dest="lib/src" usetimestamp="true" verbose="true" retries="5"/>
-	      <get src="http://repo1.maven.org/maven2/org/jruby/jruby-complete/1.7.15/jruby-complete-1.7.15-sources.jar" dest="lib/src" usetimestamp="true" verbose="true" retries="5"/>
+	      <get src="http://repo1.maven.org/maven2/org/python/jython/2.5.3/jython-2.5.3-sources.jar" dest="lib/src" usetimestamp="true" verbose="true" retries="5" maxtime="600"/>
+	      <get src="http://repo1.maven.org/maven2/org/jruby/jruby-complete/1.7.15/jruby-complete-1.7.15-sources.jar" dest="lib/src" usetimestamp="true" verbose="true" retries="5" maxtime="600"/>
 	</target>
 </project>