[overlord-commits] Overlord SVN: r770 - in bpm-console/trunk: gui/war/src/main/java/org/jboss/bpm/console/client/common and 1 other directories.

overlord-commits at lists.jboss.org overlord-commits at lists.jboss.org
Tue Aug 18 12:53:18 EDT 2009


Author: heiko.braun at jboss.com
Date: 2009-08-18 12:53:17 -0400 (Tue, 18 Aug 2009)
New Revision: 770

Modified:
   bpm-console/trunk/BPMC.iws
   bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java
   bpm-console/trunk/server/war/src/main/webapp/login.html
Log:
Handle session expiration

Modified: bpm-console/trunk/BPMC.iws
===================================================================
--- bpm-console/trunk/BPMC.iws	2009-08-18 16:38:13 UTC (rev 769)
+++ bpm-console/trunk/BPMC.iws	2009-08-18 16:53:17 UTC (rev 770)
@@ -17,11 +17,9 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java" afterPath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/BPMC.iws" afterPath="$PROJECT_DIR$/BPMC.iws" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gui/war/src/main/java/jmaki/xhp/HttpClient.java" afterPath="$PROJECT_DIR$/gui/war/src/main/java/jmaki/xhp/HttpClient.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java" afterPath="$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/server/war/src/main/webapp/login_failed.html" afterPath="$PROJECT_DIR$/server/war/src/main/webapp/login_failed.html" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/server/war/src/main/webapp/login.html" afterPath="$PROJECT_DIR$/server/war/src/main/webapp/login.html" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java" afterPath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java" />
     </list>
     <list name="Failed commit: Default" comment="remove dependency on DTOParser" />
   </component>
@@ -107,7 +105,7 @@
         <option name="CONDITION" value="" />
         <option name="LOG_MESSAGE" value="" />
       </breakpoint>
-      <breakpoint url="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java" line="87" class="Class at Authentication.java:80" package="org.jboss.bpm.console.client">
+      <breakpoint url="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java" line="87" class="Class at Authentication.java:87" package="org.jboss.bpm.console.client">
         <option name="ENABLED" value="true" />
         <option name="SUSPEND_POLICY" value="SuspendAll" />
         <option name="LOG_ENABLED" value="false" />
@@ -120,6 +118,19 @@
         <option name="CONDITION" value="" />
         <option name="LOG_MESSAGE" value="" />
       </breakpoint>
+      <breakpoint url="file://$PROJECT_DIR$/server/war/src/main/java/org/jboss/bpm/console/server/FormProcessingFacade.java" line="145" class="org.jboss.bpm.console.server.FormProcessingFacade" package="org.jboss.bpm.console.server">
+        <option name="ENABLED" value="true" />
+        <option name="SUSPEND_POLICY" value="SuspendAll" />
+        <option name="LOG_ENABLED" value="false" />
+        <option name="LOG_EXPRESSION_ENABLED" value="false" />
+        <option name="COUNT_FILTER_ENABLED" value="false" />
+        <option name="COUNT_FILTER" value="0" />
+        <option name="CONDITION_ENABLED" value="false" />
+        <option name="CLASS_FILTERS_ENABLED" value="false" />
+        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+        <option name="CONDITION" value="" />
+        <option name="LOG_MESSAGE" value="" />
+      </breakpoint>
     </line_breakpoints>
     <breakpoint_any>
       <breakpoint>
@@ -192,15 +203,66 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="LoginView.java" pinned="false" current="true" current-in-tab="true">
+      <file leaf-file-name="LoginView.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="191" column="26" selection-start="5534" selection-end="5534" vertical-scroll-proportion="0.20246914">
+            <state line="135" column="67" selection-start="4310" selection-end="4359" vertical-scroll-proportion="0.60493827">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="FormProcessingFacade.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/server/war/src/main/java/org/jboss/bpm/console/server/FormProcessingFacade.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="183" column="24" selection-start="5552" selection-end="5552" vertical-scroll-proportion="0.4234568">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Authentication.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="86" column="65" selection-start="2693" selection-end="3015" vertical-scroll-proportion="0.2765432">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="AbstractRESTAction.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="87" column="76" selection-start="3429" selection-end="3429" vertical-scroll-proportion="0.67160493">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="login_failed.html" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/server/war/src/main/webapp/login_failed.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="2" column="51" selection-start="18" selection-end="64" vertical-scroll-proportion="0.041078307">
+              <folding />
+            </state>
+          </provider>
+          <provider editor-type-id="HtmlPreview">
+            <state />
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="login.html" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/server/war/src/main/webapp/login.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="2" column="48" selection-start="62" selection-end="62" vertical-scroll-proportion="0.041078307">
+              <folding />
+            </state>
+          </provider>
+          <provider editor-type-id="HtmlPreview">
+            <state />
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FindManager">
@@ -723,7 +785,7 @@
     </key>
   </component>
   <component name="RestoreUpdateTree" />
-  <component name="RunManager" selected="Remote.GWT">
+  <component name="RunManager" selected="Remote.server">
     <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
       <option name="MAIN_CLASS_NAME" />
       <option name="VM_PARAMETERS" />
@@ -999,20 +1061,6 @@
     <option name="myLastEditedConfigurable" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/ConsoleConfig.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="104" column="22" selection-start="3184" selection-end="3184" vertical-scroll-proportion="0.01939394">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="274" column="30" selection-start="8948" selection-end="8948" vertical-scroll-proportion="0.61777776">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java">
       <provider selected="true" editor-type-id="text-editor">
         <state line="98" column="42" selection-start="3339" selection-end="3339" vertical-scroll-proportion="1.2731183">
@@ -1020,16 +1068,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/server/war/src/main/webapp/login.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="26" column="64" selection-start="0" selection-end="557" vertical-scroll-proportion="0.5445026">
-          <folding />
-        </state>
-      </provider>
-      <provider editor-type-id="HtmlPreview">
-        <state />
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java">
       <provider selected="true" editor-type-id="text-editor">
         <state line="75" column="66" selection-start="2468" selection-end="2468" vertical-scroll-proportion="1.512088">
@@ -1086,30 +1124,54 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/server/war/src/main/webapp/login_failed.html">
+    <entry file="file://$PROJECT_DIR$/server/war/src/main/java/org/jboss/bpm/console/server/FormProcessingFacade.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="12" column="32" selection-start="230" selection-end="230" vertical-scroll-proportion="0.24646984">
+        <state line="183" column="24" selection-start="5552" selection-end="5552" vertical-scroll-proportion="0.4234568">
           <folding />
         </state>
       </provider>
-      <provider editor-type-id="HtmlPreview">
-        <state />
-      </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="127" column="52" selection-start="4279" selection-end="4279" vertical-scroll-proportion="1.0617284">
+        <state line="86" column="65" selection-start="2693" selection-end="3015" vertical-scroll-proportion="0.2765432">
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="191" column="26" selection-start="5534" selection-end="5534" vertical-scroll-proportion="0.20246914">
+        <state line="135" column="67" selection-start="4310" selection-end="4359" vertical-scroll-proportion="0.60493827">
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="87" column="76" selection-start="3429" selection-end="3429" vertical-scroll-proportion="0.67160493">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/server/war/src/main/webapp/login_failed.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="2" column="51" selection-start="18" selection-end="64" vertical-scroll-proportion="0.041078307">
+          <folding />
+        </state>
+      </provider>
+      <provider editor-type-id="HtmlPreview">
+        <state />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/server/war/src/main/webapp/login.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="2" column="48" selection-start="62" selection-end="62" vertical-scroll-proportion="0.041078307">
+          <folding />
+        </state>
+      </provider>
+      <provider editor-type-id="HtmlPreview">
+        <state />
+      </provider>
+    </entry>
   </component>
 </project>
 

Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java	2009-08-18 16:38:13 UTC (rev 769)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java	2009-08-18 16:53:17 UTC (rev 770)
@@ -29,6 +29,7 @@
 import org.jboss.bpm.console.client.LoadingStatusAction;
 import org.jboss.bpm.console.client.Registry;
 import org.jboss.bpm.console.client.util.ConsoleLog;
+import org.gwt.mosaic.ui.client.MessageBox;
 
 import java.io.IOException;
 
@@ -72,8 +73,21 @@
             public void onResponseReceived(Request request, Response response) {
               try
               {
-                if (200 == response.getStatusCode())
+                if(response.getText().indexOf("HTTP 401")!=-1) // HACK
                 {
+                  MessageBox.confirm("Session expired", "Please login again",
+                      new MessageBox.ConfirmationCallback()
+                      {
+                        public void onResult(boolean b)
+                        {
+                          // regardless of the choice, force login
+                          appContext.getAuthentication().logout();
+                        }
+                      }
+                  );
+                }
+                else if (200 == response.getStatusCode())
+                {
                   handleSuccessfulResponse(controller, object, response);
                 }
                 else
@@ -110,7 +124,7 @@
         }
       };
       t.schedule(20000);
-      
+
     }
     catch (RequestException e)
     {
@@ -121,14 +135,14 @@
   }
 
   protected void handleError(String url, Throwable t)
-  {   
+  {
     final String out =
         "<ul>"+
-          "<li>URL: '" + url + "'\n"+
-          "<li>Action: '" + getId() + "'\n" +
-          "<li>Exception: '" + t.getClass() +"'"+
-        "</ul>\n\n"+
-        t.getMessage();
+            "<li>URL: '" + url + "'\n"+
+            "<li>Action: '" + getId() + "'\n" +
+            "<li>Exception: '" + t.getClass() +"'"+
+            "</ul>\n\n"+
+            t.getMessage();
 
     ConsoleLog.error(out, t);
     appContext.displayMessage(out, true);

Modified: bpm-console/trunk/server/war/src/main/webapp/login.html
===================================================================
--- bpm-console/trunk/server/war/src/main/webapp/login.html	2009-08-18 16:38:13 UTC (rev 769)
+++ bpm-console/trunk/server/war/src/main/webapp/login.html	2009-08-18 16:53:17 UTC (rev 770)
@@ -1,4 +1,7 @@
 <html>
+<head>
+  <title>HTTP 401</title> <!-- Do not remove -->
+</head>
 <body>
 <form method="POST" action="j_security_check">
 



More information about the overlord-commits mailing list