details: /erp/devel/pi/rev/fb45a910f3e0
changeset: 7562:fb45a910f3e0
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Mon Jun 07 14:00:24 2010 +0200
summary: Fixed issue 13545. Tomcat will now restart correctly when upgrading
from an earlier MP to current pi
To fix this, the old AntExecutor needs to be used.
diffstat:
src/org/openbravo/service/system/ReloadContext.java | 4 +++-
src/org/openbravo/service/system/RestartTomcat.java | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diffs (60 lines):
diff -r 70cd2031e857 -r fb45a910f3e0
src/org/openbravo/service/system/ReloadContext.java
--- a/src/org/openbravo/service/system/ReloadContext.java Mon Jun 07
15:47:54 2010 +0530
+++ b/src/org/openbravo/service/system/ReloadContext.java Mon Jun 07
14:00:24 2010 +0200
@@ -22,9 +22,9 @@
import java.io.File;
import org.apache.log4j.Logger;
-import org.openbravo.base.AntExecutor;
import org.openbravo.base.exception.OBException;
import org.openbravo.base.session.OBPropertiesProvider;
+import org.openbravo.erpCommon.utility.AntExecutor;
/**
* Reloads the tomcat using the tomcat reload ant task.
@@ -42,6 +42,7 @@
* arg[0] contains the source path
* @throws Exception
*/
+ @SuppressWarnings("deprecation")
public static void main(String[] args) throws Exception {
final String srcPath = args[0];
final File srcDir = new File(srcPath);
@@ -59,6 +60,7 @@
* Restarts the tomcat server. Assumes the the Openbravo.properties are
available through the
* {...@link OBPropertiesProvider}.
*/
+ @SuppressWarnings("deprecation")
public static void reload() {
final String baseDirPath =
OBPropertiesProvider.getInstance().getOpenbravoProperties()
.getProperty("source.path");
diff -r 70cd2031e857 -r fb45a910f3e0
src/org/openbravo/service/system/RestartTomcat.java
--- a/src/org/openbravo/service/system/RestartTomcat.java Mon Jun 07
15:47:54 2010 +0530
+++ b/src/org/openbravo/service/system/RestartTomcat.java Mon Jun 07
14:00:24 2010 +0200
@@ -22,9 +22,9 @@
import java.io.File;
import org.apache.log4j.Logger;
-import org.openbravo.base.AntExecutor;
import org.openbravo.base.exception.OBException;
import org.openbravo.base.session.OBPropertiesProvider;
+import org.openbravo.erpCommon.utility.AntExecutor;
/**
* Restarts the tomcat using the direct java bootstrap class/jar. The restart
is an ant task which
@@ -46,6 +46,7 @@
* arg[0] contains the source path
* @throws Exception
*/
+ @SuppressWarnings("deprecation")
public static void main(String[] args) throws Exception {
final String srcPath = args[0];
final File srcDir = new File(srcPath);
@@ -63,6 +64,7 @@
* Restarts the tomcat server. Assumes the the Openbravo.properties are
available through the
* {...@link OBPropertiesProvider}.
*/
+ @SuppressWarnings("deprecation")
public static void restart() {
final String baseDirPath =
OBPropertiesProvider.getInstance().getOpenbravoProperties()
.getProperty("source.path");
------------------------------------------------------------------------------
ThinkGeek and WIRED's GeekDad team up for the Ultimate
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the
lucky parental unit. See the prize list and enter to win:
http://p.sf.net/sfu/thinkgeek-promo
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
