From 84f93dd0ac016516a9408f6ebf7249af6fe73bcd Mon Sep 17 00:00:00 2001
From: Heng Sin Low <hengsin@gmail.com>
Date: Fri, 22 Nov 2013 08:17:27 +0800
Subject: [PATCH] Update core product version to 2.0.0. Fixed installation and
 script.

---
 org.adempiere.server-feature/build.xml            | 4 ++--
 org.idempiere.eclipse.platform-feature/update.bat | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/org.adempiere.server-feature/build.xml b/org.adempiere.server-feature/build.xml
index d47ae20552..2574c8cc76 100644
--- a/org.adempiere.server-feature/build.xml
+++ b/org.adempiere.server-feature/build.xml
@@ -39,8 +39,8 @@
 		</condition>
 		<echo message="Windows=${isWindows}" />
 
-		<copy file="plugins/org.adempiere.tomcat.config_1.0.0/META-INF/tomcat/serverTemplate.xml"
-			tofile="plugins/org.adempiere.tomcat.config_1.0.0/META-INF/tomcat/server.xml" filtering="yes" overwrite="yes"/>
+		<copy file="plugins/org.adempiere.tomcat.config_2.0.0/META-INF/tomcat/serverTemplate.xml"
+			tofile="plugins/org.adempiere.tomcat.config_2.0.0/META-INF/tomcat/server.xml" filtering="yes" overwrite="yes"/>
 
 	</target>
 
diff --git a/org.idempiere.eclipse.platform-feature/update.bat b/org.idempiere.eclipse.platform-feature/update.bat
index c94db344cf..d3805cce4c 100644
--- a/org.idempiere.eclipse.platform-feature/update.bat
+++ b/org.idempiere.eclipse.platform-feature/update.bat
@@ -7,6 +7,10 @@ cp idempiere.ini idempiere.ini.sav
 if exist server.xml.sav del /q server.xml.sav
 if exist plugins/org.adempiere.tomcat.config_1.0.0/META-INF/tomcat/server.xml (
    copy plugins/org.adempiere.tomcat.config_1.0.0/META-INF/tomcat/server.xml server.xml.sav
+   del /q plugins/org.adempiere.tomcat.config_1.0.0/META-INF/tomcat/server.xml
+)
+if exist plugins/org.adempiere.tomcat.config_2.0.0/META-INF/tomcat/server.xml (
+   copy plugins/org.adempiere.tomcat.config_2.0.0/META-INF/tomcat/server.xml server.xml.sav
 )
 
 java -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=director -jar plugins/org.eclipse.osgi_3.7.*.jar -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination %~dp0 -repository %1 -u org.adempiere.server.product
@@ -15,6 +19,6 @@ java -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.ins
 
 cp idempiere.ini.sav idempiere.ini
 if exist server.xml.sav (
-   copy server.xml.sav plugins/org.adempiere.tomcat.config_1.0.0/META-INF/tomcat/server.xml 
+   copy server.xml.sav plugins/org.adempiere.tomcat.config_2.0.0/META-INF/tomcat/server.xml 
    del /q server.xml.sav
 )