Fixed issue 14123. The user will now see the 'Tomcat not restarted' message after one of the normal build tasks.
authorAntonio Moreno <antonio.moreno@openbravo.com>
Thu, 12 Aug 2010 11:43:07 +0200
changeset 8116 fb4fc8956f75
parent 8115 ec3dc0f90c4a
child 8117 ba616948bd77
child 8295 f6a4e62e6730
Fixed issue 14123. The user will now see the 'Tomcat not restarted' message after one of the normal build tasks.
The system will stay in a state which is consiered 'not final' by the rebuild window, so that the window itself does not break.
build.xml
src/build.xml
src/org/openbravo/base/secureApp/LoginHandler.java
--- a/build.xml	Thu Aug 12 10:56:59 2010 +0200
+++ b/build.xml	Thu Aug 12 11:43:07 2010 +0200
@@ -371,7 +371,7 @@
     <antcall inheritall="true" inheritrefs="true" target="apply.module" />
     <ant dir="${base.db}" target="setApplied" inheritAll="true" inheritRefs="true" />
     <antcall target="build.deploy" />
-    <updatesystemstatus v="RB60"/>
+    <updatesystemstatus v="RB51"/>
     <!-- only restart tomcat if the restart prop was set to true -->
     <condition property="dorestart">
       <istrue value="${restart}" />
@@ -446,7 +446,7 @@
   </target>
 
   <target name="compile.deploy" depends="compile.war, compile.development">
-    <updatesystemstatus v="RB60"/>
+    <updatesystemstatus v="RB51"/>
   </target>
 
   <target name="compile.development" depends="init" unless="mode.war">
@@ -651,7 +651,7 @@
 
     <antcall target="import.sample.data" />
     <antcall target="load.logoimages" />
-    <updatesystemstatus v="RB60"/> 
+    <updatesystemstatus v="RB51"/> 
     <ant dir="${base.db}" target="setApplied" inheritAll="true" inheritRefs="true" />
 
     <!--
@@ -670,7 +670,7 @@
     <echo message="applying modules" />    
     <antcall inheritall="true" inheritrefs="true" target="apply.module" />
     <antcall target="import.sample.data" />
-    <updatesystemstatus v="RB60"/>
+    <updatesystemstatus v="RB51"/>
     <ant dir="${base.db}" target="setApplied" inheritAll="true" inheritRefs="true" />
   </target>
 
--- a/src/build.xml	Thu Aug 12 10:56:59 2010 +0200
+++ b/src/build.xml	Thu Aug 12 11:43:07 2010 +0200
@@ -861,7 +861,7 @@
   </target>
 
   <target name="compile.complete.development" depends="compile.complete, copy.files">
-    <updatesystemstatus v="RB60"/>
+    <updatesystemstatus v="RB51"/>
   </target>
 
   <target name="compile.web" depends="build.web.folder">
@@ -879,7 +879,7 @@
       </zipfileset>
       <classes dir="${build}" />
     </war>
-    <updatesystemstatus v="RB60"/>
+    <updatesystemstatus v="RB51"/>
   </target>
 
   <target name="generate-wsdd">
--- a/src/org/openbravo/base/secureApp/LoginHandler.java	Thu Aug 12 10:56:59 2010 +0200
+++ b/src/org/openbravo/base/secureApp/LoginHandler.java	Thu Aug 12 11:43:07 2010 +0200
@@ -199,7 +199,7 @@
         // Last build went fine and tomcat was restarted. We should login as usual
         goToTarget(res, vars);
       } else if (sysInfo.getSystemStatus().equals("RB60")
-          || sysInfo.getSystemStatus().equals("RB50")) {
+          || sysInfo.getSystemStatus().equals("RB51")) {
         String msg = Utility.messageBD(myPool, "TOMCAT_NOT_RESTARTED", vars.getLanguage());
         String title = Utility.messageBD(myPool, "TOMCAT_NOT_RESTARTED_TITLE", vars.getLanguage());
         log4j.warn("Tomcat not restarted");