[overlord-commits] Overlord SVN: r768 - in bpm-console/trunk: gui/war/src/main/java/jmaki/xhp and 3 other directories.
overlord-commits at lists.jboss.org
overlord-commits at lists.jboss.org
Tue Aug 18 11:10:24 EDT 2009
Author: heiko.braun at jboss.com
Date: 2009-08-18 11:10:23 -0400 (Tue, 18 Aug 2009)
New Revision: 768
Modified:
bpm-console/trunk/BPMC.iws
bpm-console/trunk/gui/war/src/main/java/jmaki/xhp/HttpClient.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java
bpm-console/trunk/server/war/src/main/webapp/login_failed.html
bpm-console/trunk/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java
Log:
Catch authentication errors upon login
Modified: bpm-console/trunk/BPMC.iws
===================================================================
--- bpm-console/trunk/BPMC.iws 2009-08-18 14:01:11 UTC (rev 767)
+++ bpm-console/trunk/BPMC.iws 2009-08-18 15:10:23 UTC (rev 768)
@@ -18,12 +18,10 @@
<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$/gui/war/src/main/java/jmaki/xhp/XmlHttpProxy.java" afterPath="$PROJECT_DIR$/gui/war/src/main/java/jmaki/xhp/XmlHttpProxy.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$/gui/war/src/main/java/jmaki/xhp/XmlHttpProxyServlet.java" afterPath="$PROJECT_DIR$/gui/war/src/main/java/jmaki/xhp/XmlHttpProxyServlet.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java" afterPath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.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" />
</list>
<list name="Failed commit: Default" comment="remove dependency on DTOParser" />
</component>
@@ -95,6 +93,34 @@
<disable_hints />
</component>
<component name="DebuggerManager">
+ <line_breakpoints>
+ <breakpoint url="file://$PROJECT_DIR$/gui/war/src/main/java/jmaki/xhp/HttpClient.java" line="236" class="jmaki.xhp.HttpClient" package="jmaki.xhp">
+ <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>
+ <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">
+ <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>
<option name="NOTIFY_CAUGHT" value="true" />
@@ -166,42 +192,15 @@
</component>
<component name="FileEditorManager">
<leaf>
- <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="80" column="0" selection-start="2679" selection-end="2679" vertical-scroll-proportion="0.3212766">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="LoginView.java" pinned="false" current="false" current-in-tab="false">
+ <file leaf-file-name="LoginView.java" pinned="false" current="true" current-in-tab="true">
<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="226" column="0" selection-start="6242" selection-end="6242" vertical-scroll-proportion="0.33186814">
+ <state line="191" column="26" selection-start="5534" selection-end="5534" vertical-scroll-proportion="0.20246914">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="HttpClient.java" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/jmaki/xhp/HttpClient.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="236" column="0" selection-start="6891" selection-end="6891" vertical-scroll-proportion="0.64835167">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="XmlHttpProxy.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/jmaki/xhp/XmlHttpProxy.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="156" column="92" selection-start="6299" selection-end="6299" vertical-scroll-proportion="0.96263736">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
</leaf>
</component>
<component name="FindManager">
@@ -297,6 +296,126 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
+ <option name="myItemId" value="server-war" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="BPMC.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="server-war" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/server/war" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="BPMC.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="server-war" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/server/war" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/server/war/src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="BPMC.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="server-war" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/server/war" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/server/war/src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/server/war/src/main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/server/war/src/main/webapp" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="BPMC.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="server-war" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/server/war" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/server/war/src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/server/war/src/main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/server/war/src/main/webapp" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/server/war/src/main/webapp/WEB-INF" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="BPMC.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="server-war" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/server/war" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/server/war/src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/server/war/src/main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="BPMC.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
<option name="myItemId" value="gui-war" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
@@ -768,16 +887,16 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="230" y="43" width="1240" height="972" extended-state="0" />
+ <frame x="325" y="35" width="1240" height="972" 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="false" weight="0.33165407" order="0" />
+ <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="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24769102" 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" />
<window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
@@ -789,7 +908,7 @@
<window_info id="Maven" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24937028" order="2" />
<window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
- <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3977143" order="4" />
+ <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3977143" order="4" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="0" />
<window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32873562" order="8" />
@@ -880,113 +999,113 @@
<option name="myLastEditedConfigurable" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/webapp/WEB-INF/web.xml">
+ <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="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+ <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/resources/jmaki/xhp/xhp.json">
+ <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="5" column="27" selection-start="162" selection-end="162" vertical-scroll-proportion="0.096969694">
+ <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$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/ConsoleConfig.java">
+ <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="104" column="22" selection-start="3184" selection-end="3184" vertical-scroll-proportion="0.01939394">
+ <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/task/AssignedTasksView.java">
+ <entry file="file://$PROJECT_DIR$/server/war/src/main/webapp/login.html">
<provider selected="true" editor-type-id="text-editor">
- <state line="274" column="30" selection-start="8948" selection-end="8948" vertical-scroll-proportion="0.61777776">
+ <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/Header.java">
+ <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="98" column="42" selection-start="3339" selection-end="3339" vertical-scroll-proportion="1.2731183">
+ <state line="75" column="66" selection-start="2468" selection-end="2468" vertical-scroll-proportion="1.512088">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/server/war/src/main/webapp/WEB-INF/web.xml">
+ <entry file="file://$PROJECT_DIR$/server/war/src/main/java/org/jboss/bpm/console/server/UserMgmtFacade.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="28" column="49" selection-start="894" selection-end="894" vertical-scroll-proportion="-0.21333334">
+ <state line="75" column="0" selection-start="2466" selection-end="2466" vertical-scroll-proportion="0.33186814">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/server/war/src/main/webapp/login.html">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/jmaki/xhp/XmlHttpProxyServlet.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="26" column="64" selection-start="0" selection-end="557" vertical-scroll-proportion="0.5445026">
+ <state line="141" column="0" selection-start="5605" selection-end="5605" vertical-scroll-proportion="0.7032967">
<folding />
</state>
</provider>
- <provider editor-type-id="HtmlPreview">
- <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/jmaki/xhp/XmlHttpProxy.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="11" column="0" selection-start="171" selection-end="171" vertical-scroll-proportion="0.2303665">
+ <state line="156" column="92" selection-start="6299" selection-end="6299" vertical-scroll-proportion="0.96263736">
<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">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/jmaki/xhp/HttpClient.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">
+ <state line="240" column="40" selection-start="7166" selection-end="7166" vertical-scroll-proportion="0.16666667">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/server/war/src/main/java/org/jboss/bpm/console/server/UserMgmtFacade.java">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/webapp/WEB-INF/web.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="75" column="0" selection-start="2466" selection-end="2466" vertical-scroll-proportion="0.33186814">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/jmaki/xhp/XmlHttpProxyServlet.java">
+ <entry file="jar://$APPLICATION_HOME_DIR$/lib/resources.jar!/standardSchemas/web-app_2_3.dtd">
<provider selected="true" editor-type-id="text-editor">
- <state line="141" column="0" selection-start="5605" selection-end="5605" vertical-scroll-proportion="0.7032967">
+ <state line="431" column="10" selection-start="14438" selection-end="14438" vertical-scroll-proportion="0.2345679">
<folding />
</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/WEB-INF/web.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="226" column="0" selection-start="6242" selection-end="6242" vertical-scroll-proportion="0.33186814">
+ <state line="88" column="39" selection-start="2550" selection-end="2550" vertical-scroll-proportion="0.8727273">
<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="80" column="0" selection-start="2679" selection-end="2679" vertical-scroll-proportion="0.3212766">
+ <state line="12" column="32" selection-start="230" selection-end="230" vertical-scroll-proportion="0.24646984">
<folding />
</state>
</provider>
+ <provider editor-type-id="HtmlPreview">
+ <state />
+ </provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/jmaki/xhp/XmlHttpProxy.java">
+ <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="156" column="92" selection-start="6299" selection-end="6299" vertical-scroll-proportion="0.96263736">
+ <state line="127" column="52" selection-start="4279" selection-end="4279" vertical-scroll-proportion="1.0617284">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/jmaki/xhp/HttpClient.java">
+ <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="236" column="0" selection-start="6891" selection-end="6891" vertical-scroll-proportion="0.64835167">
+ <state line="191" column="26" selection-start="5534" selection-end="5534" vertical-scroll-proportion="0.20246914">
<folding />
</state>
</provider>
Modified: bpm-console/trunk/gui/war/src/main/java/jmaki/xhp/HttpClient.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/jmaki/xhp/HttpClient.java 2009-08-18 14:01:11 UTC (rev 767)
+++ bpm-console/trunk/gui/war/src/main/java/jmaki/xhp/HttpClient.java 2009-08-18 15:10:23 UTC (rev 768)
@@ -18,7 +18,7 @@
import java.util.logging.Logger;
/**
- * @author Yutaka Yoshida, Greg Murray
+ * @author Yutaka Yoshida, Greg Murray, Heiko Braun
*
* Minimum set of HTTPclient supporting both http and https.
* It's aslo capable of POST, but it doesn't provide doGet because
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java 2009-08-18 14:01:11 UTC (rev 767)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java 2009-08-18 15:10:23 UTC (rev 768)
@@ -28,6 +28,8 @@
import com.mvc4g.client.Controller;
import com.mvc4g.client.ViewInterface;
import org.gwt.mosaic.ui.client.WindowPanel;
+import org.gwt.mosaic.ui.client.InfoPanel;
+import org.gwt.mosaic.ui.client.MessageBox;
import org.gwt.mosaic.ui.client.layout.*;
import org.jboss.bpm.console.client.util.ConsoleLog;
@@ -48,7 +50,7 @@
private Controller controller;
public final static String[] KNOWN_ROLES = {"admin", "manager", "user"};
-
+
public LoginView()
{
@@ -131,7 +133,8 @@
public void onLoginFailed(Request request, Throwable t)
{
// auth failed
- ConsoleLog.error("Authentication failed", t);
+ MessageBox.error("Login failed", t.getMessage());
+ ConsoleLog.error("Login failed", t);
}
}
);
@@ -200,14 +203,14 @@
});
Widget form = createForm();
-
+
layoutPanel.add(form, new BorderLayoutData(BorderLayout.Region.CENTER));
layoutPanel.add(submit, new BorderLayoutData(BorderLayout.Region.SOUTH));
}
private void engageLogin()
- {
+ {
requestProtectedResource();
}
@@ -254,7 +257,7 @@
{
return passwordInput.getText();
}
-
+
private Widget createForm()
{
LayoutPanel p = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL));
Modified: bpm-console/trunk/server/war/src/main/webapp/login_failed.html
===================================================================
--- bpm-console/trunk/server/war/src/main/webapp/login_failed.html 2009-08-18 14:01:11 UTC (rev 767)
+++ bpm-console/trunk/server/war/src/main/webapp/login_failed.html 2009-08-18 15:10:23 UTC (rev 768)
@@ -1,4 +1,7 @@
<html>
+<header>
+ <title>HTTP 401</title> <!-- Do not remove -->
+</header>
<body>
<center/>
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-18 14:01:11 UTC (rev 767)
+++ bpm-console/trunk/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java 2009-08-18 15:10:23 UTC (rev 768)
@@ -78,8 +78,15 @@
{
ConsoleLog.debug("postLoginCredentials() HTTP "+response.getStatusCode());
- if(response.getStatusCode()==200)
+ if(response.getText().indexOf("HTTP 401")!=-1) // HACK
{
+ if (callback != null)
+ callback.onLoginFailed(request, new Exception("Authentication failed"));
+ else
+ throw new RuntimeException("Unknown exception upon login attempt");
+ }
+ else if(response.getStatusCode()==200) // it's always 200, even when the authentication fails
+ {
DeferredCommand.addCommand(
new Command()
{
@@ -95,7 +102,10 @@
public void onError(Request request, Throwable t)
{
- ConsoleLog.error("Failed to authenticate", t);
+ if (callback != null)
+ callback.onLoginFailed(request, new Exception("Authentication failed"));
+ else
+ throw new RuntimeException("Unknown exception upon login attempt");
}
}
);
More information about the overlord-commits
mailing list