Overlord SVN: r769 - cdl/trunk/runtime/jbossesb/src/main/configs.
by overlord-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2009-08-18 12:38:13 -0400 (Tue, 18 Aug 2009)
New Revision: 769
Modified:
cdl/trunk/runtime/jbossesb/src/main/configs/esb-assembly.xml
Log:
* Put all the lib in the top level, otherwise, it doesn't work well for AS 5.x.
Modified: cdl/trunk/runtime/jbossesb/src/main/configs/esb-assembly.xml
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/configs/esb-assembly.xml 2009-08-18 15:10:23 UTC (rev 768)
+++ cdl/trunk/runtime/jbossesb/src/main/configs/esb-assembly.xml 2009-08-18 16:38:13 UTC (rev 769)
@@ -18,11 +18,11 @@
<dependencySets>
<dependencySet>
- <outputDirectory>/lib</outputDirectory>
+ <outputDirectory>/</outputDirectory>
<includes>
<include>org.jboss.savara.runtime:savara-jbossesb</include>
</includes>
</dependencySet>
</dependencySets>
-</assembly>
\ No newline at end of file
+</assembly>
14 years, 8 months
- 1
- 0
Overlord SVN: r768 - in bpm-console/trunk: gui/war/src/main/java/jmaki/xhp and 3 other directories.
by overlord-commits＠lists.jboss.org
Author: heiko.braun(a)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");
}
}
);
14 years, 8 months
- 1
- 0
Overlord SVN: r767 - in bpm-console/trunk: gui/war/src/main/java/org/jboss/bpm/console/client and 1 other directories.
by overlord-commits＠lists.jboss.org
Author: heiko.braun(a)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();
14 years, 8 months
- 1
- 0
Overlord SVN: r766 - bpm-console/trunk/gui/war/src/main/java/jmaki/xhp.
by overlord-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-08-18 09:59:58 -0400 (Tue, 18 Aug 2009)
New Revision: 766
Modified:
bpm-console/trunk/gui/war/src/main/java/jmaki/xhp/HttpClient.java
bpm-console/trunk/gui/war/src/main/java/jmaki/xhp/XmlHttpProxy.java
bpm-console/trunk/gui/war/src/main/java/jmaki/xhp/XmlHttpProxyServlet.java
Log:
fix proxy authentication
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 12:07:48 UTC (rev 765)
+++ bpm-console/trunk/gui/war/src/main/java/jmaki/xhp/HttpClient.java 2009-08-18 13:59:58 UTC (rev 766)
@@ -6,12 +6,15 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.io.PrintStream;
+import java.io.IOException;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.URL;
import java.security.Security;
import java.util.Iterator;
import java.util.Map;
+import java.util.List;
+import java.util.HashMap;
import java.util.logging.Logger;
/**
@@ -23,246 +26,294 @@
*/
public class HttpClient {
- private static Logger logger;
- private String proxyHost = null;
- private int proxyPort = -1;
- private boolean isHttps = false;
- private boolean isProxy = false;
- private HttpURLConnection urlConnection = null;
- private Map headers;
+ private static Logger logger;
+ private String proxyHost = null;
+ private int proxyPort = -1;
+ private boolean isHttps = false;
+ private boolean isProxy = false;
+ private HttpURLConnection urlConnection = null;
+ private Map headers;
- /**
- * @param phost PROXY host name
- * @param pport PROXY port string
- * @param url URL string
- * @param headers Map
- */
- public HttpClient(
- String phost,
- int pport,
- String url,
- Map headers,
- String method)
- throws MalformedURLException
- {
- if (phost != null && pport != -1)
+ private String setCookieHeader;
+
+ private XmlHttpProxy.CookieCallback callback;
+
+ /**
+ * @param phost PROXY host name
+ * @param pport PROXY port string
+ * @param url URL string
+ * @param headers Map
+ */
+ public HttpClient(
+ String phost,
+ int pport,
+ String url,
+ Map headers,
+ String method,
+ XmlHttpProxy.CookieCallback callback)
+ throws MalformedURLException
+ {
+ this.callback = callback;
+
+ if (phost != null && pport != -1)
+ {
+ this.isProxy = true;
+ }
+
+ this.proxyHost = phost;
+ this.proxyPort = pport;
+
+ if (url.trim().startsWith("https:")) {
+ isHttps = true;
+ }
+
+ this.urlConnection = getURLConnection(url);
+ try {
+ this.urlConnection.setRequestMethod(method);
+ } catch (java.net.ProtocolException pe) {
+ HttpClient.getLogger().severe("Unable protocol method to " + method + " : " + pe);
+ }
+ this.headers = headers;
+ writeHeaders(headers);
+
+ }
+
+ private void writeHeaders(Map headers)
+ {
+ if(this.callback!=null)
+ {
+ for(XmlHttpProxy.Cookie c : callback.getCookies())
{
- this.isProxy = true;
+ if(headers==null) headers = new HashMap();
+ headers.put(
+ "Cookie", c.name + "=" + c.value // + "; Path=" + c.path
+ );
}
+ }
+ // set headers
+ if (headers != null) {
+ Iterator it = headers.keySet().iterator();
+ if (it != null) {
+ while (it.hasNext()) {
+ String key = (String)it.next();
+ String value = (String)headers.get(key);
+ System.out.println("Set Request Header: "+key + "->"+value);
+ this.urlConnection.setRequestProperty (key, value);
+ }
+ }
+ }
+ }
+
+ /**
+ * @param phost PROXY host name
+ * @param pport PROXY port string
+ * @param url URL string
+ * @param headers Map
+ * @param userName string
+ * @param password string
+ */
+ public HttpClient(String phost,
+ int pport,
+ String url,
+ Map headers,
+ String method,
+ String userName,
+ String password,
+ XmlHttpProxy.CookieCallback callback)
+ throws MalformedURLException {
+
+ this.callback = callback;
+
+ try
+ {
+ if (phost != null && pport != -1) {
+ this.isProxy = true;
+ }
+
this.proxyHost = phost;
this.proxyPort = pport;
-
if (url.trim().startsWith("https:")) {
- isHttps = true;
+ isHttps = true;
}
-
this.urlConnection = getURLConnection(url);
try {
- this.urlConnection.setRequestMethod(method);
+ this.urlConnection.setRequestMethod(method);
} catch (java.net.ProtocolException pe) {
- HttpClient.getLogger().severe("Unable protocol method to " + method + " : " + pe);
+ HttpClient.getLogger().severe("Unable protocol method to " + method + " : " + pe);
}
+ // set basic authentication information
+ String auth = userName + ":" + password;
+ String encoded = new sun.misc.BASE64Encoder().encode (auth.getBytes());
+ // set basic authorization
+ this.urlConnection.setRequestProperty ("Authorization", "Basic " + encoded);
this.headers = headers;
- // seat headers
- if (headers != null) {
- Iterator it = headers.keySet().iterator();
- if (it != null) {
- while (it.hasNext()) {
- String key = (String)it.next();
- String value = (String)headers.get(key);
- this.urlConnection.setRequestProperty (key, value);
- }
- }
+ writeHeaders(headers);
+ } catch (Exception ex) {
+ HttpClient.getLogger().severe("Unable to set basic authorization for " + userName + " : " +ex);
+ }
+ }
+
+ /**
+ * private method to get the URLConnection
+ * @param str URL string
+ */
+ private HttpURLConnection getURLConnection(String str)
+ throws MalformedURLException {
+ try {
+
+ if (isHttps) {
+ /* when communicating with the server which has unsigned or invalid
+ * certificate (https), SSLException or IOException is thrown.
+ * the following line is a hack to avoid that
+ */
+ Security.addProvider(new com.sun.net.ssl.internal.ssl.Provider());
+ System.setProperty("java.protocol.handler.pkgs", "com.sun.net.ssl.internal.www.protocol");
+ if (isProxy) {
+ System.setProperty("https.proxyHost", proxyHost);
+ System.setProperty("https.proxyPort", proxyPort + "");
+ }
}
- }
-
- /**
- * @param phost PROXY host name
- * @param pport PROXY port string
- * @param url URL string
- * @param headers Map
- * @param userName string
- * @param password string
- */
- public HttpClient(String phost,
- int pport,
- String url,
- Map headers,
- String method,
- String userName,
- String password)
- throws MalformedURLException {
- try
+ else
{
- if (phost != null && pport != -1) {
- this.isProxy = true;
- }
+ if (isProxy)
+ {
+ System.setProperty("http.proxyHost", proxyHost);
+ System.setProperty("http.proxyPort", proxyPort + "");
+ }
+ }
- this.proxyHost = phost;
- this.proxyPort = pport;
- if (url.trim().startsWith("https:")) {
- isHttps = true;
- }
- this.urlConnection = getURLConnection(url);
- try {
- this.urlConnection.setRequestMethod(method);
- } catch (java.net.ProtocolException pe) {
- HttpClient.getLogger().severe("Unable protocol method to " + method + " : " + pe);
- }
- // set basic authentication information
- String auth = userName + ":" + password;
- String encoded = new sun.misc.BASE64Encoder().encode (auth.getBytes());
- // set basic authorization
- this.urlConnection.setRequestProperty ("Authorization", "Basic " + encoded);
- this.headers = headers;
- // seat headers
- if (headers != null) {
- Iterator it = headers.entrySet().iterator();
- if (it != null) {
- while (it.hasNext()) {
- String key = (String)it.next();
- String value = (String)headers.get(key);
- this.urlConnection.setRequestProperty (key, value);
- }
- }
- }
- } catch (Exception ex) {
- HttpClient.getLogger().severe("Unable to set basic authorization for " + userName + " : " +ex);
+ URL url = new URL(str);
+ HttpURLConnection uc = (HttpURLConnection)url.openConnection();
+
+ // if this header has not been set by a request set the user agent.
+ if (headers == null ||
+ (headers != null && headers.get("user-agent") == null)) {
+ // set user agent to mimic a common browser
+ String ua="Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; .NET CLR 1.1.4322)";
+ uc.setRequestProperty("user-agent", ua);
}
- }
- /**
- * private method to get the URLConnection
- * @param str URL string
- */
- private HttpURLConnection getURLConnection(String str)
- throws MalformedURLException {
- try {
+ uc.setInstanceFollowRedirects(false);
- if (isHttps) {
- /* when communicating with the server which has unsigned or invalid
- * certificate (https), SSLException or IOException is thrown.
- * the following line is a hack to avoid that
- */
- Security.addProvider(new com.sun.net.ssl.internal.ssl.Provider());
- System.setProperty("java.protocol.handler.pkgs", "com.sun.net.ssl.internal.www.protocol");
- if (isProxy) {
- System.setProperty("https.proxyHost", proxyHost);
- System.setProperty("https.proxyPort", proxyPort + "");
- }
- }
- else
- {
- if (isProxy)
- {
- System.setProperty("http.proxyHost", proxyHost);
- System.setProperty("http.proxyPort", proxyPort + "");
- }
- }
+ return uc;
+ }
+ catch (MalformedURLException me)
+ {
+ throw new MalformedURLException(str + " is not a valid URL");
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException("Unknown error creating UrlConnection: " + e);
+ }
+ }
- URL url = new URL(str);
- HttpURLConnection uc = (HttpURLConnection)url.openConnection();
- // if this header has not been set by a request set the user agent.
- if (headers == null ||
- (headers != null && headers.get("user-agent") == null)) {
- // set user agent to mimic a common browser
- String ua="Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; .NET CLR 1.1.4322)";
- uc.setRequestProperty("user-agent", ua);
- }
- return uc;
- }
- catch (MalformedURLException me)
+ public String getSetCookieHeader()
+ {
+ return setCookieHeader;
+ }
+
+ /**
+ * returns the inputstream from URLConnection
+ * @return InputStream
+ */
+ public InputStream getInputStream() {
+ try
+ {
+ // logger doesnt work, because it writes to stderr,
+ // which causes GwtTest to interpret it as failure
+ System.out.println(
+ this.urlConnection.getRequestMethod()+ " " +
+ this.urlConnection.getURL() +": "+
+ this.urlConnection.getResponseCode()
+ );
+
+ try
{
- throw new MalformedURLException(str + " is not a valid URL");
+ // HACK: manually follow redirects, for the login to work
+ // HTTPUrlConnection auto redirect doesn't respect the provided headers
+ if(this.urlConnection.getResponseCode()==302)
+ {
+ HttpClient redirectClient =
+ new HttpClient(proxyHost,proxyPort, urlConnection.getHeaderField("Location"),
+ headers, urlConnection.getRequestMethod(), callback);
+ redirectClient.getInputStream().close();
+ }
}
- catch (Exception e)
+ catch (Throwable e)
{
- throw new RuntimeException("Unknown error creating UrlConnection: " + e);
+ System.out.println("Following redirect failed");
}
- }
- /**
- * returns the inputstream from URLConnection
- * @return InputStream
- */
- public InputStream getInputStream() {
- try
- {
- // logger doesnt work, because it writes to stderr,
- // which causes GwtTest to interpret it as failure
- System.out.println(
- this.urlConnection.getRequestMethod()+ " " +
- this.urlConnection.getURL() +": "+
- this.urlConnection.getResponseCode()
- );
- return (this.urlConnection.getInputStream());
- } catch (Exception e) {
- e.printStackTrace();
- return null;
- }
- }
+ setCookieHeader = this.urlConnection.getHeaderField("Set-Cookie");
- /**
- * return the OutputStream from URLConnection
- * @return OutputStream
- */
- public OutputStream getOutputStream() {
+ return (this.urlConnection.getInputStream());
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
- try {
- return (this.urlConnection.getOutputStream());
- } catch (Exception e) {
- e.printStackTrace();
- return null;
- }
- }
+ /**
+ * return the OutputStream from URLConnection
+ * @return OutputStream
+ */
+ public OutputStream getOutputStream() {
- /**
- * posts data to the inputstream and returns the InputStream.
- * @param postData data to be posted. must be url-encoded already.
- * @param contentType allows you to set the contentType of the request.
- * @return InputStream input stream from URLConnection
- */
- public InputStream doPost(String postData, String contentType) {
- this.urlConnection.setDoOutput(true);
- if (contentType != null) this.urlConnection.setRequestProperty( "Content-type", contentType );
+ try {
+ return (this.urlConnection.getOutputStream());
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
- OutputStream os = this.getOutputStream();
- PrintStream ps = new PrintStream(os);
- ps.print(postData);
- ps.close();
- return (this.getInputStream());
- }
+ /**
+ * posts data to the inputstream and returns the InputStream.
+ * @param postData data to be posted. must be url-encoded already.
+ * @param contentType allows you to set the contentType of the request.
+ * @return InputStream input stream from URLConnection
+ */
+ public InputStream doPost(String postData, String contentType) {
+ this.urlConnection.setDoOutput(true);
+ if (contentType != null) this.urlConnection.setRequestProperty( "Content-type", contentType );
- public String getContentEncoding() {
- if (this.urlConnection == null) return null;
- return (this.urlConnection.getContentEncoding());
- }
- public int getContentLength() {
- if (this.urlConnection == null) return -1;
- return (this.urlConnection.getContentLength());
- }
- public String getContentType() {
- if (this.urlConnection == null) return null;
- return (this.urlConnection.getContentType());
- }
- public long getDate() {
- if (this.urlConnection == null) return -1;
- return (this.urlConnection.getDate());
- }
- public String getHeader(String name) {
- if (this.urlConnection == null) return null;
- return (this.urlConnection.getHeaderField(name));
- }
- public long getIfModifiedSince() {
- if (this.urlConnection == null) return -1;
- return (this.urlConnection.getIfModifiedSince());
- }
+ OutputStream os = this.getOutputStream();
+ PrintStream ps = new PrintStream(os);
+ ps.print(postData);
+ ps.close();
+ return (this.getInputStream());
+ }
- public static Logger getLogger() {
- if (logger == null) {
- logger = Logger.getLogger("jmaki.xhp.Log");
- }
- return logger;
- }
+ public String getContentEncoding() {
+ if (this.urlConnection == null) return null;
+ return (this.urlConnection.getContentEncoding());
+ }
+ public int getContentLength() {
+ if (this.urlConnection == null) return -1;
+ return (this.urlConnection.getContentLength());
+ }
+ public String getContentType() {
+ if (this.urlConnection == null) return null;
+ return (this.urlConnection.getContentType());
+ }
+ public long getDate() {
+ if (this.urlConnection == null) return -1;
+ return (this.urlConnection.getDate());
+ }
+ public String getHeader(String name) {
+ if (this.urlConnection == null) return null;
+ return (this.urlConnection.getHeaderField(name));
+ }
+ public long getIfModifiedSince() {
+ if (this.urlConnection == null) return -1;
+ return (this.urlConnection.getIfModifiedSince());
+ }
+
+ public static Logger getLogger() {
+ if (logger == null) {
+ logger = Logger.getLogger("jmaki.xhp.Log");
+ }
+ return logger;
+ }
}
\ No newline at end of file
Modified: bpm-console/trunk/gui/war/src/main/java/jmaki/xhp/XmlHttpProxy.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/jmaki/xhp/XmlHttpProxy.java 2009-08-18 12:07:48 UTC (rev 765)
+++ bpm-console/trunk/gui/war/src/main/java/jmaki/xhp/XmlHttpProxy.java 2009-08-18 13:59:58 UTC (rev 766)
@@ -19,382 +19,445 @@
import java.io.*;
import java.net.MalformedURLException;
import java.net.URL;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
+import java.util.*;
import java.util.logging.Logger;
public class XmlHttpProxy {
- public static String GET = "GET";
- public static String POST = "POST";
- public static String DELETE = "DELETE";
- public static String PUT = "PUT";
+ public static String GET = "GET";
+ public static String POST = "POST";
+ public static String DELETE = "DELETE";
+ public static String PUT = "PUT";
- private String userName = null;
- private String password = null;
- private static Logger logger;
- private String proxyHost = "";
- int proxyPort = -1;
- private JSONObject config;
- private static String USAGE = "Usage: -url service_URL -id service_key [-url or -id required] -xslurl xsl_url [optional] -format json|xml [optional] -callback[optional] -config [optional] -resources base_directory_containing XSL stylesheets [optional]";
+ private String userName = null;
+ private String password = null;
+ private static Logger logger;
+ private String proxyHost = "";
+ int proxyPort = -1;
+ private JSONObject config;
+ private static String USAGE = "Usage: -url service_URL -id service_key [-url or -id required] -xslurl xsl_url [optional] -format json|xml [optional] -callback[optional] -config [optional] -resources base_directory_containing XSL stylesheets [optional]";
- public XmlHttpProxy() {}
+ public XmlHttpProxy() {}
- public XmlHttpProxy(String proxyHost, int proxyPort) {
- this.proxyHost = proxyHost;
- this.proxyPort = proxyPort;
- }
+ private Set<Cookie> cookies = new HashSet<Cookie>();
- public XmlHttpProxy(String proxyHost, int proxyPort,
- String userName, String password) {
- this.proxyHost = proxyHost;
- this.proxyPort = proxyPort;
- this.userName = userName;
- this.password = password;
- }
+ public interface CookieCallback
+ {
+ Set<Cookie> getCookies();
+ }
- /**
- * This method will go out and make the call and it will apply an XSLT Transformation with the
- * set of parameters provided.
- *
- * @param urlString - The URL which you are looking up
- * @param out - The OutputStream to which the resulting document is written
- * @param xslInputStream - An input Stream to an XSL style sheet that is provided to the XSLT processor. If set to null there will be no transformation
- * @param paramsMap - A Map of parameters that are feed to the XSLT Processor. These params may be used when generating content. This may be set to null if no parameters are necessary.
- * @param method - The HTTP method used.
- *
- */
- public void processRequest(String urlString,
- OutputStream out,
- InputStream xslInputStream,
- Map paramsMap,
- Map headers,
- String method,
- String userName,
- String password) throws IOException, MalformedURLException {
- doProcess(urlString, out, xslInputStream, paramsMap, headers,method, null,null, userName,password);
- }
- /**
- * This method will go out and make the call and it will apply an XSLT Transformation with the
- * set of parameters provided.
- *
- * @param urlString - The URL which you are looking up
- * @param out - The OutputStream to which the resulting document is written
- *
- */
- public void doPost(String urlString,
- OutputStream out,
- InputStream xslInputStream,
- Map paramsMap,
- Map headers,
- String postData,
- String postContentType,
- String userName,
- String password) throws IOException, MalformedURLException {
- doProcess(urlString, out, xslInputStream, paramsMap, headers, XmlHttpProxy.POST, postData, postContentType, userName, password);
- }
+ public XmlHttpProxy(String proxyHost, int proxyPort) {
+ this.proxyHost = proxyHost;
+ this.proxyPort = proxyPort;
+ }
- /**
- * This method will go out and make the call and it will apply an XSLT Transformation with the
- * set of parameters provided.
- *
- * @param urlString - The URL which you are looking up
- * @param out - The OutputStream to which the resulting document is written
- * @param xslInputStream - An input Stream to an XSL style sheet that is provided to the XSLT processor. If set to null there will be no transformation
- * @param paramsMap - A Map of parameters that are feed to the XSLT Processor. These params may be used when generating content. This may be set to null if no parameters are necessary.
- * @param method - the HTTP method used.
- * @param postData - A String of the bodyContent to be posted. A doPost will be used if this is parameter is not null.
- * @param postContentType - The request contentType used when posting data. Will not be set if this parameter is null.
- * @param userName - userName used for basic authorization
- * @param password - password used for basic authorization
- */
- public void doProcess(String urlString,
- OutputStream out,
- InputStream xslInputStream,
- Map paramsMap,
- Map headers,
- String method,
- String postData,
- String postContentType,
- String userName,
- String password) throws IOException, MalformedURLException {
-
- if (paramsMap == null) {
- paramsMap = new HashMap();
- }
+ public XmlHttpProxy(String proxyHost, int proxyPort,
+ String userName, String password) {
+ this.proxyHost = proxyHost;
+ this.proxyPort = proxyPort;
+ this.userName = userName;
+ this.password = password;
+ }
- String format = (String)paramsMap.get("format");
- if (format == null) {
- format = "xml";
- }
+ /**
+ * This method will go out and make the call and it will apply an XSLT Transformation with the
+ * set of parameters provided.
+ *
+ * @param urlString - The URL which you are looking up
+ * @param out - The OutputStream to which the resulting document is written
+ * @param xslInputStream - An input Stream to an XSL style sheet that is provided to the XSLT processor. If set to null there will be no transformation
+ * @param paramsMap - A Map of parameters that are feed to the XSLT Processor. These params may be used when generating content. This may be set to null if no parameters are necessary.
+ * @param method - The HTTP method used.
+ *
+ */
+ public void processRequest(String urlString,
+ OutputStream out,
+ InputStream xslInputStream,
+ Map paramsMap,
+ Map headers,
+ String method,
+ String userName,
+ String password) throws IOException, MalformedURLException {
+ doProcess(urlString, out, xslInputStream, paramsMap, headers,method, null,null, userName,password);
+ }
+ /**
+ * This method will go out and make the call and it will apply an XSLT Transformation with the
+ * set of parameters provided.
+ *
+ * @param urlString - The URL which you are looking up
+ * @param out - The OutputStream to which the resulting document is written
+ *
+ */
+ public void doPost(String urlString,
+ OutputStream out,
+ InputStream xslInputStream,
+ Map paramsMap,
+ Map headers,
+ String postData,
+ String postContentType,
+ String userName,
+ String password) throws IOException, MalformedURLException {
+ doProcess(urlString, out, xslInputStream, paramsMap, headers, XmlHttpProxy.POST, postData, postContentType, userName, password);
+ }
- InputStream in = null;
- BufferedOutputStream os = null;
+ /**
+ * This method will go out and make the call and it will apply an XSLT Transformation with the
+ * set of parameters provided.
+ *
+ * @param urlString - The URL which you are looking up
+ * @param out - The OutputStream to which the resulting document is written
+ * @param xslInputStream - An input Stream to an XSL style sheet that is provided to the XSLT processor. If set to null there will be no transformation
+ * @param paramsMap - A Map of parameters that are feed to the XSLT Processor. These params may be used when generating content. This may be set to null if no parameters are necessary.
+ * @param method - the HTTP method used.
+ * @param postData - A String of the bodyContent to be posted. A doPost will be used if this is parameter is not null.
+ * @param postContentType - The request contentType used when posting data. Will not be set if this parameter is null.
+ * @param userName - userName used for basic authorization
+ * @param password - password used for basic authorization
+ */
+ public void doProcess(String urlString,
+ OutputStream out,
+ InputStream xslInputStream,
+ Map paramsMap,
+ Map headers,
+ String method,
+ String postData,
+ String postContentType,
+ String userName,
+ String password) throws IOException, MalformedURLException {
- HttpClient httpclient = null;
+ if (paramsMap == null) {
+ paramsMap = new HashMap();
+ }
- if (userName != null && password != null)
+ String format = (String)paramsMap.get("format");
+ if (format == null) {
+ format = "xml";
+ }
+
+ InputStream in = null;
+ BufferedOutputStream os = null;
+
+ HttpClient httpclient = null;
+
+ CookieCallback callback = new CookieCallback()
+ {
+
+ public Set<Cookie> getCookies()
{
- httpclient = new HttpClient(proxyHost, proxyPort, urlString, headers, method, userName, password);
+ return accessCookies();
}
- else
+ };
+
+ if (userName != null && password != null)
+ {
+ httpclient = new HttpClient(proxyHost, proxyPort, urlString, headers, method, userName, password, callback);
+ }
+ else
+ {
+ httpclient = new HttpClient(proxyHost, proxyPort, urlString, headers, method, callback);
+ }
+
+ // post data determines whether we are going to do a get or a post
+ if (postData == null) {
+ in = httpclient.getInputStream();
+ } else {
+ in = httpclient.doPost(postData, postContentType);
+ }
+
+ // Set-Cookie header
+ if(httpclient.getSetCookieHeader()!=null)
+ {
+ String cookie = httpclient.getSetCookieHeader();
+ System.out.println("'Set-Cookie' header: "+ cookie);
+ String[] values = cookie.split(";");
+
+ Cookie c = new Cookie();
+ for(String v : values)
{
- httpclient = new HttpClient(proxyHost, proxyPort, urlString, headers, method);
+ String[] tuple = v.split("=");
+ if("Path".equals( tuple[0].trim()))
+ c.path = tuple[1];
+ else
+ {
+ c.name = tuple[0].trim();
+ c.value = tuple[1];
+ }
}
- // post data determines whether we are going to do a get or a post
- if (postData == null) {
- in = httpclient.getInputStream();
- } else {
- in = httpclient.doPost(postData, postContentType);
- }
+ for(Cookie exists : cookies)
+ {
+ if(exists.name.equals(c.name))
+ {
+ String msg = exists.value.equals(c.value) ?
+ "Replace with same value: "+exists.value :
+ "Replace with different value: "+exists.value +"->"+c.value;
- if(null==in)
- {
- throw new IOException("Failed to open input stream");
+ System.out.println("Cookie '"+exists.name+"' exists: " + msg);
+ // avoid doubles
+ cookies.remove(exists);
+ }
}
+
+ cookies.add(c);
+ }
+
+ if(null==in)
+ {
+ throw new IOException("Failed to open input stream");
+ }
- // read the encoding from the incoming document and default to UTF-8
- // if an encoding is not provided
- String ce = httpclient.getContentEncoding();
- if (ce == null) {
- String ct = httpclient.getContentType();
- if (ct != null) {
- int idx = ct.lastIndexOf("charset=");
- if (idx >= 0) {
- ce = ct.substring(idx+8);
- } else {
- ce = "UTF-8";
- }
- } else {
- ce = "UTF-8";
- }
+ // read the encoding from the incoming document and default to UTF-8
+ // if an encoding is not provided
+ String ce = httpclient.getContentEncoding();
+ if (ce == null) {
+ String ct = httpclient.getContentType();
+ if (ct != null) {
+ int idx = ct.lastIndexOf("charset=");
+ if (idx >= 0) {
+ ce = ct.substring(idx+8);
+ } else {
+ ce = "UTF-8";
+ }
+ } else {
+ ce = "UTF-8";
}
- // get the content type
- String cType = null;
- // write out the content type
- //http://www.ietf.org/rfc/rfc4627.txt
- if (format.equals("json")) {
- cType = "application/json;charset="+ce;
+ }
+ // get the content type
+ String cType = null;
+ // write out the content type
+ //http://www.ietf.org/rfc/rfc4627.txt
+ if (format.equals("json")) {
+ cType = "application/json;charset="+ce;
+ } else {
+ cType = "text/xml;charset="+ce;
+ }
+ try {
+ byte[] buffer = new byte[1024];
+ int read = 0;
+ if (xslInputStream == null) {
+ while (true) {
+ read = in.read(buffer);
+ if (read <= 0) break;
+ out.write(buffer, 0, read );
+ }
} else {
- cType = "text/xml;charset="+ce;
+ transform(in, xslInputStream, paramsMap, out, ce);
}
+ } catch (Exception e) {
+ getLogger().severe("XmlHttpProxy transformation error: " + e);
+ } finally {
try {
- byte[] buffer = new byte[1024];
- int read = 0;
- if (xslInputStream == null) {
- while (true) {
- read = in.read(buffer);
- if (read <= 0) break;
- out.write(buffer, 0, read );
- }
- } else {
- transform(in, xslInputStream, paramsMap, out, ce);
- }
+ if (in != null) {
+ in.close();
+ }
+ if (out != null) {
+ out.flush();
+ out.close();
+ }
} catch (Exception e) {
- getLogger().severe("XmlHttpProxy transformation error: " + e);
- } finally {
- try {
- if (in != null) {
- in.close();
- }
- if (out != null) {
- out.flush();
- out.close();
- }
- } catch (Exception e) {
- // do nothing
- }
+ // do nothing
}
- }
+ }
+ }
- /**
- * Do the XSLT transformation
- */
- public void transform( InputStream xmlIS,
- InputStream xslIS,
- Map params,
- OutputStream result,
- String encoding) {
- try {
- TransformerFactory trFac = TransformerFactory.newInstance();
- Transformer transformer = trFac.newTransformer(new StreamSource(xslIS));
- Iterator it = params.keySet().iterator();
- while (it.hasNext()) {
- String key = (String)it.next();
- transformer.setParameter(key, (String)params.get(key));
- }
- transformer.setOutputProperty("encoding", encoding);
- transformer.transform(new StreamSource(xmlIS), new StreamResult(result));
- } catch (Exception e) {
- getLogger().severe("XmlHttpProxy: Exception with xslt " + e);
+ private Set<Cookie> accessCookies()
+ {
+ return cookies;
+ }
+
+ /**
+ * Do the XSLT transformation
+ */
+ public void transform( InputStream xmlIS,
+ InputStream xslIS,
+ Map params,
+ OutputStream result,
+ String encoding) {
+ try {
+ TransformerFactory trFac = TransformerFactory.newInstance();
+ Transformer transformer = trFac.newTransformer(new StreamSource(xslIS));
+ Iterator it = params.keySet().iterator();
+ while (it.hasNext()) {
+ String key = (String)it.next();
+ transformer.setParameter(key, (String)params.get(key));
}
- }
+ transformer.setOutputProperty("encoding", encoding);
+ transformer.transform(new StreamSource(xmlIS), new StreamResult(result));
+ } catch (Exception e) {
+ getLogger().severe("XmlHttpProxy: Exception with xslt " + e);
+ }
+ }
- /**
- *
- * CLI to the XmlHttpProxy
- */
- public static void main(String[] args)
- throws IOException, MalformedURLException {
+ /**
+ *
+ * CLI to the XmlHttpProxy
+ */
+ public static void main(String[] args)
+ throws IOException, MalformedURLException {
- getLogger().info("XmlHttpProxy 1.8");
- XmlHttpProxy xhp = new XmlHttpProxy();
+ getLogger().info("XmlHttpProxy 1.8");
+ XmlHttpProxy xhp = new XmlHttpProxy();
- if (args.length == 0) {
- System.out.println(USAGE);
- }
+ if (args.length == 0) {
+ System.out.println(USAGE);
+ }
- String method = XmlHttpProxy.GET;
- InputStream xslInputStream = null;
- String serviceKey = null;
- String urlString = null;
- String xslURLString = null;
- String format = "xml";
- String callback = null;
- String urlParams = null;
- String configURLString = "xhp.json";
- String resourceBase = "file:src/conf/META-INF/resources/xsl/";
- String username = null;
- String password = null;
+ String method = XmlHttpProxy.GET;
+ InputStream xslInputStream = null;
+ String serviceKey = null;
+ String urlString = null;
+ String xslURLString = null;
+ String format = "xml";
+ String callback = null;
+ String urlParams = null;
+ String configURLString = "xhp.json";
+ String resourceBase = "file:src/conf/META-INF/resources/xsl/";
+ String username = null;
+ String password = null;
- // read in the arguments
- int index = 0;
- while (index < args.length) {
- if (args[index].toLowerCase().equals("-url") && index + 1 < args.length) {
- urlString = args[++index];
- } else if (args[index].toLowerCase().equals("-key") && index + 1 < args.length) {
- serviceKey = args[++index];
- } else if (args[index].toLowerCase().equals("-id") && index + 1 < args.length) {
- serviceKey = args[++index];
- } else if (args[index].toLowerCase().equals("-callback") && index + 1 < args.length) {
- callback = args[++index];
- } else if (args[index].toLowerCase().equals("-xslurl") && index + 1 < args.length) {
- xslURLString = args[++index];
- } else if (args[index].toLowerCase().equals("-method") && index + 1 < args.length) {
- method = args[++index];
- } else if (args[index].toLowerCase().equals("-username") && index + 1 < args.length) {
- username = args[++index];
- } else if (args[index].toLowerCase().equals("-password") && index + 1 < args.length) {
- password = args[++index];
- } else if (args[index].toLowerCase().equals("-urlparams") && index + 1 < args.length) {
- urlParams = args[++index];
- } else if (args[index].toLowerCase().equals("-config") && index + 1 < args.length) {
- configURLString = args[++index];
- } else if (args[index].toLowerCase().equals("-resources") && index + 1 < args.length) {
- resourceBase = args[++index];
- }
- index++;
+ // read in the arguments
+ int index = 0;
+ while (index < args.length) {
+ if (args[index].toLowerCase().equals("-url") && index + 1 < args.length) {
+ urlString = args[++index];
+ } else if (args[index].toLowerCase().equals("-key") && index + 1 < args.length) {
+ serviceKey = args[++index];
+ } else if (args[index].toLowerCase().equals("-id") && index + 1 < args.length) {
+ serviceKey = args[++index];
+ } else if (args[index].toLowerCase().equals("-callback") && index + 1 < args.length) {
+ callback = args[++index];
+ } else if (args[index].toLowerCase().equals("-xslurl") && index + 1 < args.length) {
+ xslURLString = args[++index];
+ } else if (args[index].toLowerCase().equals("-method") && index + 1 < args.length) {
+ method = args[++index];
+ } else if (args[index].toLowerCase().equals("-username") && index + 1 < args.length) {
+ username = args[++index];
+ } else if (args[index].toLowerCase().equals("-password") && index + 1 < args.length) {
+ password = args[++index];
+ } else if (args[index].toLowerCase().equals("-urlparams") && index + 1 < args.length) {
+ urlParams = args[++index];
+ } else if (args[index].toLowerCase().equals("-config") && index + 1 < args.length) {
+ configURLString = args[++index];
+ } else if (args[index].toLowerCase().equals("-resources") && index + 1 < args.length) {
+ resourceBase = args[++index];
}
+ index++;
+ }
- if (serviceKey != null) {
- try {
- InputStream is = (new URL(configURLString)).openStream();
- JSONObject services = loadServices(is);
- JSONObject service = services.getJSONObject(serviceKey);
- // default to the service default if no url parameters are specified
- if (urlParams == null && service.has("defaultURLParams")) {
- urlParams = service.getString("defaultURLParams");
- }
- String serviceURL = service.getString("url");
- // build the URL properly
- if (urlParams != null && serviceURL.indexOf("?") == -1){
- serviceURL += "?";
- } else if (urlParams != null){
- serviceURL += "&";
- }
- String apiKey = "";
- if (service.has("apikey")) apiKey = service.getString("apikey");
- urlString = serviceURL + apiKey + "&" + urlParams;
- if (service.has("xslStyleSheet")) {
- xslURLString = service.getString("xslStyleSheet");
- // check if the url is correct of if to load from the classpath
+ if (serviceKey != null) {
+ try {
+ InputStream is = (new URL(configURLString)).openStream();
+ JSONObject services = loadServices(is);
+ JSONObject service = services.getJSONObject(serviceKey);
+ // default to the service default if no url parameters are specified
+ if (urlParams == null && service.has("defaultURLParams")) {
+ urlParams = service.getString("defaultURLParams");
+ }
+ String serviceURL = service.getString("url");
+ // build the URL properly
+ if (urlParams != null && serviceURL.indexOf("?") == -1){
+ serviceURL += "?";
+ } else if (urlParams != null){
+ serviceURL += "&";
+ }
+ String apiKey = "";
+ if (service.has("apikey")) apiKey = service.getString("apikey");
+ urlString = serviceURL + apiKey + "&" + urlParams;
+ if (service.has("xslStyleSheet")) {
+ xslURLString = service.getString("xslStyleSheet");
+ // check if the url is correct of if to load from the classpath
- }
- } catch (Exception ex) {
- getLogger().severe("XmlHttpProxy Error loading service: " + ex);
- System.exit(1);
- }
- } else if (urlString == null) {
- System.out.println(USAGE);
- System.exit(1);
+ }
+ } catch (Exception ex) {
+ getLogger().severe("XmlHttpProxy Error loading service: " + ex);
+ System.exit(1);
}
- // The parameters are feed to the XSL Stylsheet during transformation.
- // These parameters can provided data or conditional information.
- Map paramsMap = new HashMap();
- if (format != null) {
- paramsMap.put("format", format);
- }
- if (callback != null) {
- paramsMap.put("callback", callback);
- }
+ } else if (urlString == null) {
+ System.out.println(USAGE);
+ System.exit(1);
+ }
+ // The parameters are feed to the XSL Stylsheet during transformation.
+ // These parameters can provided data or conditional information.
+ Map paramsMap = new HashMap();
+ if (format != null) {
+ paramsMap.put("format", format);
+ }
+ if (callback != null) {
+ paramsMap.put("callback", callback);
+ }
- if (xslURLString != null) {
- URL xslURL = new URL(xslURLString);
- if (xslURL != null) {
- xslInputStream = xslURL.openStream();
- } else {
- getLogger().severe("Error: Unable to locate XSL at URL " + xslURLString);
- }
+ if (xslURLString != null) {
+ URL xslURL = new URL(xslURLString);
+ if (xslURL != null) {
+ xslInputStream = xslURL.openStream();
+ } else {
+ getLogger().severe("Error: Unable to locate XSL at URL " + xslURLString);
}
- xhp.processRequest(urlString, System.out, xslInputStream, paramsMap, null, method, username, password);
- }
+ }
+ xhp.processRequest(urlString, System.out, xslInputStream, paramsMap, null, method, username, password);
+ }
- public static Logger getLogger() {
- if (logger == null) {
- logger = Logger.getLogger("jmaki.xhp.Log");
+ public static Logger getLogger() {
+ if (logger == null) {
+ logger = Logger.getLogger("jmaki.xhp.Log");
+ }
+ return logger;
+ }
+
+ public static JSONObject loadServices(InputStream is)
+ {
+ JSONObject config = null;
+ JSONObject services = new JSONObject();
+ try
+ {
+ config = loadJSONObject(is).getJSONObject("xhp");
+ JSONArray sA = config.getJSONArray("services");
+ for (int l=0; l < sA.length(); l++) {
+ JSONObject value = sA.getJSONObject(l);
+ String key = value.getString("id");
+ services.put(key,value);
}
- return logger;
- }
+ }
+ catch (Exception ex)
+ {
+ getLogger().severe("XmlHttpProxy error loading services." + ex);
+ }
+ return services;
+ }
- public static JSONObject loadServices(InputStream is)
- {
- JSONObject config = null;
- JSONObject services = new JSONObject();
- try
- {
- config = loadJSONObject(is).getJSONObject("xhp");
- JSONArray sA = config.getJSONArray("services");
- for (int l=0; l < sA.length(); l++) {
- JSONObject value = sA.getJSONObject(l);
- String key = value.getString("id");
- services.put(key,value);
- }
+ public static JSONObject loadJSONObject(InputStream in) {
+ ByteArrayOutputStream out = null;
+ try {
+ byte[] buffer = new byte[1024];
+ int read = 0;
+ out = new ByteArrayOutputStream();
+ while (true) {
+ read = in.read(buffer);
+ if (read <= 0) break;
+ out.write(buffer, 0, read );
}
- catch (Exception ex)
- {
- getLogger().severe("XmlHttpProxy error loading services." + ex);
- }
- return services;
- }
-
- public static JSONObject loadJSONObject(InputStream in) {
- ByteArrayOutputStream out = null;
+ return new JSONObject(out.toString());
+ } catch (Exception e) {
+ getLogger().severe("XmlHttpProxy error reading in json " + e);
+ } finally {
try {
- byte[] buffer = new byte[1024];
- int read = 0;
- out = new ByteArrayOutputStream();
- while (true) {
- read = in.read(buffer);
- if (read <= 0) break;
- out.write(buffer, 0, read );
- }
- return new JSONObject(out.toString());
+ if (in != null) {
+ in.close();
+ }
+ if (out != null) {
+ out.flush();
+ out.close();
+ }
} catch (Exception e) {
- getLogger().severe("XmlHttpProxy error reading in json " + e);
- } finally {
- try {
- if (in != null) {
- in.close();
- }
- if (out != null) {
- out.flush();
- out.close();
- }
- } catch (Exception e) {
- }
}
- return null;
- }
+ }
+ return null;
+ }
+
+ public class Cookie
+ {
+ String name;
+ String value;
+ String path;
+ }
}
\ No newline at end of file
Modified: bpm-console/trunk/gui/war/src/main/java/jmaki/xhp/XmlHttpProxyServlet.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/jmaki/xhp/XmlHttpProxyServlet.java 2009-08-18 12:07:48 UTC (rev 765)
+++ bpm-console/trunk/gui/war/src/main/java/jmaki/xhp/XmlHttpProxyServlet.java 2009-08-18 13:59:58 UTC (rev 766)
@@ -55,6 +55,8 @@
private static String testUser;
private static String testPass;
+ private static String setCookie;
+
public XmlHttpProxyServlet() {
if (rDebug) {
logger = getLogger();
14 years, 8 months
- 1
- 0
Overlord SVN: r765 - in cdl/trunk/tools/eclipse: features/org.jboss.savara.tools.jbossesb.feature and 3 other directories.
by overlord-commits＠lists.jboss.org
Author: objectiser
Date: 2009-08-18 08:07:48 -0400 (Tue, 18 Aug 2009)
New Revision: 765
Modified:
cdl/trunk/tools/eclipse/features/org.jboss.savara.tools.bpel.feature/.project
cdl/trunk/tools/eclipse/features/org.jboss.savara.tools.bpel.feature/feature.xml
cdl/trunk/tools/eclipse/features/org.jboss.savara.tools.jbossesb.feature/.project
cdl/trunk/tools/eclipse/features/org.jboss.savara.tools.jbossesb.feature/feature.xml
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/.project
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb.cdl/.project
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/.project
Log:
Updated Eclipse metadata.
Modified: cdl/trunk/tools/eclipse/features/org.jboss.savara.tools.bpel.feature/.project
===================================================================
--- cdl/trunk/tools/eclipse/features/org.jboss.savara.tools.bpel.feature/.project 2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/features/org.jboss.savara.tools.bpel.feature/.project 2009-08-18 12:07:48 UTC (rev 765)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.jboss.tools.overlord.cdl.bpel.feature</name>
+ <name>org.jboss.savara.tools.bpel.feature</name>
<comment></comment>
<projects>
</projects>
Modified: cdl/trunk/tools/eclipse/features/org.jboss.savara.tools.bpel.feature/feature.xml
===================================================================
--- cdl/trunk/tools/eclipse/features/org.jboss.savara.tools.bpel.feature/feature.xml 2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/features/org.jboss.savara.tools.bpel.feature/feature.xml 2009-08-18 12:07:48 UTC (rev 765)
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
- id="org.jboss.tools.overlord.cdl.bpel.feature"
- label="JBoss Overlord CDL BPEL Feature"
+ id="org.jboss.savara.tools.bpel.feature"
+ label="JBoss SAVARA Tools BPEL Feature"
version="1.0.0.qualifier"
provider-name="www.jboss.org">
<description>
- The JBoss Tools for JBossESB support in Project Overlord.
+ The JBoss Tools for BPEL support in Savara.
</description>
<copyright>
@@ -189,7 +189,7 @@
</requires>
<plugin
- id="org.jboss.tools.overlord.cdl.bpel"
+ id="org.jboss.savara.tools.bpel"
download-size="0"
install-size="0"
version="0.0.0"
Modified: cdl/trunk/tools/eclipse/features/org.jboss.savara.tools.jbossesb.feature/.project
===================================================================
--- cdl/trunk/tools/eclipse/features/org.jboss.savara.tools.jbossesb.feature/.project 2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/features/org.jboss.savara.tools.jbossesb.feature/.project 2009-08-18 12:07:48 UTC (rev 765)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.jboss.tools.overlord.cdl.jbossesb.feature</name>
+ <name>org.jboss.savara.tools.jbossesb.feature</name>
<comment></comment>
<projects>
</projects>
Modified: cdl/trunk/tools/eclipse/features/org.jboss.savara.tools.jbossesb.feature/feature.xml
===================================================================
--- cdl/trunk/tools/eclipse/features/org.jboss.savara.tools.jbossesb.feature/feature.xml 2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/features/org.jboss.savara.tools.jbossesb.feature/feature.xml 2009-08-18 12:07:48 UTC (rev 765)
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
- id="org.jboss.tools.overlord.cdl.jbossesb.feature"
- label="JBoss Overlord CDL JBossESB Feature"
+ id="org.jboss.savara.tools.jbossesb.feature"
+ label="JBoss SAVARA Tools JBossESB Feature"
version="1.0.0.qualifier"
provider-name="www.jboss.org">
<description>
- The JBoss Tools for JBossESB support in Project Overlord.
+ The JBoss Tools for JBossESB support in Savara.
</description>
<copyright>
@@ -186,14 +186,14 @@
</requires>
<plugin
- id="org.jboss.tools.overlord.cdl.runtime.jbossesb"
+ id="org.jboss.savara.tools.jbossesb"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.jboss.tools.overlord.cdl.validator.jbossesb"
+ id="org.jboss.savara.tools.jbossesb.cdl"
download-size="0"
install-size="0"
version="0.0.0"
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/.project
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/.project 2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/.project 2009-08-18 12:07:48 UTC (rev 765)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.jboss.tools.overlord.cdl.bpel</name>
+ <name>org.jboss.savara.tools.bpel</name>
<comment></comment>
<projects>
</projects>
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/.project
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/.project 2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/.project 2009-08-18 12:07:48 UTC (rev 765)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.jboss.tools.overlord.cdl.runtime.jbossesb</name>
+ <name>org.jboss.savara.tools.jbossesb</name>
<comment></comment>
<projects>
</projects>
Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb.cdl/.project
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb.cdl/.project 2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb.cdl/.project 2009-08-18 12:07:48 UTC (rev 765)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.jboss.tools.overlord.cdl.validator.jbossesb</name>
+ <name>org.jboss.savara.tools.jbossesb.cdl</name>
<comment></comment>
<projects>
</projects>
14 years, 8 months
- 1
- 0
Overlord SVN: r764 - cdl/trunk/tools/eclipse/features.
by overlord-commits＠lists.jboss.org
Author: objectiser
Date: 2009-08-18 07:57:46 -0400 (Tue, 18 Aug 2009)
New Revision: 764
Added:
cdl/trunk/tools/eclipse/features/org.jboss.savara.tools.jbossesb.feature/
Removed:
cdl/trunk/tools/eclipse/features/org.jboss.tools.overlord.cdl.jbossesb.feature/
Log:
Copied: cdl/trunk/tools/eclipse/features/org.jboss.savara.tools.jbossesb.feature (from rev 763, cdl/trunk/tools/eclipse/features/org.jboss.tools.overlord.cdl.jbossesb.feature)
14 years, 8 months
- 1
- 0
Overlord SVN: r763 - cdl/trunk/tools/eclipse/features.
by overlord-commits＠lists.jboss.org
Author: objectiser
Date: 2009-08-18 07:50:58 -0400 (Tue, 18 Aug 2009)
New Revision: 763
Added:
cdl/trunk/tools/eclipse/features/org.jboss.savara.tools.bpel.feature/
Removed:
cdl/trunk/tools/eclipse/features/org.jboss.tools.overlord.cdl.bpel.feature/
Log:
Copied: cdl/trunk/tools/eclipse/features/org.jboss.savara.tools.bpel.feature (from rev 762, cdl/trunk/tools/eclipse/features/org.jboss.tools.overlord.cdl.bpel.feature)
14 years, 8 months
- 1
- 0
Overlord SVN: r762 - cdl/trunk/tools/eclipse/plugins.
by overlord-commits＠lists.jboss.org
Author: objectiser
Date: 2009-08-18 07:34:31 -0400 (Tue, 18 Aug 2009)
New Revision: 762
Added:
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb.cdl/
Removed:
cdl/trunk/tools/eclipse/plugins/org.jboss.tools.overlord.cdl.validator.jbossesb/
Log:
Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb.cdl (from rev 761, cdl/trunk/tools/eclipse/plugins/org.jboss.tools.overlord.cdl.validator.jbossesb)
14 years, 8 months
- 1
- 0
Overlord SVN: r761 - cdl/trunk/tools/eclipse/plugins.
by overlord-commits＠lists.jboss.org
Author: objectiser
Date: 2009-08-18 07:32:14 -0400 (Tue, 18 Aug 2009)
New Revision: 761
Added:
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/
Removed:
cdl/trunk/tools/eclipse/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/
Log:
Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb (from rev 760, cdl/trunk/tools/eclipse/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb)
14 years, 8 months
- 1
- 0
Overlord SVN: r760 - cdl/trunk/tools/eclipse/plugins.
by overlord-commits＠lists.jboss.org
Author: objectiser
Date: 2009-08-18 07:31:08 -0400 (Tue, 18 Aug 2009)
New Revision: 760
Added:
cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/
Removed:
cdl/trunk/tools/eclipse/plugins/org.jboss.tools.overlord.cdl.bpel/
Log:
Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel (from rev 759, cdl/trunk/tools/eclipse/plugins/org.jboss.tools.overlord.cdl.bpel)
14 years, 8 months
- 1
- 0