[overlord-commits] Overlord SVN: r772 - in bpm-console/trunk: gui/war/src/main/java/org/jboss/bpm/console/client/common and 2 other directories.
overlord-commits at lists.jboss.org
overlord-commits at lists.jboss.org
Wed Aug 19 05:35:32 EDT 2009
Author: heiko.braun at jboss.com
Date: 2009-08-19 05:35:31 -0400 (Wed, 19 Aug 2009)
New Revision: 772
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/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java
bpm-console/trunk/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java
Log:
Catch 401 in all cases a RequestBuider is used. Move session expriration handling to Authentication.class
Modified: bpm-console/trunk/BPMC.iws
===================================================================
--- bpm-console/trunk/BPMC.iws 2009-08-19 05:39:44 UTC (rev 771)
+++ bpm-console/trunk/BPMC.iws 2009-08-19 09:35:31 UTC (rev 772)
@@ -18,7 +18,8 @@
<component name="ChangeListManager">
<list default="true" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/BPMC.iws" afterPath="$PROJECT_DIR$/BPMC.iws" />
- <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/report/RenderReportAction.java" afterPath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.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$/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" />
@@ -105,7 +106,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:87" 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="88" 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" />
@@ -203,66 +204,42 @@
</component>
<component name="FileEditorManager">
<leaf>
- <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">
+ <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="135" column="67" selection-start="4310" selection-end="4359" vertical-scroll-proportion="0.60493827">
+ <state line="79" column="21" selection-start="2890" selection-end="3075" vertical-scroll-proportion="0.28447205">
<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">
+ <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="183" column="24" selection-start="5552" selection-end="5552" vertical-scroll-proportion="0.4234568">
+ <state line="232" column="20" selection-start="6479" selection-end="6479" vertical-scroll-proportion="0.18509316">
<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">
+ <file leaf-file-name="RenderReportAction.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.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">
+ <state line="84" column="21" selection-start="3146" selection-end="3146" vertical-scroll-proportion="0.3242236">
<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">
+ <file leaf-file-name="Authentication.java" pinned="false" current="true" current-in-tab="true">
+ <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="87" column="76" selection-start="3429" selection-end="3429" vertical-scroll-proportion="0.67160493">
+ <state line="204" column="20" selection-start="6327" selection-end="6327" vertical-scroll-proportion="0.2447205">
<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">
@@ -719,14 +696,6 @@
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/jmaki" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/jmaki/xhp" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
</subPane>
</component>
@@ -949,15 +918,15 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="325" y="35" width="1240" height="972" extended-state="0" />
+ <frame x="363" y="39" width="1304" height="967" extended-state="0" />
<editor active="true" />
<layout>
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
<window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
<window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="7" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26448363" order="0" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.40342858" order="1" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25099602" order="0" />
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.40229884" order="1" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24769102" order="1" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32992035" order="8" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="6" />
@@ -1061,13 +1030,6 @@
<option name="myLastEditedConfigurable" />
</component>
<component name="editorHistoryManager">
- <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">
- <folding />
- </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">
@@ -1126,51 +1088,58 @@
</entry>
<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">
+ <state line="183" column="24" selection-start="5552" selection-end="5552" vertical-scroll-proportion="0.42608696">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java">
+ <entry file="file://$PROJECT_DIR$/server/war/src/main/webapp/login_failed.html">
<provider selected="true" editor-type-id="text-editor">
- <state line="86" column="65" selection-start="2693" selection-end="3015" vertical-scroll-proportion="0.2765432">
+ <state line="2" column="51" selection-start="18" selection-end="64" vertical-scroll-proportion="0.04134367">
<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/LoginView.java">
+ <entry file="file://$PROJECT_DIR$/server/war/src/main/webapp/login.html">
<provider selected="true" editor-type-id="text-editor">
- <state line="135" column="67" selection-start="4310" selection-end="4359" vertical-scroll-proportion="0.60493827">
+ <state line="30" column="0" selection-start="614" selection-end="614" vertical-scroll-proportion="0.62015504">
<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/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">
+ <state line="79" column="21" selection-start="2890" selection-end="3075" vertical-scroll-proportion="0.28447205">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/server/war/src/main/webapp/login_failed.html">
+ <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="2" column="51" selection-start="18" selection-end="64" vertical-scroll-proportion="0.041078307">
+ <state line="232" column="20" selection-start="6479" selection-end="6479" vertical-scroll-proportion="0.18509316">
<folding />
</state>
</provider>
- <provider editor-type-id="HtmlPreview">
- <state />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="84" column="21" selection-start="3146" selection-end="3146" vertical-scroll-proportion="0.3242236">
+ <folding />
+ </state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/server/war/src/main/webapp/login.html">
+ <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="2" column="48" selection-start="62" selection-end="62" vertical-scroll-proportion="0.041078307">
+ <state line="204" column="20" selection-start="6327" selection-end="6327" vertical-scroll-proportion="0.2447205">
<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-19 05:39:44 UTC (rev 771)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java 2009-08-19 09:35:31 UTC (rev 772)
@@ -75,16 +75,7 @@
{
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();
- }
- }
- );
+ appContext.getAuthentication().handleSessionTimeout();
}
else if (200 == response.getStatusCode())
{
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java 2009-08-19 05:39:44 UTC (rev 771)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java 2009-08-19 09:35:31 UTC (rev 772)
@@ -78,8 +78,12 @@
public void onResponseReceived(Request request, Response response) {
try
{
- if (200 == response.getStatusCode())
+ if(response.getText().indexOf("HTTP 401")!=-1) // HACK
{
+ appContext.getAuthentication().handleSessionTimeout();
+ }
+ else if (200 == response.getStatusCode())
+ {
// update view
view.update(event.getDispatchUrl());
Modified: bpm-console/trunk/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java
===================================================================
--- bpm-console/trunk/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java 2009-08-19 05:39:44 UTC (rev 771)
+++ bpm-console/trunk/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java 2009-08-19 09:35:31 UTC (rev 772)
@@ -30,6 +30,7 @@
import com.google.gwt.user.client.DeferredCommand;
import org.jboss.bpm.console.client.util.ConsoleLog;
import org.jboss.bpm.console.client.util.JSONWalk;
+import org.gwt.mosaic.ui.client.MessageBox;
import java.util.ArrayList;
import java.util.List;
@@ -228,7 +229,21 @@
rolesAssigned = new ArrayList<String>();
}
+ public void handleSessionTimeout()
+ {
+ MessageBox.confirm("Session expired", "Please login again",
+ new MessageBox.ConfirmationCallback()
+ {
+ public void onResult(boolean b)
+ {
+ // regardless of the choice, force login
+ logout();
+ }
+ }
+ );
+ }
+
public interface AuthCallback
{
void onLoginSuccess(Request request, Response response);
More information about the overlord-commits
mailing list