[overlord-commits] Overlord SVN: r767 - in bpm-console/trunk: gui/war/src/main/java/org/jboss/bpm/console/client and 1 other directories.
overlord-commits at lists.jboss.org
overlord-commits at lists.jboss.org
Tue Aug 18 10:01:12 EDT 2009
Author: heiko.braun at jboss.com
Date: 2009-08-18 10:01:11 -0400 (Tue, 18 Aug 2009)
New Revision: 767
Modified:
bpm-console/trunk/BPMC.iws
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/URLBuilder.java
bpm-console/trunk/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java
Log:
Cleanup
Modified: bpm-console/trunk/BPMC.iws
===================================================================
--- bpm-console/trunk/BPMC.iws 2009-08-18 13:59:58 UTC (rev 766)
+++ bpm-console/trunk/BPMC.iws 2009-08-18 14:01:11 UTC (rev 767)
@@ -17,9 +17,13 @@
</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$/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$/server/war/src/main/webapp/login.html" afterPath="$PROJECT_DIR$/server/war/src/main/webapp/login.html" />
- <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$/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" />
</list>
<list name="Failed commit: Default" comment="remove dependency on DTOParser" />
</component>
@@ -91,60 +95,6 @@
<disable_hints />
</component>
<component name="DebuggerManager">
- <line_breakpoints>
- <breakpoint url="file://$PROJECT_DIR$/server/war/src/main/java/org/jboss/bpm/console/server/UserMgmtFacade.java" line="113" class="org.jboss.bpm.console.server.UserMgmtFacade" 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>
- <breakpoint url="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java" line="265" class="org.jboss.bpm.console.client.task.AssignedTasksView" package="org.jboss.bpm.console.client.task">
- <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$/server/war/src/main/java/org/jboss/bpm/console/server/FormProcessingFacade.java" line="151" 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>
- <breakpoint url="file://$PROJECT_DIR$/gui/war/src/main/java/jmaki/xhp/HttpClient.java" line="59" 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>
- </line_breakpoints>
<breakpoint_any>
<breakpoint>
<option name="NOTIFY_CAUGHT" value="true" />
@@ -178,7 +128,24 @@
</breakpoint>
</breakpoint_any>
<breakpoint_rules />
- <ui_properties />
+ <ui_properties>
+ <property name="exception_breakpoints_flattenPackages" value="true" />
+ <property name="line_breakpoints_groupByClasses" value="true" />
+ <property name="exception_breakpoints_groupByMethods" value="false" />
+ <property name="method_breakpoints_viewId" value="TABLE" />
+ <property name="line_breakpoints_viewId" value="TABLE" />
+ <property name="exception_breakpoints_groupByClasses" value="true" />
+ <property name="method_breakpoints_groupByMethods" value="false" />
+ <property name="field_breakpoints_flattenPackages" value="true" />
+ <property name="line_breakpoints_flattenPackages" value="true" />
+ <property name="exception_breakpoints_viewId" value="TABLE" />
+ <property name="field_breakpoints_groupByClasses" value="true" />
+ <property name="method_breakpoints_flattenPackages" value="true" />
+ <property name="field_breakpoints_viewId" value="TABLE" />
+ <property name="line_breakpoints_groupByMethods" value="false" />
+ <property name="method_breakpoints_groupByClasses" value="true" />
+ <property name="field_breakpoints_groupByMethods" value="false" />
+ </ui_properties>
</component>
<component name="ErrorTreeViewConfiguration">
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
@@ -202,43 +169,37 @@
<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="131" column="85" selection-start="4033" selection-end="4033" vertical-scroll-proportion="0.80987656">
+ <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="web.xml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/server/war/src/main/webapp/WEB-INF/web.xml">
+ <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="28" column="49" selection-start="894" selection-end="894" vertical-scroll-proportion="-0.21333334">
+ <state line="226" column="0" selection-start="6242" selection-end="6242" vertical-scroll-proportion="0.33186814">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="login.html" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/server/war/src/main/webapp/login.html">
+ <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="26" column="64" selection-start="0" selection-end="557" vertical-scroll-proportion="0.5445026">
+ <state line="236" column="0" selection-start="6891" selection-end="6891" vertical-scroll-proportion="0.64835167">
<folding />
</state>
</provider>
- <provider editor-type-id="HtmlPreview">
- <state />
- </provider>
</entry>
</file>
- <file leaf-file-name="login_failed.html" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/server/war/src/main/webapp/login_failed.html">
+ <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="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>
</file>
</leaf>
@@ -336,172 +297,6 @@
<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="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/java" />
- <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/java/org" />
- <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/java/org/jboss" />
- <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/java/org/jboss/bpm" />
- <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/java/org/jboss/bpm/console" />
- <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/java/org/jboss/bpm/console/server" />
- <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>
@@ -645,10 +440,6 @@
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/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$/gui/war/src/main/resources" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -672,40 +463,6 @@
<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/resources" />
- <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/resources/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/resources/jmaki/xhp" />
- <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>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war" />
- <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" />
- <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" />
- <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" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
@@ -1011,16 +768,16 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="400" y="39" width="1240" height="972" extended-state="0" />
+ <frame x="230" y="43" 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="true" weight="0.33165407" order="0" />
+ <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="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="false" weight="0.24769102" 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="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" />
@@ -1032,7 +789,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="false" weight="0.39855942" order="4" />
+ <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="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" />
@@ -1123,116 +880,116 @@
<option name="myLastEditedConfigurable" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/jmaki/xhp/XmlHttpProxy.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="134" column="51" selection-start="5908" selection-end="5908" vertical-scroll-proportion="0.14453125">
+ <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/webapp/WEB-INF/web.xml">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/resources/jmaki/xhp/xhp.json">
<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="5" column="27" selection-start="162" selection-end="162" vertical-scroll-proportion="0.096969694">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/jmaki/xhp/XmlHttpProxyServlet.java">
+ <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="61" column="6" selection-start="2009" selection-end="2009" vertical-scroll-proportion="0.019753087">
+ <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$/gui/war/src/main/java/jmaki/xhp/HttpClient.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="78" column="66" selection-start="2330" selection-end="2330" 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$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/ConsoleConfig.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="104" column="22" selection-start="3184" selection-end="3184" vertical-scroll-proportion="0.01939394">
+ <state line="28" column="49" selection-start="894" selection-end="894" vertical-scroll-proportion="-0.21333334">
<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/login.html">
<provider selected="true" editor-type-id="text-editor">
- <state line="156" column="32" selection-start="2405" selection-end="4698" vertical-scroll-proportion="-1.4">
+ <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/task/AssignedTasksView.java">
+ <entry file="file://$PROJECT_DIR$/server/war/src/main/webapp/login_failed.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="11" column="0" selection-start="171" selection-end="171" vertical-scroll-proportion="0.2303665">
<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/java/org/jboss/bpm/console/server/UserMgmtFacade.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="79" column="23" selection-start="2564" selection-end="2564" vertical-scroll-proportion="0.9955556">
+ <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$/gui/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/jmaki/xhp/XmlHttpProxyServlet.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="31" column="13" selection-start="1338" selection-end="1338" vertical-scroll-proportion="0.28444445">
+ <state line="141" column="0" selection-start="5605" selection-end="5605" vertical-scroll-proportion="0.7032967">
<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$/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="131" column="85" selection-start="4033" selection-end="4033" vertical-scroll-proportion="0.80987656">
+ <state line="226" column="0" selection-start="6242" selection-end="6242" vertical-scroll-proportion="0.33186814">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/server/war/src/main/webapp/WEB-INF/web.xml">
+ <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="28" column="49" selection-start="894" selection-end="894" vertical-scroll-proportion="-0.21333334">
+ <state line="80" column="0" selection-start="2679" selection-end="2679" vertical-scroll-proportion="0.3212766">
<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/XmlHttpProxy.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="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$/server/war/src/main/webapp/login_failed.html">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/jmaki/xhp/HttpClient.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="236" column="0" selection-start="6891" selection-end="6891" vertical-scroll-proportion="0.64835167">
<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/LoginView.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java 2009-08-18 13:59:58 UTC (rev 766)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java 2009-08-18 14:01:11 UTC (rev 767)
@@ -213,7 +213,7 @@
/**
* The j_security_check URL is a kind of temporary resource that only exists
- * if the tomcat decided that the login page should be shown.
+ * if tomcat decided that the login page should be shown.
*/
private void requestProtectedResource()
{
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java 2009-08-18 13:59:58 UTC (rev 766)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java 2009-08-18 14:01:11 UTC (rev 767)
@@ -21,8 +21,8 @@
*/
package org.jboss.bpm.console.client;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.http.client.URL;
-import com.google.gwt.core.client.GWT;
import org.jboss.bpm.console.client.model.ProcessInstanceRef;
import org.jboss.bpm.console.client.model.TokenReference;
@@ -73,7 +73,7 @@
if (i < possibleRoles.length - 1)
sb.append(",");
}
- return config.getConsoleServerUrl() + "/rs/identity/user/roles;JSESSIONID="+Authentication.getSid()+"?roleCheck=" + sb.toString();
+ return config.getConsoleServerUrl() + "/rs/identity/user/roles?roleCheck=" + sb.toString();
}
public String getServerStatusURL()
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 13:59:58 UTC (rev 766)
+++ 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)
@@ -35,12 +35,12 @@
import java.util.List;
public class Authentication
-{
+{
private AuthCallback callback;
private List<String> rolesAssigned = new ArrayList<String>();
- private static String sid;
+ private String sid;
private String username;
private String password;
@@ -54,20 +54,20 @@
this.rolesUrl = rolesUrl;
}
- public static String getSid()
+ public String getSid()
{
return sid;
}
-
+
public void login(String user, String pass)
{
this.username = user;
this.password = pass;
-
+
String formAction = config.getConsoleServerUrl() + "/rs/identity/secure/j_security_check";
RequestBuilder rb = new RequestBuilder(RequestBuilder.POST, formAction);
rb.setHeader("Content-Type", "application/x-www-form-urlencoded");
-
+
try
{
rb.sendRequest("j_username="+user+"&j_password="+pass,
@@ -78,21 +78,24 @@
{
ConsoleLog.debug("postLoginCredentials() HTTP "+response.getStatusCode());
- DeferredCommand.addCommand(
- new Command()
- {
+ if(response.getStatusCode()==200)
+ {
+ DeferredCommand.addCommand(
+ new Command()
+ {
- public void execute()
- {
- requestAssignedRoles();
+ public void execute()
+ {
+ requestAssignedRoles();
+ }
}
- }
- );
+ );
+ }
}
public void onError(Request request, Throwable t)
{
- ConsoleLog.error("Faile to submit authenticate", t);
+ ConsoleLog.error("Failed to authenticate", t);
}
}
);
@@ -111,7 +114,7 @@
private void requestAssignedRoles()
{
RequestBuilder rb = new RequestBuilder(RequestBuilder.GET, rolesUrl );
-
+
ConsoleLog.debug("Request roles: " + rb.getUrl());
/*if (user != null && pass != null)
@@ -243,7 +246,7 @@
{
// parse roles
List<String> roles = new ArrayList<String>();
-
+
JSONValue root = JSONParser.parse(json);
JSONArray array = JSONWalk.on(root).next("roles").asArray();
More information about the overlord-commits
mailing list