Overlord SVN: r759 - in bpm-console/trunk: server/war/src/main/webapp and 1 other directory.
by overlord-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-08-18 06:25:20 -0400 (Tue, 18 Aug 2009)
New Revision: 759
Modified:
bpm-console/trunk/BPMC.iws
bpm-console/trunk/server/war/src/main/webapp/login.html
bpm-console/trunk/server/war/src/main/webapp/login_failed.html
Log:
Pimp up login pages
Modified: bpm-console/trunk/BPMC.iws
===================================================================
--- bpm-console/trunk/BPMC.iws 2009-08-18 10:19:57 UTC (rev 758)
+++ bpm-console/trunk/BPMC.iws 2009-08-18 10:25:20 UTC (rev 759)
@@ -17,16 +17,9 @@
</component>
<component name="ChangeListManager">
<list default="true" name="Default" comment="">
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java" afterPath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/server/war/src/main/webapp/WEB-INF/web.xml" afterPath="$PROJECT_DIR$/server/war/src/main/webapp/WEB-INF/web.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/BPMC.iws" afterPath="$PROJECT_DIR$/BPMC.iws" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java" afterPath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java" afterPath="$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/server/war/src/main/java/org/jboss/bpm/console/server/UserMgmtFacade.java" afterPath="$PROJECT_DIR$/server/war/src/main/java/org/jboss/bpm/console/server/UserMgmtFacade.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$/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$/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/resources/jmaki/xhp/xhp.json" afterPath="$PROJECT_DIR$/gui/war/src/main/resources/jmaki/xhp/xhp.json" />
</list>
<list name="Failed commit: Default" comment="remove dependency on DTOParser" />
</component>
@@ -206,15 +199,48 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="Authentication.java" pinned="false" current="true" current-in-tab="true">
+ <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="116" column="6" selection-start="3663" selection-end="3663" vertical-scroll-proportion="0.5042424">
+ <state line="131" column="85" selection-start="4033" selection-end="4033" vertical-scroll-proportion="0.80987656">
<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">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="28" column="49" selection-start="894" selection-end="894" vertical-scroll-proportion="-0.21333334">
+ <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">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="26" column="64" selection-start="0" selection-end="557" vertical-scroll-proportion="0.5445026">
+ <folding />
+ </state>
+ </provider>
+ <provider editor-type-id="HtmlPreview">
+ <state />
+ </provider>
+ </entry>
+ </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">
+ <provider selected="true" editor-type-id="text-editor">
+ <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>
+ </file>
</leaf>
</component>
<component name="FindManager">
@@ -992,9 +1018,9 @@
<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.33224222" order="0" />
+ <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="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" />
@@ -1097,23 +1123,6 @@
<option name="myLastEditedConfigurable" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/server/war/src/main/webapp/login.html">
- <provider selected="true" editor-type-id="text-editor">
- <state line="8" column="0" selection-start="211" selection-end="211" vertical-scroll-proportion="0.16537468">
- <folding />
- </state>
- </provider>
- <provider editor-type-id="HtmlPreview">
- <state />
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="75" column="31" selection-start="2900" selection-end="2900" vertical-scroll-proportion="-1.2771618">
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/gui/war/src/main/java/jmaki/xhp/XmlHttpProxy.java">
<provider selected="true" editor-type-id="text-editor">
<state line="134" column="51" selection-start="5908" selection-end="5908" vertical-scroll-proportion="0.14453125">
@@ -1156,13 +1165,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/server/war/src/main/webapp/WEB-INF/web.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state line="28" column="49" selection-start="894" selection-end="894" vertical-scroll-proportion="0.01939394">
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java">
<provider selected="true" editor-type-id="text-editor">
<state line="156" column="32" selection-start="2405" selection-end="4698" vertical-scroll-proportion="-1.4">
@@ -1200,11 +1202,38 @@
</entry>
<entry file="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="116" column="6" selection-start="3663" selection-end="3663" vertical-scroll-proportion="0.5042424">
+ <state line="131" column="85" selection-start="4033" selection-end="4033" vertical-scroll-proportion="0.80987656">
<folding />
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/server/war/src/main/webapp/WEB-INF/web.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <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$/server/war/src/main/webapp/login.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="26" column="64" selection-start="0" selection-end="557" vertical-scroll-proportion="0.5445026">
+ <folding />
+ </state>
+ </provider>
+ <provider editor-type-id="HtmlPreview">
+ <state />
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/server/war/src/main/webapp/login_failed.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <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>
</component>
</project>
Modified: bpm-console/trunk/server/war/src/main/webapp/login.html
===================================================================
--- bpm-console/trunk/server/war/src/main/webapp/login.html 2009-08-18 10:19:57 UTC (rev 758)
+++ bpm-console/trunk/server/war/src/main/webapp/login.html 2009-08-18 10:25:20 UTC (rev 759)
@@ -1,9 +1,28 @@
<html>
<body>
<form method="POST" action="j_security_check">
- User: <input type="text" name="j_username"><br>
- Password: <input type="password" name="j_password"><br/>
- <input type="submit"/>
+
+ <center/>
+ <br><br>
+
+ <div style="font-family:sans-serif;border:1px solid black; width:270;padding:15px;">
+ <h2>BPM Console Server</h2>
+
+ <table with=250>
+ <tr>
+ <td>Username:</td>
+ <td><input type="text" name="j_username"></td>
+ </tr>
+ <tr>
+ <td>Password:</td>
+ <td><input type="password" name="j_password"></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td align=right><input type="submit"/></td>
+ </tr>
+ </table>
+ </div>
</form>
</body>
</html>
\ No newline at end of file
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 10:19:57 UTC (rev 758)
+++ bpm-console/trunk/server/war/src/main/webapp/login_failed.html 2009-08-18 10:25:20 UTC (rev 759)
@@ -1,6 +1,12 @@
<html>
<body>
-Login failed!<br>
-<a href="/gwt-console-server/login.html">Retry</a>
+
+ <center/>
+ <br><br>
+
+ <div style="font-family:sans-serif;border:1px solid black; width:270;padding:15px;">
+ <h3>Login failed!</h3>
+ </div>
+
</body>
</html>
\ No newline at end of file
14 years, 8 months
- 1
- 0
Overlord SVN: r758 - in bpm-console/trunk: gui/war/src/main/java/jmaki/xhp and 6 other directories.
by overlord-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-08-18 06:19:57 -0400 (Tue, 18 Aug 2009)
New Revision: 758
Modified:
bpm-console/trunk/BPMC.iws
bpm-console/trunk/gui/war/src/main/java/jmaki/xhp/XmlHttpProxyServlet.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java
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/gui/war/src/main/resources/jmaki/xhp/xhp.json
bpm-console/trunk/server/war/src/main/java/org/jboss/bpm/console/server/UserMgmtFacade.java
bpm-console/trunk/server/war/src/main/webapp/WEB-INF/web.xml
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:
Revamp BPMC-9: Session management and form based authentication
Modified: bpm-console/trunk/BPMC.iws
===================================================================
--- bpm-console/trunk/BPMC.iws 2009-08-18 10:19:50 UTC (rev 757)
+++ bpm-console/trunk/BPMC.iws 2009-08-18 10:19:57 UTC (rev 758)
@@ -17,8 +17,16 @@
</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$/server/war/src/main/webapp/WEB-INF/web.xml" afterPath="$PROJECT_DIR$/server/war/src/main/webapp/WEB-INF/web.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/BPMC.iws" afterPath="$PROJECT_DIR$/BPMC.iws" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java" afterPath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java" afterPath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java" afterPath="$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/server/war/src/main/java/org/jboss/bpm/console/server/UserMgmtFacade.java" afterPath="$PROJECT_DIR$/server/war/src/main/java/org/jboss/bpm/console/server/UserMgmtFacade.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$/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$/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/resources/jmaki/xhp/xhp.json" afterPath="$PROJECT_DIR$/gui/war/src/main/resources/jmaki/xhp/xhp.json" />
</list>
<list name="Failed commit: Default" comment="remove dependency on DTOParser" />
</component>
@@ -90,6 +98,60 @@
<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" />
@@ -144,10 +206,10 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="AbstractRESTAction.java" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java">
+ <file leaf-file-name="Authentication.java" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="54" column="82" selection-start="2205" selection-end="2205" vertical-scroll-proportion="0.49689442">
+ <state line="116" column="6" selection-start="3663" selection-end="3663" vertical-scroll-proportion="0.5042424">
<folding />
</state>
</provider>
@@ -248,6 +310,172 @@
<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>
@@ -391,7 +619,151 @@
<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>
+ <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/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>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org" />
+ <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>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/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$/gui/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$/gui/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$/gui/war/src/main/java/org/jboss/bpm/console" />
+ <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>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/jmaki" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/jmaki/xhp" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
</subPane>
</component>
<component name="ProjectReloadState">
@@ -405,7 +777,7 @@
<showLibraryContents />
<hideEmptyPackages PackagesPane="false" ProjectPane="false" />
<abbreviatePackageNames />
- <showStructure Scope="false" ProjectPane="false" PackagesPane="false" Favorites="false" />
+ <showStructure Favorites="false" ProjectPane="false" Scope="false" PackagesPane="false" />
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
@@ -450,18 +822,6 @@
</component>
<component name="RestoreUpdateTree" />
<component name="RunManager" selected="Remote.GWT">
- <configuration default="true" type="Applet" factoryName="Applet">
- <module name="" />
- <option name="MAIN_CLASS_NAME" />
- <option name="HTML_FILE_NAME" />
- <option name="HTML_USED" value="false" />
- <option name="WIDTH" value="400" />
- <option name="HEIGHT" value="300" />
- <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
- <option name="VM_PARAMETERS" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- </configuration>
<configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
<option name="MAIN_CLASS_NAME" />
<option name="VM_PARAMETERS" />
@@ -501,6 +861,18 @@
<option name="HOST" value="localhost" />
<option name="PORT" value="5005" />
</configuration>
+ <configuration default="true" type="Applet" factoryName="Applet">
+ <module name="" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="HTML_FILE_NAME" />
+ <option name="HTML_USED" value="false" />
+ <option name="WIDTH" value="400" />
+ <option name="HEIGHT" value="300" />
+ <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+ <option name="VM_PARAMETERS" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ </configuration>
<configuration default="false" name="GWT" type="Remote" factoryName="Remote">
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
@@ -517,6 +889,22 @@
<option name="Make" value="true" />
</method>
</configuration>
+ <configuration default="false" name="server" type="Remote" factoryName="Remote">
+ <option name="USE_SOCKET_TRANSPORT" value="true" />
+ <option name="SERVER_MODE" value="false" />
+ <option name="SHMEM_ADDRESS" value="javadebug" />
+ <option name="HOST" value="localhost" />
+ <option name="PORT" value="8787" />
+ <RunnerSettings RunnerId="Debug">
+ <option name="DEBUG_PORT" value="8787" />
+ <option name="TRANSPORT" value="0" />
+ <option name="LOCAL" value="false" />
+ </RunnerSettings>
+ <ConfigurationWrapper RunnerId="Debug" />
+ <method>
+ <option name="Make" value="true" />
+ </method>
+ </configuration>
<configuration name="<template>" type="WebApp" default="true" selected="false">
<Host>localhost</Host>
<Port>5050</Port>
@@ -597,16 +985,16 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="381" y="43" width="1268" height="967" extended-state="0" />
+ <frame x="400" y="39" 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.33305988" order="0" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.40895522" order="1" />
- <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24937028" order="1" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33224222" 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="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" />
@@ -618,7 +1006,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.3995381" order="4" />
+ <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="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" />
@@ -709,100 +1097,110 @@
<option name="myLastEditedConfigurable" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/gui/profiles/pom.xml">
+ <entry file="file://$PROJECT_DIR$/server/war/src/main/webapp/login.html">
<provider selected="true" editor-type-id="text-editor">
- <state line="14" column="27" selection-start="514" selection-end="514" vertical-scroll-proportion="0.28681177">
+ <state line="8" column="0" selection-start="211" selection-end="211" vertical-scroll-proportion="0.16537468">
<folding />
</state>
</provider>
+ <provider editor-type-id="HtmlPreview">
+ <state />
+ </provider>
</entry>
- <entry file="file://$PROJECT_DIR$/workspace/workspace-api/pom.xml">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="23" column="49" selection-start="597" selection-end="597" vertical-scroll-proportion="0.47119078">
+ <state line="75" column="31" selection-start="2900" selection-end="2900" vertical-scroll-proportion="-1.2771618">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/server/integration/pom.xml">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/jmaki/xhp/XmlHttpProxy.java">
<provider selected="true" editor-type-id="text-editor">
+ <state line="134" column="51" selection-start="5908" selection-end="5908" vertical-scroll-proportion="0.14453125">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/webapp/WEB-INF/web.xml">
+ <provider selected="true" editor-type-id="text-editor">
<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/profiles/riftsaw/pom.xml">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/jmaki/xhp/XmlHttpProxyServlet.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="5" column="51" selection-start="310" selection-end="310" vertical-scroll-proportion="0.13071896">
+ <state line="61" column="6" selection-start="2009" selection-end="2009" vertical-scroll-proportion="0.019753087">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/profiles/jbpm/pom.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="19" column="0" selection-start="671" selection-end="671" vertical-scroll-proportion="0.49673203">
+ <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/org/jboss/bpm/console/client/process/UpdateDefinitionsAction.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="43" column="54" selection-start="1888" selection-end="1888" vertical-scroll-proportion="0.2875817">
+ <state line="78" column="66" selection-start="2330" selection-end="2330" vertical-scroll-proportion="0.01939394">
<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$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/ConsoleConfig.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="162" column="0" selection-start="4660" selection-end="4660" vertical-scroll-proportion="0.23444976">
+ <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$/server/war/src/main/webapp/WEB-INF/web.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="54" column="42" selection-start="0" selection-end="2257" vertical-scroll-proportion="0.20893142">
+ <state line="28" column="49" selection-start="894" selection-end="894" vertical-scroll-proportion="0.01939394">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/templates/WEB-INF/jboss-web.xml">
+ <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="10" column="41" selection-start="263" selection-end="285" vertical-scroll-proportion="0.0">
+ <state line="156" column="32" selection-start="2405" selection-end="4698" vertical-scroll-proportion="-1.4">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/pom.xml">
+ <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="253" column="15" selection-start="7293" selection-end="7833" vertical-scroll-proportion="0.0">
+ <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$/server/war/pom.xml">
+ <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="304" column="33" selection-start="8849" selection-end="8849" vertical-scroll-proportion="0.70186335">
+ <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/pom.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="23" column="0" selection-start="710" selection-end="710" vertical-scroll-proportion="0.45714286">
+ <state line="79" column="23" selection-start="2564" selection-end="2564" vertical-scroll-proportion="0.9955556">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/server/war/src/main/templates/WEB-INF/jboss-web.xml">
+ <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="7" column="0" selection-start="179" selection-end="179" vertical-scroll-proportion="0.13658537">
+ <state line="31" column="13" selection-start="1338" selection-end="1338" vertical-scroll-proportion="0.28444445">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.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="54" column="82" selection-start="2205" selection-end="2205" vertical-scroll-proportion="0.49689442">
+ <state line="116" column="6" selection-start="3663" selection-end="3663" vertical-scroll-proportion="0.5042424">
<folding />
</state>
</provider>
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 10:19:50 UTC (rev 757)
+++ bpm-console/trunk/gui/war/src/main/java/jmaki/xhp/XmlHttpProxyServlet.java 2009-08-18 10:19:57 UTC (rev 758)
@@ -59,6 +59,7 @@
if (rDebug) {
logger = getLogger();
}
+
}
public void init(ServletConfig config) throws ServletException {
@@ -315,13 +316,17 @@
sb.append(serviceURL);
// override service url and url params
- String path = req.getPathInfo();
+ String path = req.getRequestURI();
path = path.substring(path.indexOf("xhp/")+3, path.length());
StringTokenizer tok = new StringTokenizer(path, "/");
while(tok.hasMoreTokens())
{
- sb.append("/").append(URLEncoder.encode(tok.nextToken()));
+ String token = tok.nextToken();
+ if(token.indexOf(";")!=-1)
+ sb.append("/").append(token); // ;JSESSIONID=XYZ
+ else
+ sb.append("/").append(URLEncoder.encode(token));
}
sb.append("?").append(req.getQueryString());
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java 2009-08-18 10:19:50 UTC (rev 757)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java 2009-08-18 10:19:57 UTC (rev 758)
@@ -96,7 +96,7 @@
public void onClick(Widget widget)
{
- appContext.getAuthentication().doLogout();
+ appContext.getAuthentication().logout();
}
}
);
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 10:19:50 UTC (rev 757)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java 2009-08-18 10:19:57 UTC (rev 758)
@@ -22,12 +22,8 @@
package org.jboss.bpm.console.client;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.http.client.Request;
-import com.google.gwt.http.client.Response;
-import com.google.gwt.user.client.Command;
-import com.google.gwt.user.client.DOM;
-import com.google.gwt.user.client.DeferredCommand;
-import com.google.gwt.user.client.WindowCloseListener;
+import com.google.gwt.http.client.*;
+import com.google.gwt.user.client.*;
import com.google.gwt.user.client.ui.*;
import com.mvc4g.client.Controller;
import com.mvc4g.client.ViewInterface;
@@ -42,17 +38,17 @@
{
public final static String NAME = "loginView";
- private ConsoleConfig config;
+ private ConsoleConfig config;
private Authentication auth;
private WindowPanel window = null;
private TextBox usernameInput;
private PasswordTextBox passwordInput;
- public final static String[] KNOWN_ROLES = {"admin", "manager", "user"};
-
private Controller controller;
+ public final static String[] KNOWN_ROLES = {"admin", "manager", "user"};
+
public LoginView()
{
@@ -62,11 +58,11 @@
{
proxyUrl = GWT.getModuleBaseURL() + "xhp";
}
-
+
config = new ConsoleConfig(proxyUrl);
ConsoleLog.debug("Console server: " + config.getConsoleServerUrl());
- URLBuilder.configureInstance(config);
+ URLBuilder.configureInstance(config);
}
public void setController(Controller controller)
@@ -76,12 +72,89 @@
public void display()
{
- createLayoutWindowPanel();
- window.center();
+ requestSessionID();
+ }
- // focus
- usernameInput.setFocus(true);
+ private void requestSessionID()
+ {
+ RequestBuilder rb = new RequestBuilder(
+ RequestBuilder.GET,
+ config.getConsoleServerUrl()+"/rs/identity/sid"
+ );
+ try
+ {
+ rb.sendRequest(null, new RequestCallback()
+ {
+
+ public void onResponseReceived(Request request, Response response)
+ {
+ ConsoleLog.debug("SID: "+ response.getText());
+ ConsoleLog.debug("Cookies: "+ Cookies.getCookieNames());
+ final String sid = response.getText();
+
+ auth = new Authentication(
+ config,
+ sid,
+ URLBuilder.getInstance().getUserInRoleURL(KNOWN_ROLES)
+ );
+
+ auth.setCallback(
+ new Authentication.AuthCallback()
+ {
+
+ public void onLoginSuccess(Request request, Response response)
+ {
+ // clear the form
+ usernameInput.setText("");
+ passwordInput.setText("");
+
+ // display main console
+ window.hide();
+
+ // assemble main layout
+ DeferredCommand.addCommand(
+ new Command()
+ {
+ public void execute()
+ {
+ // move the loading div to foreground
+ DOM.getElementById("splash").getStyle().setProperty("z-index", "1000");
+ DOM.getElementById("ui_loading").getStyle().setProperty("visibility", "visible");
+ new MainLayout(controller, auth, config);
+ }
+ });
+
+ window = null;
+ }
+
+ public void onLoginFailed(Request request, Throwable t)
+ {
+ // auth failed
+ ConsoleLog.error("Authentication failed", t);
+ }
+ }
+ );
+
+
+ createLayoutWindowPanel();
+ window.center();
+
+ // focus
+ usernameInput.setFocus(true);
+
+ }
+
+ public void onError(Request request, Throwable t)
+ {
+ ConsoleLog.error("Failed to initiate session", t);
+ }
+ });
+ }
+ catch (RequestException e)
+ {
+ ConsoleLog.error("Request error", e);
+ }
}
/**
@@ -106,8 +179,6 @@
return null;
}
});
-
-
}
/**
@@ -124,7 +195,7 @@
public void onClick(Widget widget)
{
- doLoginRequest();
+ engageLogin();
}
});
@@ -135,53 +206,55 @@
}
- private void doLoginRequest()
+ private void engageLogin()
+ {
+ requestProtectedResource();
+ }
+
+ /**
+ * 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.
+ */
+ private void requestProtectedResource()
{
- String user = usernameInput.getText();
- String pass = passwordInput.getText();
+ RequestBuilder rb = new RequestBuilder(
+ RequestBuilder.GET,
+ config.getConsoleServerUrl()+"/rs/identity/secure/sid"
+ );
- String url = URLBuilder.getInstance().getUserInRoleURL(KNOWN_ROLES);
- auth = new Authentication(url);
- auth.setCallback(
- new Authentication.AuthCallback()
+ try
+ {
+ rb.sendRequest(null, new RequestCallback()
+ {
+
+ public void onResponseReceived(Request request, Response response)
{
+ ConsoleLog.debug("requestProtectedResource() HTTP "+response.getStatusCode());
+ auth.login( getUsername(), getPassword() );
+ }
- public void onLoginSuccess(Request request, Response response)
- {
- // clear the form
- usernameInput.setText("");
- passwordInput.setText("");
-
- // display main console
- window.hide();
-
- // assemble main layout
- DeferredCommand.addCommand(
- new Command()
- {
- public void execute()
- {
- // move the loading div to foreground
- DOM.getElementById("splash").getStyle().setProperty("z-index", "1000");
- DOM.getElementById("ui_loading").getStyle().setProperty("visibility", "visible");
- new MainLayout(controller, auth, config);
- }
- });
-
- window = null;
- }
-
- public void onLoginFailed(Request request, Throwable t)
- {
- // auth failed
- ConsoleLog.error("Authentication failed", t);
- }
+ public void onError(Request request, Throwable t)
+ {
+ ConsoleLog.error("Failed to request protected resource", t);
}
- );
+ });
+ }
+ catch (RequestException e)
+ {
+ ConsoleLog.error("Request error", e);
+ }
+ }
- auth.doLogin(user, pass);
+ private String getUsername()
+ {
+ return usernameInput.getText();
}
+ private String getPassword()
+ {
+ return passwordInput.getText();
+ }
+
private Widget createForm()
{
LayoutPanel p = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL));
@@ -217,11 +290,12 @@
{
if(c == KeyboardListener.KEY_ENTER)
{
- doLoginRequest();
+ engageLogin();
}
}
}
);
return p;
}
+
}
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 10:19:50 UTC (rev 757)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java 2009-08-18 10:19:57 UTC (rev 758)
@@ -73,7 +73,7 @@
if (i < possibleRoles.length - 1)
sb.append(",");
}
- return config.getConsoleServerUrl() + "/rs/identity/user/roles?roleCheck=" + sb.toString();
+ return config.getConsoleServerUrl() + "/rs/identity/user/roles;JSESSIONID="+Authentication.getSid()+"?roleCheck=" + sb.toString();
}
public String getServerStatusURL()
Modified: bpm-console/trunk/gui/war/src/main/resources/jmaki/xhp/xhp.json
===================================================================
--- bpm-console/trunk/gui/war/src/main/resources/jmaki/xhp/xhp.json 2009-08-18 10:19:50 UTC (rev 757)
+++ bpm-console/trunk/gui/war/src/main/resources/jmaki/xhp/xhp.json 2009-08-18 10:19:57 UTC (rev 758)
@@ -3,9 +3,7 @@
"services": [
{"id": "default",
"url":"http://localhost:8080/gwt-console-server",
- "passthrough":true,
- "username":"peter",
- "password":"password"
+ "passthrough":true
},
{"id": "birt",
"url":"http://localhost:8080/gwt-console-server",
Modified: bpm-console/trunk/server/war/src/main/java/org/jboss/bpm/console/server/UserMgmtFacade.java
===================================================================
--- bpm-console/trunk/server/war/src/main/java/org/jboss/bpm/console/server/UserMgmtFacade.java 2009-08-18 10:19:50 UTC (rev 757)
+++ bpm-console/trunk/server/war/src/main/java/org/jboss/bpm/console/server/UserMgmtFacade.java 2009-08-18 10:19:57 UTC (rev 758)
@@ -66,6 +66,40 @@
}
@GET
+ @Path("sid")
+ @Produces("text/plain")
+ public Response getSessionID(
+ @Context
+ HttpServletRequest request
+ )
+ {
+ return Response.ok(request.getSession().getId()).build();
+ }
+
+ @POST
+ @Path("sid/invalidate")
+ @Produces("text/plain")
+ public Response destroySession(
+ @Context
+ HttpServletRequest request
+ )
+ {
+ request.getSession().invalidate();
+ return Response.ok().build();
+ }
+
+ @GET
+ @Path("secure/sid")
+ @Produces("text/plain")
+ public Response getSessionIDSecure(
+ @Context
+ HttpServletRequest request
+ )
+ {
+ return Response.ok(request.getSession().getId()).build();
+ }
+
+ @GET
@Path("user/roles")
@Produces("application/json")
public Response getRolesForJAASPrincipal(
Modified: bpm-console/trunk/server/war/src/main/webapp/WEB-INF/web.xml
===================================================================
--- bpm-console/trunk/server/war/src/main/webapp/WEB-INF/web.xml 2009-08-18 10:19:50 UTC (rev 757)
+++ bpm-console/trunk/server/war/src/main/webapp/WEB-INF/web.xml 2009-08-18 10:19:57 UTC (rev 758)
@@ -49,12 +49,13 @@
<security-constraint>
<web-resource-collection>
- <web-resource-name>Resteasy</web-resource-name>
+ <web-resource-name>Resteasy</web-resource-name>
<url-pattern>/rs/process/*</url-pattern>
<url-pattern>/rs/task/*</url-pattern>
<url-pattern>/rs/form/*</url-pattern>
<url-pattern>/rs/tasks/*</url-pattern>
- <url-pattern>/rs/identity/*</url-pattern>
+ <url-pattern>/rs/identity/user/*</url-pattern>
+ <url-pattern>/rs/identity/secure/*</url-pattern>
</web-resource-collection>
<auth-constraint>
<role-name>administrator</role-name>
@@ -63,9 +64,17 @@
</auth-constraint>
</security-constraint>
- <login-config>
+ <!--login-config>
<auth-method>BASIC</auth-method>
<realm-name>GWT Console Server</realm-name>
+ </login-config-->
+
+ <login-config>
+ <auth-method>FORM</auth-method>
+ <form-login-config>
+ <form-login-page>/login.html</form-login-page>
+ <form-error-page>/login_failed.html</form-error-page>
+ </form-login-config>
</login-config>
<security-role>
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 10:19:50 UTC (rev 757)
+++ bpm-console/trunk/server/war/src/main/webapp/login_failed.html 2009-08-18 10:19:57 UTC (rev 758)
@@ -1,5 +1,6 @@
<html>
<body>
-Login failed!
+Login failed!<br>
+<a href="/gwt-console-server/login.html">Retry</a>
</body>
</html>
\ No newline at end of file
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 10:19:50 UTC (rev 757)
+++ bpm-console/trunk/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java 2009-08-18 10:19:57 UTC (rev 758)
@@ -21,50 +21,86 @@
*/
package org.jboss.bpm.console.client;
-import com.google.gwt.core.client.GWT;
import com.google.gwt.http.client.*;
import com.google.gwt.json.client.JSONArray;
import com.google.gwt.json.client.JSONObject;
import com.google.gwt.json.client.JSONParser;
import com.google.gwt.json.client.JSONValue;
+import com.google.gwt.user.client.Command;
+import com.google.gwt.user.client.DeferredCommand;
import org.jboss.bpm.console.client.util.ConsoleLog;
import org.jboss.bpm.console.client.util.JSONWalk;
import java.util.ArrayList;
import java.util.List;
-/**
- * Does HTTP Basic Auth and keeps assigned roles
- * (piggy backed on response) and the username that was used.
- *
- * @author Heiko.Braun <heiko.braun(a)jboss.com>
- */
public class Authentication
-{
- private String loginUrl;
+{
private AuthCallback callback;
+
private List<String> rolesAssigned = new ArrayList<String>();
+
+ private static String sid;
private String username;
private String password;
- public Authentication(String loginUrl)
+ private ConsoleConfig config;
+ private String rolesUrl;
+
+ public Authentication(ConsoleConfig config, String sessionID, String rolesUrl)
{
- this.loginUrl = loginUrl;
+ this.config = config;
+ this.sid = sessionID;
+ this.rolesUrl = rolesUrl;
}
- public Authentication(String loginUrl, AuthCallback callback)
+ public static String getSid()
{
- this.loginUrl = loginUrl;
- this.callback = callback;
+ 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,
+ new RequestCallback()
+ {
- /**
- * Login, but leave credentials to GWT.
- * This will pop up a username/password dialog netive to the browser.
- */
- public void doLogin()
- {
- doLogin(null, null);
+ public void onResponseReceived(Request request, Response response)
+ {
+ ConsoleLog.debug("postLoginCredentials() HTTP "+response.getStatusCode());
+
+ DeferredCommand.addCommand(
+ new Command()
+ {
+
+ public void execute()
+ {
+ requestAssignedRoles();
+ }
+ }
+ );
+ }
+
+ public void onError(Request request, Throwable t)
+ {
+ ConsoleLog.error("Faile to submit authenticate", t);
+ }
+ }
+ );
+ }
+ catch (RequestException e)
+ {
+ ConsoleLog.error("Request error", e);
+ }
}
/**
@@ -72,16 +108,13 @@
* This delegates to {@link com.google.gwt.http.client.RequestBuilder#setUser(String)}
* and {@link com.google.gwt.http.client.RequestBuilder#setPassword(String)}
*/
- public void doLogin(String user, String pass)
+ private void requestAssignedRoles()
{
+ RequestBuilder rb = new RequestBuilder(RequestBuilder.GET, rolesUrl );
+
+ ConsoleLog.debug("Request roles: " + rb.getUrl());
- RequestBuilder rb = new RequestBuilder(RequestBuilder.GET, loginUrl);
- this.username = user;
- this.password = pass;
-
- ConsoleLog.debug("Authentication against: " + rb.getUrl());
-
- if (user != null && pass != null)
+ /*if (user != null && pass != null)
{
rb.setUser(user);
rb.setPassword(pass);
@@ -91,7 +124,7 @@
rb.setHeader("xtest-user", user);
rb.setHeader("xtest-pass", pass); // NOTE: This is plaintext, use for testing only
}
- }
+ }*/
try
{
@@ -101,6 +134,8 @@
public void onResponseReceived(Request request, Response response)
{
+ ConsoleLog.debug("requestAssignedRoles() HTTP "+response.getStatusCode());
+
// parse roles
if (200 == response.getStatusCode())
{
@@ -138,11 +173,49 @@
this.callback = callback;
}
- public native void doLogout() /*-{
+ private native void reload() /*-{
$wnd.location.reload();
}-*/;
+ public void logout()
+ {
+ RequestBuilder rb = new RequestBuilder(
+ RequestBuilder.POST,
+ config.getConsoleServerUrl()+"/rs/identity/sid/invalidate"
+ );
+ try
+ {
+ rb.sendRequest(null, new RequestCallback()
+ {
+ public void onResponseReceived(Request request, Response response)
+ {
+ ConsoleLog.debug("logout() HTTP "+response.getStatusCode());
+ resetState();
+ reload();
+ }
+
+ public void onError(Request request, Throwable t)
+ {
+ ConsoleLog.error("Failed to invalidate session", t);
+ }
+ });
+ }
+ catch (RequestException e)
+ {
+ ConsoleLog.error("Request error", e);
+ }
+ }
+
+ private void resetState()
+ {
+ sid = null;
+ username = null;
+ password = null;
+ rolesAssigned = new ArrayList<String>();
+ }
+
+
public interface AuthCallback
{
void onLoginSuccess(Request request, Response response);
@@ -170,9 +243,7 @@
{
// parse roles
List<String> roles = new ArrayList<String>();
-
- // {"roles":[{"isAssigned":true,"role":"admin"},{"isAssigned":true,"role":"user"}]}
-
+
JSONValue root = JSONParser.parse(json);
JSONArray array = JSONWalk.on(root).next("roles").asArray();
14 years, 8 months
- 1
- 0
Overlord SVN: r757 - in cdl/trunk/tools: eclipse and 1 other directory.
by overlord-commits＠lists.jboss.org
Author: objectiser
Date: 2009-08-18 06:19:50 -0400 (Tue, 18 Aug 2009)
New Revision: 757
Added:
cdl/trunk/tools/eclipse/plugins/
Removed:
cdl/trunk/tools/plugins/
Log:
Copied: cdl/trunk/tools/eclipse/plugins (from rev 756, cdl/trunk/tools/plugins)
14 years, 8 months
- 1
- 0
Overlord SVN: r756 - in cdl/trunk/tools: eclipse and 1 other directory.
by overlord-commits＠lists.jboss.org
Author: objectiser
Date: 2009-08-18 06:11:37 -0400 (Tue, 18 Aug 2009)
New Revision: 756
Added:
cdl/trunk/tools/eclipse/features/
Removed:
cdl/trunk/tools/features/
Log:
Copied: cdl/trunk/tools/eclipse/features (from rev 755, cdl/trunk/tools/features)
14 years, 8 months
- 1
- 0
Overlord SVN: r755 - cdl/trunk/tools.
by overlord-commits＠lists.jboss.org
Author: objectiser
Date: 2009-08-18 06:09:46 -0400 (Tue, 18 Aug 2009)
New Revision: 755
Added:
cdl/trunk/tools/eclipse/
Log:
14 years, 8 months
- 1
- 0
Overlord SVN: r754 - cdl/trunk.
by overlord-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2009-08-18 02:31:26 -0400 (Tue, 18 Aug 2009)
New Revision: 754
Modified:
cdl/trunk/pom.xml
Log:
* Add the samples to be built by default.
Modified: cdl/trunk/pom.xml
===================================================================
--- cdl/trunk/pom.xml 2009-08-18 06:09:57 UTC (rev 753)
+++ cdl/trunk/pom.xml 2009-08-18 06:31:26 UTC (rev 754)
@@ -39,6 +39,7 @@
<modules>
<module>runtime</module>
<module>validator</module>
+ <module>samples</module>
</modules>
<properties>
14 years, 8 months
- 1
- 0
Overlord SVN: r753 - in cdl/trunk/samples/jbossesb: common/creditAgency/src/main/java/org/jboss/overlord/examples/creditAgency and 2 other directories.
by overlord-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2009-08-18 02:09:57 -0400 (Tue, 18 Aug 2009)
New Revision: 753
Modified:
cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/WSBuyerClient.java
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/creditAgency/CreditAgencyDecision.java
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/creditAgency/SetCreditCheckInvalidMessageAction.java
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/creditAgency/SetCreditCheckResponseMessageAction.java
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/wsdl/CreditAgencyService.java
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/jboss-esb.xml
Log:
* finished the ws proxy.
Modified: cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/WSBuyerClient.java
===================================================================
--- cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/WSBuyerClient.java 2009-08-17 08:36:30 UTC (rev 752)
+++ cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/WSBuyerClient.java 2009-08-18 06:09:57 UTC (rev 753)
@@ -54,6 +54,7 @@
String msg = new String(StreamUtils.readStream(WSBuyerClient.class.getResourceAsStream("/soap_message_" + messageNum + ".xml")));
return msg;
}
+
/**
* @param args
Modified: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/creditAgency/CreditAgencyDecision.java
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/creditAgency/CreditAgencyDecision.java 2009-08-17 08:36:30 UTC (rev 752)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/creditAgency/CreditAgencyDecision.java 2009-08-18 06:09:57 UTC (rev 753)
@@ -20,7 +20,10 @@
package org.jboss.overlord.examples.creditAgency;
import org.jboss.savara.jbossesb.Decision;
+import org.jboss.savara.jbossesb.XMLUtils;
import org.jboss.soa.esb.message.Message;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
/**
* @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
@@ -28,11 +31,29 @@
*/
public class CreditAgencyDecision implements Decision {
- /* (non-Javadoc)
+ /*
* @see org.jboss.soa.overlord.jbossesb.Decision#executeDecision(org.jboss.soa.esb.message.Message)
+ *
+ * return true if amount is less than 500.
+ *
*/
public boolean executeDecision(Message message) {
- return true;
+ try {
+ String xmlMsg = (String)message.getBody().get();
+ Node node = XMLUtils.getNode(xmlMsg);
+ NodeList nodeList = node.getChildNodes();
+ for (int i =0; i < nodeList.getLength(); i++) {
+ if ("amount".equals(nodeList.item(i).getNodeName())) {
+ String value = nodeList.item(i).getTextContent();
+ if (500 >= Integer.valueOf(value).intValue()) {
+ return true;
+ }
+ }
+ }
+ return false;
+ } catch (Exception e) {
+ return false;
+ }
}
}
Modified: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/creditAgency/SetCreditCheckInvalidMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/creditAgency/SetCreditCheckInvalidMessageAction.java 2009-08-17 08:36:30 UTC (rev 752)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/creditAgency/SetCreditCheckInvalidMessageAction.java 2009-08-18 06:09:57 UTC (rev 753)
@@ -25,6 +25,7 @@
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
public class SetCreditCheckInvalidMessageAction extends AbstractActionLifecycle {
@@ -37,10 +38,25 @@
}
public Message process(Message message) throws Exception{
+ StringBuffer sbuffer = new StringBuffer();
Node node = XMLUtils.getNode((String)message.getBody().get());
String idValue = node.getAttributes().getNamedItem("id").getNodeValue();
- message.getBody().add("<CreditCheckInvalid id=\"" + idValue +"\"></CreditCheckInvalid>");
+ sbuffer.append("<CreditCheckInvalid id=\"" + idValue +"\">");
+
+ NodeList list = node.getChildNodes();
+ for (int i =0; i < list.getLength(); i++) {
+ if ("amount".equals(list.item(i).getNodeName())) {
+ sbuffer.append("<amount>" + list.item(i).getTextContent() + "</amount>");
+ }
+ if ("account".equals(list.item(i).getNodeName())) {
+ sbuffer.append("<account>" + list.item(i).getTextContent()+"</account>");
+ }
+ }
+
+ sbuffer.append("</CreditCheckInvalid>");
+
+ message.getBody().add(sbuffer.toString());
logger.info("Updated credit message: " + message.getBody().get());
Modified: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/creditAgency/SetCreditCheckResponseMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/creditAgency/SetCreditCheckResponseMessageAction.java 2009-08-17 08:36:30 UTC (rev 752)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/creditAgency/SetCreditCheckResponseMessageAction.java 2009-08-18 06:09:57 UTC (rev 753)
@@ -25,6 +25,7 @@
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
public class SetCreditCheckResponseMessageAction extends AbstractActionLifecycle {
@@ -37,11 +38,26 @@
}
public Message process(Message message) throws Exception{
+ StringBuffer sbuffer = new StringBuffer();
Node node = XMLUtils.getNode((String)message.getBody().get());
String idValue = node.getAttributes().getNamedItem("id").getNodeValue();
- message.getBody().add("<CreditCheckOk id=\"" + idValue +"\"></CreditCheckOk>");
+ sbuffer.append("<CreditCheckOk id=\"" + idValue +"\">");
+ NodeList list = node.getChildNodes();
+ for (int i =0; i < list.getLength(); i++) {
+ if ("amount".equals(list.item(i).getNodeName())) {
+ sbuffer.append("<amount>" + list.item(i).getTextContent() + "</amount>");
+ }
+ if ("account".equals(list.item(i).getNodeName())) {
+ sbuffer.append("<account>" + list.item(i).getTextContent()+"</account>");
+ }
+ }
+
+ sbuffer.append("</CreditCheckOk>");
+
+ message.getBody().add(sbuffer.toString());
+
logger.info("Updated credit message: "+message.getBody().get() +"' by thread of " + Thread.currentThread().getName());
return(message);
Modified: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/wsdl/CreditAgencyService.java
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/wsdl/CreditAgencyService.java 2009-08-17 08:36:30 UTC (rev 752)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/wsdl/CreditAgencyService.java 2009-08-18 06:09:57 UTC (rev 753)
@@ -26,6 +26,15 @@
import javax.jws.soap.SOAPBinding;
import org.jboss.overlord.examples.xsd.PurchaseDetailsType;
+import org.jboss.savara.jbossesb.MessageUtil;
+import org.jboss.savara.jbossesb.XMLUtils;
+import org.jboss.soa.esb.client.ServiceInvoker;
+import org.jboss.soa.esb.listeners.message.MessageDeliverException;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.format.MessageFactory;
+import org.jboss.soa.esb.message.format.MessageType;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
/**
@@ -41,11 +50,55 @@
public PurchaseDetailsType checkCredit(@WebParam(name = "CreditCheckRequest", partName = "CreditCheckRequest")
PurchaseDetailsType creditCheckRequest) throws CreditCheckInvalid {
- System.out.println("The amount is: " + creditCheckRequest.getAmount());
- if (creditCheckRequest.getAmount() >= 500) {
- CreditCheckInvalid invalid = new CreditCheckInvalid(null, creditCheckRequest);
- throw invalid;
- }
- return creditCheckRequest;
+ Message message = getRequestMessage(creditCheckRequest);
+
+ try {
+ ServiceInvoker invoker = new ServiceInvoker("org.pi4soa.purchase.purchasegoods", "PurchaseGoodsProcess_CreditAgency");
+ Message response = invoker.deliverSync(message, 20000);
+
+ PurchaseDetailsType result = getConvertedResponse(response);
+
+ String messageType = MessageUtil.getMessageType(response.getBody().get());
+ if ("CreditCheckInvalid".equalsIgnoreCase(messageType)) {
+ throw new CreditCheckInvalid(null, result);
+ }
+ return result;
+ } catch (Exception e) {
+ throw new CreditCheckInvalid(null, creditCheckRequest);
+ }
+
}
+
+ private PurchaseDetailsType getConvertedResponse(Message response) throws Exception {
+ Node node = XMLUtils.getNode((String)response.getBody().get());
+ String idValue = node.getAttributes().getNamedItem("id").getNodeValue();
+ String amountNo = null;
+ String accountNo = null;
+ NodeList list = node.getChildNodes();
+ for (int i =0; i < list.getLength(); i++) {
+ if ("amount".equals(list.item(i).getNodeName())) {
+ amountNo = list.item(i).getTextContent();
+ }
+ if ("account".equals(list.item(i).getNodeName())) {
+ accountNo = list.item(i).getTextContent();
+ }
+ }
+
+ PurchaseDetailsType result = new PurchaseDetailsType();
+ result.setId(Integer.valueOf(idValue));
+ result.setAccount(Integer.valueOf(accountNo));
+ result.setAmount(Integer.valueOf(amountNo));
+ return result;
+ }
+
+ private Message getRequestMessage(PurchaseDetailsType creditCheckRequest) {
+ Message message = MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML);
+ StringBuffer sbuffer = new StringBuffer();
+ sbuffer.append("<CreditCheckRequest id=\"" + creditCheckRequest.getId() +"\">");
+ sbuffer.append("<account>" + creditCheckRequest.getAccount() + "</account>");
+ sbuffer.append("<amount>" + creditCheckRequest.getAmount() + "</amount>");
+ sbuffer.append("</CreditCheckRequest>");
+ message.getBody().add(sbuffer.toString());
+ return message;
+ }
}
Modified: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/jboss-esb.xml
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/jboss-esb.xml 2009-08-17 08:36:30 UTC (rev 752)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/jboss-esb.xml 2009-08-18 06:09:57 UTC (rev 753)
@@ -39,7 +39,7 @@
<listeners>
<jms-listener busidref="busId1" maxThreads="1" name="esb-stateless-creditAgency"/>
</listeners>
- <actions mep="OneWay">
+ <actions mep="OneWay">
<action name="c1" process="process" class="org.jboss.savara.jbossesb.actions.SwitchAction">
<property name="serviceDescriptionName" value="{org.pi4soa.purchase.purchasegoods}PurchaseGoodsProcess-CreditAgency"/>
<property name="conversationType" value="overlord.cdl.samples.Common@CreditAgency"/>
14 years, 8 months
- 1
- 0
Overlord SVN: r752 - in bpm-console/trunk: gui/war/src/main/java/org/jboss/bpm/console/client/common and 1 other directory.
by overlord-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-08-17 04:36:30 -0400 (Mon, 17 Aug 2009)
New Revision: 752
Modified:
bpm-console/trunk/BPMC.iws
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java
Log:
Revert changes to BASIC auth handling
Modified: bpm-console/trunk/BPMC.iws
===================================================================
--- bpm-console/trunk/BPMC.iws 2009-08-17 07:40:21 UTC (rev 751)
+++ bpm-console/trunk/BPMC.iws 2009-08-17 08:36:30 UTC (rev 752)
@@ -17,22 +17,7 @@
</component>
<component name="ChangeListManager">
<list default="true" name="Default" comment="">
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/server/pom.xml" afterPath="$PROJECT_DIR$/server/pom.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/server/war/pom.xml" afterPath="$PROJECT_DIR$/server/war/pom.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gui/profiles/riftsaw/pom.xml" afterPath="$PROJECT_DIR$/gui/profiles/riftsaw/pom.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shared/pom.xml" afterPath="$PROJECT_DIR$/shared/pom.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gui/profiles/pom.xml" afterPath="$PROJECT_DIR$/gui/profiles/pom.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/server/integration/pom.xml" afterPath="$PROJECT_DIR$/server/integration/pom.xml" />
- <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/profiles/drools/pom.xml" afterPath="$PROJECT_DIR$/gui/profiles/drools/pom.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/workspace/pom.xml" afterPath="$PROJECT_DIR$/workspace/pom.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gui/profiles/jbpm/pom.xml" afterPath="$PROJECT_DIR$/gui/profiles/jbpm/pom.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gui/pom.xml" afterPath="$PROJECT_DIR$/gui/pom.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/BPMC.iws" afterPath="$PROJECT_DIR$/BPMC.iws" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/workspace/workspace-api/pom.xml" afterPath="$PROJECT_DIR$/workspace/workspace-api/pom.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shared/rpc/pom.xml" afterPath="$PROJECT_DIR$/shared/rpc/pom.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gui/war/pom.xml" afterPath="$PROJECT_DIR$/gui/war/pom.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java" afterPath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java" />
</list>
<list name="Failed commit: Default" comment="remove dependency on DTOParser" />
@@ -159,53 +144,15 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="jboss-web.xml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/templates/WEB-INF/jboss-web.xml">
+ <file leaf-file-name="AbstractRESTAction.java" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="10" column="41" selection-start="263" selection-end="285" vertical-scroll-proportion="0.2551834">
+ <state line="54" column="82" selection-start="2205" selection-end="2205" vertical-scroll-proportion="0.49689442">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/gui/war/pom.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state line="253" column="15" selection-start="7293" selection-end="7833" vertical-scroll-proportion="0.5686275">
- <folding>
- <element signature="tag#dependencies#0;tag#project#0" expanded="false" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/server/war/pom.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state line="304" column="33" selection-start="8849" selection-end="8849" vertical-scroll-proportion="0.7647059">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="pom.xml" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/gui/pom.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state line="14" column="13" selection-start="533" selection-end="533" vertical-scroll-proportion="0.36601308">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="jboss-web.xml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/server/war/src/main/templates/WEB-INF/jboss-web.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state line="7" column="0" selection-start="179" selection-end="179" vertical-scroll-proportion="0.17862839">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
</leaf>
</component>
<component name="FindManager">
@@ -301,152 +248,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_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/server/war/src/main/templates" />
- <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>
@@ -604,7 +405,7 @@
<showLibraryContents />
<hideEmptyPackages PackagesPane="false" ProjectPane="false" />
<abbreviatePackageNames />
- <showStructure ProjectPane="false" PackagesPane="false" Scope="false" Favorites="false" />
+ <showStructure Scope="false" ProjectPane="false" PackagesPane="false" Favorites="false" />
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
@@ -612,8 +413,8 @@
</component>
<component name="PropertiesComponent">
<property name="MemberChooser.copyJavadoc" value="false" />
- <property name="cvs_file_history_treeWidth0" value="290" />
- <property name="cvs_file_history_flatWidth2" value="290" />
+ <property name="cvs_file_history_treeWidth0" value="287" />
+ <property name="cvs_file_history_flatWidth2" value="291" />
<property name="MemberChooser.sorted" value="false" />
<property name="cvs_file_history_treeOrder1" value="1" />
<property name="RunManagerConfig.compileBeforeRunning" value="false" />
@@ -621,20 +422,20 @@
<property name="cvs_file_history_treeOrder3" value="3" />
<property name="GoToFile.includeJavaFiles" value="false" />
<property name="cvs_file_history_flatOrder1" value="1" />
- <property name="cvs_file_history_flatWidth1" value="290" />
- <property name="cvs_file_history_treeWidth1" value="290" />
- <property name="cvs_file_history_treeWidth3" value="290" />
+ <property name="cvs_file_history_flatWidth1" value="291" />
+ <property name="cvs_file_history_treeWidth1" value="287" />
<property name="cvs_file_history_treeOrder2" value="2" />
+ <property name="cvs_file_history_treeWidth3" value="287" />
<property name="GoToClass.includeLibraries" value="false" />
<property name="cvs_file_history_flatOrder2" value="2" />
<property name="MemberChooser.showClasses" value="true" />
- <property name="cvs_file_history_flatWidth0" value="290" />
+ <property name="cvs_file_history_flatWidth0" value="291" />
<property name="cvs_file_history_flatWidth3" value="290" />
- <property name="cvs_file_history_treeWidth2" value="290" />
+ <property name="cvs_file_history_treeWidth2" value="287" />
<property name="cvs_file_history_flatOrder3" value="3" />
<property name="GoToClass.toSaveIncludeLibraries" value="false" />
- <property name="cvs_file_history_treeOrder0" value="0" />
<property name="RunManagerConfig.showSettingsBeforeRunnig" value="false" />
+ <property name="cvs_file_history_treeOrder0" value="0" />
</component>
<component name="ReadonlyStatusHandler">
<option name="SHOW_DIALOG" value="true" />
@@ -649,13 +450,6 @@
</component>
<component name="RestoreUpdateTree" />
<component name="RunManager" selected="Remote.GWT">
- <configuration default="true" type="Remote" factoryName="Remote">
- <option name="USE_SOCKET_TRANSPORT" value="true" />
- <option name="SERVER_MODE" value="false" />
- <option name="SHMEM_ADDRESS" value="javadebug" />
- <option name="HOST" value="localhost" />
- <option name="PORT" value="5005" />
- </configuration>
<configuration default="true" type="Applet" factoryName="Applet">
<module name="" />
<option name="MAIN_CLASS_NAME" />
@@ -668,6 +462,19 @@
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
</configuration>
+ <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
+ <option name="MAIN_CLASS_NAME" />
+ <option name="VM_PARAMETERS" />
+ <option name="PROGRAM_PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="ENABLE_SWING_INSPECTOR" value="false" />
+ <module name="" />
+ <method>
+ <option name="Make" value="true" />
+ </method>
+ </configuration>
<configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
<module name="" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -687,18 +494,12 @@
<option name="Make" value="true" />
</method>
</configuration>
- <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
- <option name="MAIN_CLASS_NAME" />
- <option name="VM_PARAMETERS" />
- <option name="PROGRAM_PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="ENABLE_SWING_INSPECTOR" value="false" />
- <module name="" />
- <method>
- <option name="Make" value="true" />
- </method>
+ <configuration default="true" type="Remote" factoryName="Remote">
+ <option name="USE_SOCKET_TRANSPORT" value="true" />
+ <option name="SERVER_MODE" value="false" />
+ <option name="SHMEM_ADDRESS" value="javadebug" />
+ <option name="HOST" value="localhost" />
+ <option name="PORT" value="5005" />
</configuration>
<configuration default="false" name="GWT" type="Remote" factoryName="Remote">
<option name="USE_SOCKET_TRANSPORT" value="true" />
@@ -796,14 +597,14 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="0" y="22" width="1280" height="774" extended-state="7" />
- <editor active="false" />
+ <frame x="381" y="43" width="1268" height="967" extended-state="0" />
+ <editor active="true" />
<layout>
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
<window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
<window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="7" />
- <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32981315" order="0" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.33305988" order="0" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.40895522" order="1" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24937028" 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" />
@@ -820,7 +621,7 @@
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3995381" 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.3293944" 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" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="0" />
<window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="2" />
<window_info id="EJB" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="3" />
@@ -950,60 +751,58 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.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="56" column="68" selection-start="2347" selection-end="2347" vertical-scroll-proportion="0.6013072">
+ <state line="162" column="0" selection-start="4660" selection-end="4660" vertical-scroll-proportion="0.23444976">
<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/WEB-INF/web.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="162" column="0" selection-start="4660" selection-end="4660" vertical-scroll-proportion="0.23444976">
+ <state line="54" column="42" selection-start="0" selection-end="2257" vertical-scroll-proportion="0.20893142">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/server/war/src/main/webapp/WEB-INF/web.xml">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/templates/WEB-INF/jboss-web.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="54" column="42" selection-start="0" selection-end="2257" vertical-scroll-proportion="0.20893142">
+ <state line="10" column="41" selection-start="263" selection-end="285" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/gui/war/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="253" column="15" selection-start="7293" selection-end="7833" vertical-scroll-proportion="0.5686275">
- <folding>
- <element signature="tag#dependencies#0;tag#project#0" expanded="false" />
- </folding>
+ <state line="253" column="15" selection-start="7293" selection-end="7833" vertical-scroll-proportion="0.0">
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/server/war/src/main/templates/WEB-INF/jboss-web.xml">
+ <entry file="file://$PROJECT_DIR$/server/war/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="7" column="0" selection-start="179" selection-end="179" vertical-scroll-proportion="0.17862839">
+ <state line="304" column="33" selection-start="8849" selection-end="8849" vertical-scroll-proportion="0.70186335">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/templates/WEB-INF/jboss-web.xml">
+ <entry file="file://$PROJECT_DIR$/gui/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="10" column="41" selection-start="263" selection-end="285" vertical-scroll-proportion="0.2551834">
+ <state line="23" column="0" selection-start="710" selection-end="710" vertical-scroll-proportion="0.45714286">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/server/war/pom.xml">
+ <entry file="file://$PROJECT_DIR$/server/war/src/main/templates/WEB-INF/jboss-web.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="304" column="33" selection-start="8849" selection-end="8849" vertical-scroll-proportion="0.7647059">
+ <state line="7" column="0" selection-start="179" selection-end="179" vertical-scroll-proportion="0.13658537">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/pom.xml">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="14" column="13" selection-start="533" selection-end="533" vertical-scroll-proportion="0.36601308">
+ <state line="54" column="82" selection-start="2205" selection-end="2205" vertical-scroll-proportion="0.49689442">
<folding />
</state>
</provider>
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java 2009-08-17 07:40:21 UTC (rev 751)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java 2009-08-17 08:36:30 UTC (rev 752)
@@ -41,7 +41,7 @@
protected AbstractRESTAction()
{
- this.appContext = Registry.get(ApplicationContext.class);
+ this.appContext = Registry.get(ApplicationContext.class);;
}
public abstract String getId();
@@ -50,11 +50,9 @@
public abstract void handleSuccessfulResponse(final Controller controller, final Object event, Response response);
public void execute(final Controller controller, final Object object)
- {
+ {
final String url = getUrl(object);
RequestBuilder builder = new RequestBuilder(getRequestMethod(), URL.encode(url));
- builder.setUser(appContext.getAuthentication().getUsername());
- builder.setPassword(appContext.getAuthentication().getPassword());
ConsoleLog.debug(getRequestMethod() +": " + url);
14 years, 8 months
- 1
- 0
Overlord SVN: r751 - in cdl/trunk: distribution/src/main/release/install and 12 other directories.
by overlord-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2009-08-17 03:40:21 -0400 (Mon, 17 Aug 2009)
New Revision: 751
Added:
cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/WSBuyerClient.java
cdl/trunk/samples/jbossesb/client/src/soap_message_01.xml
cdl/trunk/samples/jbossesb/client/src/soap_message_02.xml
cdl/trunk/samples/jbossesb/common/creditAgency/src/scripts/
cdl/trunk/samples/jbossesb/common/creditAgency/src/scripts/esb-assembly.xml
cdl/trunk/samples/jbossesb/common/creditAgency/src/scripts/war-assembly.xml
Modified:
cdl/trunk/distribution/src/main/assembly/bin.xml
cdl/trunk/distribution/src/main/release/install/build.xml
cdl/trunk/runtime/jbossesb/pom.xml
cdl/trunk/runtime/jbossesb/src/main/configs/esb-assembly.xml
cdl/trunk/samples/jbossesb/common/creditAgency/pom.xml
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/wsdl/CreditAgencyService.java
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/xsd/ObjectFactory.java
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/xsd/PurchaseDetailsType.java
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/xsd/package-info.java
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/deployment.xml
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/jboss-esb.xml
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/jbm-queue-service.xml
cdl/trunk/samples/pom.xml
Log:
* Add the webservice for the credit agency service.
Modified: cdl/trunk/distribution/src/main/assembly/bin.xml
===================================================================
--- cdl/trunk/distribution/src/main/assembly/bin.xml 2009-08-14 09:27:54 UTC (rev 750)
+++ cdl/trunk/distribution/src/main/assembly/bin.xml 2009-08-17 07:40:21 UTC (rev 751)
@@ -32,24 +32,15 @@
<directory>eclipse</directory>
<outputDirectory>tools</outputDirectory>
</fileSet>
-
- <fileSet>
- <directory>validator/jbossesb</directory>
- <outputDirectory>modules/validator-jbossesb-${cdl.version}</outputDirectory>
- </fileSet>
<fileSet>
<directory>../runtime/jbossesb/target</directory>
<outputDirectory>modules/runtime-jbossesb-${cdl.version}</outputDirectory>
<includes>
- <include>overlord-cdl-runtime.esb-dist.zip</include>
+ <include>savara-runtime.esb-dist.zip</include>
</includes>
</fileSet>
- <fileSet>
- <directory>../validator/jbossesb-assembly/target/overlord-cdl-validator-jbossesb</directory>
- <outputDirectory>modules/validator-jbossesb-${cdl.version}/overlord-cdl-validator.esb</outputDirectory>
- </fileSet>
<!--Copy files like License and samples etc -->
<fileSet>
@@ -64,126 +55,8 @@
<fileSet>
<directory>src/main/release/install</directory>
<outputDirectory>/install</outputDirectory>
- </fileSet>
-
- <!-- Copy docbook generated documents -->
- <fileSet>
- <directory>../docs/docbook/userguide/target/docbook/publish/en-US</directory>
- <outputDirectory>docs/userguide</outputDirectory>
</fileSet>
-
- <fileSet>
- <directory>../docs/docbook/samplesguide/target/docbook/publish/en-US</directory>
- <outputDirectory>docs/samplesguide</outputDirectory>
- </fileSet>
-
- <fileSet>
- <directory>../docs/docbook/gettingstartedguide/target/docbook/publish/en-US</directory>
- <outputDirectory>docs/gettingstartedguide</outputDirectory>
- </fileSet>
-
-
- <fileSet>
- <directory>../runtime/jbossesb/target/javadoc</directory>
- <outputDirectory>docs/jbossesb-javadoc</outputDirectory>
- </fileSet>
-
- <!-- Copy samples -->
- <fileSet>
- <directory>src/main/release/samples/jbossesb</directory>
- <outputDirectory>samples</outputDirectory>
- </fileSet>
-
- <!-- Copy the models that are common to stateful and stateless examples -->
- <fileSet>
- <directory>../samples/jbossesb/brokerage/models</directory>
- <outputDirectory>samples/models/brokerage</outputDirectory>
- <excludes>
- <exclude>**/.project</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>../samples/jbossesb/purchasing/models</directory>
- <outputDirectory>samples/models/purchasing</outputDirectory>
- <excludes>
- <exclude>**/.project</exclude>
- </excludes>
- </fileSet>
-
- <!-- Copy examples -->
- <fileSet>
- <directory>../samples/jbossesb/brokerage/broker/src</directory>
- <outputDirectory>samples/brokerage/broker/src</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>../samples/jbossesb/brokerage/supplier/src</directory>
- <outputDirectory>samples/brokerage/supplier/src</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>../samples/jbossesb/purchasing/store/src</directory>
- <outputDirectory>samples/purchasing/store/src</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>../samples/jbossesb/common/creditAgency/src</directory>
- <outputDirectory>samples/common/creditAgency/src</outputDirectory>
- </fileSet>
- <!-- copy client & trailblazer example-->
- <fileSet>
- <directory>../samples/jbossesb/client</directory>
- <outputDirectory>samples/client</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>../samples/jbossesb/trailblazer</directory>
- <outputDirectory>samples/trailblazer</outputDirectory>
- </fileSet>
-
</fileSets>
- <dependencySets>
- <!-- Need to copy libraries into each of the samples Eclipse projects
- as the jars must be referenced locally within each project. The
- versions have been removed from the jars, as the Eclipse projects
- need to explicitly refer to each Jar in the .classpath file, so
- removing the version from the name avoids having to find a way
- to automatically update the .classpath file -->
- <dependencySet>
- <outputDirectory>samples/brokerage/broker/lib</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <includes>
- <include>org.jboss.soa.overlord.cdl.runtime:cdl-runtime-jbossesb</include>
- <include>org.jboss.jbossesb:rosetta</include>
- <include>log4j:log4j</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>samples/brokerage/supplier/lib</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <includes>
- <include>org.jboss.soa.overlord.cdl.runtime:cdl-runtime-jbossesb</include>
- <include>org.jboss.jbossesb:rosetta</include>
- <include>log4j:log4j</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>samples/purchasing/store/lib</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <includes>
- <include>org.jboss.soa.overlord.cdl.runtime:cdl-runtime-jbossesb</include>
- <include>org.jboss.jbossesb:rosetta</include>
- <include>log4j:log4j</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>samples/common/creditAgency/lib</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <includes>
- <include>org.jboss.soa.overlord.cdl.runtime:cdl-runtime-jbossesb</include>
- <include>org.jboss.jbossesb:rosetta</include>
- <include>log4j:log4j</include>
- </includes>
- </dependencySet>
-
- </dependencySets>
-
</assembly>
Modified: cdl/trunk/distribution/src/main/release/install/build.xml
===================================================================
--- cdl/trunk/distribution/src/main/release/install/build.xml 2009-08-14 09:27:54 UTC (rev 750)
+++ cdl/trunk/distribution/src/main/release/install/build.xml 2009-08-17 07:40:21 UTC (rev 751)
@@ -1,4 +1,4 @@
-<project name="Overlord_CDL_Installer" default="deploy" basedir=".">
+<project name="Overlord_CDL_Installer" default="deploy-cdl-runtime" basedir=".">
<!-- Set deployment properties filename -->
<property name="org.jboss.esb.deployment.properties" location="deployment.properties"/>
@@ -27,12 +27,12 @@
<target name="deploy-cdl-runtime" description="Deploys Overlord CDL Runtime to the server">
<echo message="Deploy overlord cdl runtime to JBoss ESB server" />
- <unzip src="${modules}/runtime-jbossesb-${cdl.version}/overlord-cdl-runtime.esb-dist.zip" dest="${deploy.dir}" />
+ <unzip src="${modules}/runtime-jbossesb-${cdl.version}/savara-runtime.esb-dist.zip" dest="${deploy.dir}" />
</target>
<target name="undeploy-cdl-runtime" description="Undeploys Overlord CDL Runtime">
<echo message="Undeploy the overlord-cdl-runtime.esb from JBoss ESB server" />
- <delete dir="${deploy.dir}/overlord-cdl-runtime.esb" />
+ <delete dir="${deploy.dir}/savara-runtime.esb" />
</target>
<target name="deploy-cdl-validator" depends="check.deploy.props" description="Deploys Overlord CDL validator to the server">
Modified: cdl/trunk/runtime/jbossesb/pom.xml
===================================================================
--- cdl/trunk/runtime/jbossesb/pom.xml 2009-08-14 09:27:54 UTC (rev 750)
+++ cdl/trunk/runtime/jbossesb/pom.xml 2009-08-17 07:40:21 UTC (rev 751)
@@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.savara.runtime</groupId>
- <artifactId>jbossesb</artifactId>
+ <artifactId>savara-jbossesb</artifactId>
<packaging>jar</packaging>
<name>Savara::Runtime::JBoss ESB</name>
Modified: cdl/trunk/runtime/jbossesb/src/main/configs/esb-assembly.xml
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/configs/esb-assembly.xml 2009-08-14 09:27:54 UTC (rev 750)
+++ cdl/trunk/runtime/jbossesb/src/main/configs/esb-assembly.xml 2009-08-17 07:40:21 UTC (rev 751)
@@ -20,7 +20,7 @@
<dependencySet>
<outputDirectory>/lib</outputDirectory>
<includes>
- <include>org.jboss.soa.overlord.cdl.runtime:cdl-runtime-jbossesb</include>
+ <include>org.jboss.savara.runtime:savara-jbossesb</include>
</includes>
</dependencySet>
</dependencySets>
Added: cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/WSBuyerClient.java
===================================================================
--- cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/WSBuyerClient.java (rev 0)
+++ cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/WSBuyerClient.java 2009-08-17 07:40:21 UTC (rev 751)
@@ -0,0 +1,68 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2008,
+ */
+package com.acme.services.buyer;
+
+import org.jboss.internal.soa.esb.util.StreamUtils;
+import org.jboss.remoting.Client;
+import org.jboss.remoting.InvokerLocator;
+
+/**
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
+ *
+ */
+public class WSBuyerClient {
+
+ public void sendMessageToJBRListener(String protocol, int port, String message) throws Throwable {
+ String locatorURI = protocol + "://localhost:" + port;
+ InvokerLocator locator = new InvokerLocator(locatorURI);
+ System.out.println("Calling JBoss Remoting Listener using locator URI: " + locatorURI);
+
+ Client remotingClient = null;
+ try {
+ remotingClient = new Client(locator);
+ remotingClient.connect();
+
+ // Deliver the message to the listener...
+ Object response = remotingClient.invoke(message);
+ System.out.println("JBR Class: " + response.getClass().getName());
+ System.out.println("Response from JBoss Remoting Listener '" + locatorURI + "' was '" + response + "'.");
+ } finally {
+ if(remotingClient != null) {
+ remotingClient.disconnect();
+ }
+ }
+ }
+
+ private static String getMessage(String messageNum) {
+ String msg = new String(StreamUtils.readStream(WSBuyerClient.class.getResourceAsStream("/soap_message_" + messageNum + ".xml")));
+ return msg;
+ }
+
+ /**
+ * @param args
+ */
+ public static void main(String[] args) throws Throwable{
+ WSBuyerClient client = new WSBuyerClient();
+ String msg = getMessage("02");
+ System.out.println(msg);
+ client.sendMessageToJBRListener("http", 8765, msg);
+ }
+
+}
Added: cdl/trunk/samples/jbossesb/client/src/soap_message_01.xml
===================================================================
--- cdl/trunk/samples/jbossesb/client/src/soap_message_01.xml (rev 0)
+++ cdl/trunk/samples/jbossesb/client/src/soap_message_01.xml 2009-08-17 07:40:21 UTC (rev 751)
@@ -0,0 +1,11 @@
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:wsdl="http://www.jboss.org/overlord/examples/wsdl">
+ <soapenv:Header/>
+ <soapenv:Body>
+ <wsdl:checkCredit>
+ <CreditCheckRequest id="1" xmlns:ns2="http://www.jboss.org/overlord/examples/xsd">
+ <ns2:account>243</ns2:account>
+ <ns2:amount>500</ns2:amount>
+ </CreditCheckRequest>
+ </wsdl:checkCredit>
+ </soapenv:Body>
+</soapenv:Envelope>
\ No newline at end of file
Added: cdl/trunk/samples/jbossesb/client/src/soap_message_02.xml
===================================================================
--- cdl/trunk/samples/jbossesb/client/src/soap_message_02.xml (rev 0)
+++ cdl/trunk/samples/jbossesb/client/src/soap_message_02.xml 2009-08-17 07:40:21 UTC (rev 751)
@@ -0,0 +1,11 @@
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:wsdl="http://www.jboss.org/overlord/examples/wsdl">
+ <soapenv:Header/>
+ <soapenv:Body>
+ <wsdl:checkCredit>
+ <CreditCheckRequest id="2" xmlns:ns2="http://www.jboss.org/overlord/examples/xsd">
+ <ns2:account>123456</ns2:account>
+ <ns2:amount>200</ns2:amount>
+ </CreditCheckRequest>
+ </wsdl:checkCredit>
+ </soapenv:Body>
+</soapenv:Envelope>
\ No newline at end of file
Modified: cdl/trunk/samples/jbossesb/common/creditAgency/pom.xml
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/pom.xml 2009-08-14 09:27:54 UTC (rev 750)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/pom.xml 2009-08-17 07:40:21 UTC (rev 751)
@@ -22,7 +22,7 @@
</dependency>
<dependency>
<groupId>org.jboss.savara.runtime</groupId>
- <artifactId>jbossesb</artifactId>
+ <artifactId>savara-jbossesb</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/wsdl/CreditAgencyService.java
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/wsdl/CreditAgencyService.java 2009-08-14 09:27:54 UTC (rev 750)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/wsdl/CreditAgencyService.java 2009-08-17 07:40:21 UTC (rev 751)
@@ -41,7 +41,11 @@
public PurchaseDetailsType checkCredit(@WebParam(name = "CreditCheckRequest", partName = "CreditCheckRequest")
PurchaseDetailsType creditCheckRequest) throws CreditCheckInvalid {
-
+ System.out.println("The amount is: " + creditCheckRequest.getAmount());
+ if (creditCheckRequest.getAmount() >= 500) {
+ CreditCheckInvalid invalid = new CreditCheckInvalid(null, creditCheckRequest);
+ throw invalid;
+ }
return creditCheckRequest;
}
}
Modified: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/xsd/ObjectFactory.java
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/xsd/ObjectFactory.java 2009-08-14 09:27:54 UTC (rev 750)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/xsd/ObjectFactory.java 2009-08-17 07:40:21 UTC (rev 751)
@@ -50,4 +50,4 @@
return new JAXBElement<PurchaseDetailsType>(_CreditCheckInvalid_QNAME, PurchaseDetailsType.class, null, value);
}
-}
+}
\ No newline at end of file
Modified: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/xsd/PurchaseDetailsType.java
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/xsd/PurchaseDetailsType.java 2009-08-14 09:27:54 UTC (rev 750)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/xsd/PurchaseDetailsType.java 2009-08-17 07:40:21 UTC (rev 751)
@@ -96,4 +96,4 @@
this.id = value;
}
-}
+}
\ No newline at end of file
Modified: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/xsd/package-info.java
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/xsd/package-info.java 2009-08-14 09:27:54 UTC (rev 750)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/xsd/package-info.java 2009-08-17 07:40:21 UTC (rev 751)
@@ -1,2 +1,2 @@
@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.jboss.org/overlord/examples/xsd", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package org.jboss.overlord.examples.xsd;
+package org.jboss.overlord.examples.xsd;
\ No newline at end of file
Modified: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/deployment.xml
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/deployment.xml 2009-08-14 09:27:54 UTC (rev 750)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/deployment.xml 2009-08-17 07:40:21 UTC (rev 751)
@@ -1,7 +1,9 @@
<jbossesb-deployment>
- <depends>jboss.esb:deployment=overlord-cdl-runtime.esb</depends>
+ <depends>jboss.esb:deployment=savara-runtime.esb</depends>
<depends>jboss.esb.gen.destination:service=Queue,name=esb-stateless-creditAgency</depends>
<depends>jboss.esb.gen.destination:service=Queue,name=esb-stateless-creditAgency1</depends>
<depends>jboss.esb.gen.destination:service=Queue,name=esb-stateless-creditAgency2</depends>
<depends>jboss.esb.gen.destination:service=Queue,name=esb-stateless-creditAgency3</depends>
+ <depends>jboss.esb.gen.destination:service=Queue,name=ws-esb-creditAgency</depends>
+ <depends>jboss.esb.gen.destination:service=Queue,name=ws-esb-creditAgency_reply</depends>
</jbossesb-deployment>
Modified: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/jboss-esb.xml
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/jboss-esb.xml 2009-08-14 09:27:54 UTC (rev 750)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/jboss-esb.xml 2009-08-17 07:40:21 UTC (rev 751)
@@ -13,15 +13,34 @@
<jms-bus busid="busId4">
<jms-message-filter dest-name="queue/esb-stateless-creditAgency3" dest-type="QUEUE"/>
</jms-bus>
+ <jms-bus busid="ws-esb-busId">
+ <jms-message-filter dest-name="queue/ws-esb-creditAgency" dest-type="QUEUE"/>
+ </jms-bus>
</jms-provider>
+ <jbr-provider name="JBR-Http" protocol="http" host="localhost">
+ <jbr-bus busid="Http-1" port="8765" />
+ </jbr-provider>
+
</providers>
<services>
+ <service category="org.jboss.overlord.examples" name="CreditAgencyService" description="WS Frontend speaks natively to the ESB">
+ <listeners>
+ <jbr-listener name="Http-Gateway" busidref="Http-1" is-gateway="true"/>
+ <jms-listener name="WS-ESBListener" busidref="ws-esb-busId"/>
+ </listeners>
+ <actions>
+ <action name="JBossWSAdapter" class="org.jboss.soa.esb.actions.soap.SOAPProcessor">
+ <property name="jbossws-endpoint" value="CreditAgencyService"/>
+ </action>
+ </actions>
+ </service>
+
<service category="org.pi4soa.purchase.purchasegoods" name="PurchaseGoodsProcess_CreditAgency" description="">
<listeners>
<jms-listener busidref="busId1" maxThreads="1" name="esb-stateless-creditAgency"/>
</listeners>
<actions mep="OneWay">
- <action name="c1" process="process" class="org.jboss.soa.overlord.jbossesb.actions.SwitchAction">
+ <action name="c1" process="process" class="org.jboss.savara.jbossesb.actions.SwitchAction">
<property name="serviceDescriptionName" value="{org.pi4soa.purchase.purchasegoods}PurchaseGoodsProcess-CreditAgency"/>
<property name="conversationType" value="overlord.cdl.samples.Common@CreditAgency"/>
<property name="paths">
@@ -37,7 +56,7 @@
<jms-listener busidref="busId2" maxThreads="1" name="esb-stateless-creditAgency1"/>
</listeners>
<actions mep="OneWay">
- <action name="c2" process="process" class="org.jboss.soa.overlord.jbossesb.actions.ReceiveMessageAction">
+ <action name="c2" process="process" class="org.jboss.savara.jbossesb.actions.ReceiveMessageAction">
<property name="operation" value="checkCredit"/>
<property name="messageType" value="CreditCheckRequest"/>
<property name="clientRole" value="Store" />
Modified: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/jbm-queue-service.xml
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/jbm-queue-service.xml 2009-08-14 09:27:54 UTC (rev 750)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/jbm-queue-service.xml 2009-08-17 07:40:21 UTC (rev 751)
@@ -30,5 +30,16 @@
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
<depends>jboss.messaging:service=PostOffice</depends>
</mbean>
-
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.gen.destination:service=Queue,name=ws-esb-creditAgency"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.gen.destination:service=Queue,name=ws-esb-creditAgency_reply"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
</server>
\ No newline at end of file
Added: cdl/trunk/samples/jbossesb/common/creditAgency/src/scripts/esb-assembly.xml
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/scripts/esb-assembly.xml (rev 0)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/scripts/esb-assembly.xml 2009-08-17 07:40:21 UTC (rev 751)
@@ -0,0 +1,25 @@
+<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+ <id>esb</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>jbmq-queue-service.xml</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>creditAgency.war</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+</assembly>
\ No newline at end of file
Added: cdl/trunk/samples/jbossesb/common/creditAgency/src/scripts/war-assembly.xml
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/scripts/war-assembly.xml (rev 0)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/scripts/war-assembly.xml 2009-08-17 07:40:21 UTC (rev 751)
@@ -0,0 +1,17 @@
+<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+ <id>war</id>
+ <formats>
+ <format>war</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>src/main/webapp</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>WEB-INF/web.xml</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Modified: cdl/trunk/samples/pom.xml
===================================================================
--- cdl/trunk/samples/pom.xml 2009-08-14 09:27:54 UTC (rev 750)
+++ cdl/trunk/samples/pom.xml 2009-08-17 07:40:21 UTC (rev 751)
@@ -33,7 +33,7 @@
</dependency>
<dependency>
<groupId>org.jboss.savara.runtime</groupId>
- <artifactId>jbossesb</artifactId>
+ <artifactId>savara-jbossesb</artifactId>
<version>${savara.version}</version>
<scope>provided</scope>
</dependency>
14 years, 8 months
- 1
- 0
Overlord SVN: r750 - in cdl/trunk/samples: jbossesb/common/creditAgency and 12 other directories.
by overlord-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2009-08-14 05:27:54 -0400 (Fri, 14 Aug 2009)
New Revision: 750
Added:
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/creditAgency/
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/creditAgency/CreditAgencyDecision.java
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/creditAgency/MemoryEPRStorage.java
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/creditAgency/SetCreditCheckInvalidMessageAction.java
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/creditAgency/SetCreditCheckResponseMessageAction.java
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/wsdl/
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/wsdl/CreditAgencyService.java
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/wsdl/CreditCheckInvalid.java
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/xsd/
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/xsd/ObjectFactory.java
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/xsd/PurchaseDetailsType.java
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/xsd/package-info.java
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/webapp/
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/webapp/WEB-INF/
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/webapp/WEB-INF/web.xml
Removed:
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/com/
Modified:
cdl/trunk/samples/jbossesb/common/creditAgency/pom.xml
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/jboss-esb.xml
cdl/trunk/samples/pom.xml
Log:
* refactor the credit agency's package name.
* add the web service proxy for credit agency ESB service.
Modified: cdl/trunk/samples/jbossesb/common/creditAgency/pom.xml
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/pom.xml 2009-08-07 13:35:46 UTC (rev 749)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/pom.xml 2009-08-14 09:27:54 UTC (rev 750)
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.savara.samples</groupId>
<artifactId>jbossesb-creditAgency</artifactId>
- <packaging>jboss-esb</packaging>
+ <packaging>jar</packaging>
<name>Savara::Samples::CreditAgency</name>
<url>http://www.jboss.org/overlord</url>
@@ -18,40 +18,65 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.savara.runtime</groupId>
<artifactId>jbossesb</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
-
+ <dependency>
+ <groupId>sun-jaxws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>sun-jaxws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
- <finalName>creditAgency</finalName>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <!--Deploy esb artifact to JBoss AS/ESB -->
- <execution>
- <id>deploy</id>
- <phase>install</phase>
- <configuration>
- <tasks>
- <!--copy file="target/creditAgency-stateless.esb" todir="${deploy.dir}" overwrite="true" /-->
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>war</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>creditAgency</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>src/scripts/war-assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ <execution>
+ <id>esb</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>creditAgency.esb</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>src/scripts/esb-assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Added: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/creditAgency/CreditAgencyDecision.java
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/creditAgency/CreditAgencyDecision.java (rev 0)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/creditAgency/CreditAgencyDecision.java 2009-08-14 09:27:54 UTC (rev 750)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2008,
+ */
+package org.jboss.overlord.examples.creditAgency;
+
+import org.jboss.savara.jbossesb.Decision;
+import org.jboss.soa.esb.message.Message;
+
+/**
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
+ *
+ */
+public class CreditAgencyDecision implements Decision {
+
+ /* (non-Javadoc)
+ * @see org.jboss.soa.overlord.jbossesb.Decision#executeDecision(org.jboss.soa.esb.message.Message)
+ */
+ public boolean executeDecision(Message message) {
+ return true;
+ }
+
+}
Added: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/creditAgency/MemoryEPRStorage.java
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/creditAgency/MemoryEPRStorage.java (rev 0)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/creditAgency/MemoryEPRStorage.java 2009-08-14 09:27:54 UTC (rev 750)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2008,
+ */
+package org.jboss.overlord.examples.creditAgency;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jboss.savara.jbossesb.EPRStore;
+import org.jboss.soa.esb.addressing.EPR;
+import org.jboss.soa.esb.message.Message;
+
+/**
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
+ *
+ */
+public class MemoryEPRStorage implements EPRStore {
+
+ private static final Map<String, EPR> storage = new HashMap<String, EPR>();
+
+ public EPR getEPRByRole(String roleName, Message message) {
+ return storage.get(roleName);
+ }
+
+ public void registerRole(String roleName, Message message) {
+ EPR epr = message.getHeader().getCall().getReplyTo();
+ storage.put(roleName, epr);
+ }
+
+}
Added: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/creditAgency/SetCreditCheckInvalidMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/creditAgency/SetCreditCheckInvalidMessageAction.java (rev 0)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/creditAgency/SetCreditCheckInvalidMessageAction.java 2009-08-14 09:27:54 UTC (rev 750)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2008,
+ */
+package org.jboss.overlord.examples.creditAgency;
+
+import org.apache.log4j.Logger;
+import org.jboss.savara.jbossesb.XMLUtils;
+import org.jboss.soa.esb.actions.AbstractActionLifecycle;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+import org.w3c.dom.Node;
+
+public class SetCreditCheckInvalidMessageAction extends AbstractActionLifecycle {
+
+ private static Logger logger = Logger.getLogger(SetCreditCheckInvalidMessageAction.class);
+
+ private ConfigTree config;
+
+ public SetCreditCheckInvalidMessageAction(ConfigTree config) {
+ this.config = config;
+ }
+
+ public Message process(Message message) throws Exception{
+
+ Node node = XMLUtils.getNode((String)message.getBody().get());
+ String idValue = node.getAttributes().getNamedItem("id").getNodeValue();
+ message.getBody().add("<CreditCheckInvalid id=\"" + idValue +"\"></CreditCheckInvalid>");
+
+ logger.info("Updated credit message: " + message.getBody().get());
+
+ return(message);
+ }
+
+}
+
+
Added: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/creditAgency/SetCreditCheckResponseMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/creditAgency/SetCreditCheckResponseMessageAction.java (rev 0)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/creditAgency/SetCreditCheckResponseMessageAction.java 2009-08-14 09:27:54 UTC (rev 750)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2008,
+ */
+package org.jboss.overlord.examples.creditAgency;
+
+import org.apache.log4j.Logger;
+import org.jboss.savara.jbossesb.XMLUtils;
+import org.jboss.soa.esb.actions.AbstractActionLifecycle;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+import org.w3c.dom.Node;
+
+public class SetCreditCheckResponseMessageAction extends AbstractActionLifecycle {
+
+ private static Logger logger = Logger.getLogger(SetCreditCheckResponseMessageAction.class);
+
+ private ConfigTree config;
+
+ public SetCreditCheckResponseMessageAction(ConfigTree config) {
+ this.config = config;
+ }
+
+ public Message process(Message message) throws Exception{
+
+ Node node = XMLUtils.getNode((String)message.getBody().get());
+ String idValue = node.getAttributes().getNamedItem("id").getNodeValue();
+ message.getBody().add("<CreditCheckOk id=\"" + idValue +"\"></CreditCheckOk>");
+
+ logger.info("Updated credit message: "+message.getBody().get() +"' by thread of " + Thread.currentThread().getName());
+
+ return(message);
+ }
+
+
+}
+
+
Added: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/wsdl/CreditAgencyService.java
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/wsdl/CreditAgencyService.java (rev 0)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/wsdl/CreditAgencyService.java 2009-08-14 09:27:54 UTC (rev 750)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2008,
+ */
+package org.jboss.overlord.examples.wsdl;
+
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+import org.jboss.overlord.examples.xsd.PurchaseDetailsType;
+
+
+/**
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
+ *
+ */
+@WebService(name="creditAgencyPT", targetNamespace="http://www.jboss.org/overlord/examples/wsdl")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+public class CreditAgencyService {
+
+ @WebMethod
+ @WebResult(name = "CreditCheckOk", partName = "CreditCheckOk")
+ public PurchaseDetailsType checkCredit(@WebParam(name = "CreditCheckRequest", partName = "CreditCheckRequest")
+ PurchaseDetailsType creditCheckRequest) throws CreditCheckInvalid {
+
+
+ return creditCheckRequest;
+ }
+}
Added: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/wsdl/CreditCheckInvalid.java
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/wsdl/CreditCheckInvalid.java (rev 0)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/wsdl/CreditCheckInvalid.java 2009-08-14 09:27:54 UTC (rev 750)
@@ -0,0 +1,55 @@
+
+package org.jboss.overlord.examples.wsdl;
+
+import javax.xml.ws.WebFault;
+import org.jboss.overlord.examples.xsd.PurchaseDetailsType;
+
+
+/**
+ * This class was generated by the JAX-WS RI.
+ * JAX-WS RI 2.1.7-hudson-48-
+ * Generated source version: 2.1
+ *
+ */
+@WebFault(name = "CreditCheckInvalid", targetNamespace = "http://www.jboss.org/overlord/examples/xsd")
+public class CreditCheckInvalid
+ extends Exception
+{
+
+ /**
+ * Java type that goes as soapenv:Fault detail element.
+ *
+ */
+ private PurchaseDetailsType faultInfo;
+
+ /**
+ *
+ * @param faultInfo
+ * @param message
+ */
+ public CreditCheckInvalid(String message, PurchaseDetailsType faultInfo) {
+ super(message);
+ this.faultInfo = faultInfo;
+ }
+
+ /**
+ *
+ * @param faultInfo
+ * @param message
+ * @param cause
+ */
+ public CreditCheckInvalid(String message, PurchaseDetailsType faultInfo, Throwable cause) {
+ super(message, cause);
+ this.faultInfo = faultInfo;
+ }
+
+ /**
+ *
+ * @return
+ * returns fault bean: org.jboss.overlord.examples.xsd.PurchaseDetailsType
+ */
+ public PurchaseDetailsType getFaultInfo() {
+ return faultInfo;
+ }
+
+}
Added: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/xsd/ObjectFactory.java
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/xsd/ObjectFactory.java (rev 0)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/xsd/ObjectFactory.java 2009-08-14 09:27:54 UTC (rev 750)
@@ -0,0 +1,53 @@
+
+package org.jboss.overlord.examples.xsd;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlElementDecl;
+import javax.xml.bind.annotation.XmlRegistry;
+import javax.xml.namespace.QName;
+
+
+/**
+ * This object contains factory methods for each
+ * Java content interface and Java element interface
+ * generated in the org.jboss.overlord.examples.xsd package.
+ * <p>An ObjectFactory allows you to programatically
+ * construct new instances of the Java representation
+ * for XML content. The Java representation of XML
+ * content can consist of schema derived interfaces
+ * and classes representing the binding of schema
+ * type definitions, element declarations and model
+ * groups. Factory methods for each of these are
+ * provided in this class.
+ *
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+ private final static QName _CreditCheckInvalid_QNAME = new QName("http://www.jboss.org/overlord/examples/xsd", "CreditCheckInvalid");
+
+ /**
+ * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.overlord.examples.xsd
+ *
+ */
+ public ObjectFactory() {
+ }
+
+ /**
+ * Create an instance of {@link PurchaseDetailsType }
+ *
+ */
+ public PurchaseDetailsType createPurchaseDetailsType() {
+ return new PurchaseDetailsType();
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link PurchaseDetailsType }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://www.jboss.org/overlord/examples/xsd", name = "CreditCheckInvalid")
+ public JAXBElement<PurchaseDetailsType> createCreditCheckInvalid(PurchaseDetailsType value) {
+ return new JAXBElement<PurchaseDetailsType>(_CreditCheckInvalid_QNAME, PurchaseDetailsType.class, null, value);
+ }
+
+}
Added: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/xsd/PurchaseDetailsType.java
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/xsd/PurchaseDetailsType.java (rev 0)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/xsd/PurchaseDetailsType.java 2009-08-14 09:27:54 UTC (rev 750)
@@ -0,0 +1,99 @@
+
+package org.jboss.overlord.examples.xsd;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for PurchaseDetailsType complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="PurchaseDetailsType">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="account" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ * <element name="amount" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ * </sequence>
+ * <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}int" />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "PurchaseDetailsType", propOrder = {
+ "account",
+ "amount"
+})
+public class PurchaseDetailsType {
+
+ protected int account;
+ protected int amount;
+ @XmlAttribute
+ protected Integer id;
+
+ /**
+ * Gets the value of the account property.
+ *
+ */
+ public int getAccount() {
+ return account;
+ }
+
+ /**
+ * Sets the value of the account property.
+ *
+ */
+ public void setAccount(int value) {
+ this.account = value;
+ }
+
+ /**
+ * Gets the value of the amount property.
+ *
+ */
+ public int getAmount() {
+ return amount;
+ }
+
+ /**
+ * Sets the value of the amount property.
+ *
+ */
+ public void setAmount(int value) {
+ this.amount = value;
+ }
+
+ /**
+ * Gets the value of the id property.
+ *
+ * @return
+ * possible object is
+ * {@link Integer }
+ *
+ */
+ public Integer getId() {
+ return id;
+ }
+
+ /**
+ * Sets the value of the id property.
+ *
+ * @param value
+ * allowed object is
+ * {@link Integer }
+ *
+ */
+ public void setId(Integer value) {
+ this.id = value;
+ }
+
+}
Added: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/xsd/package-info.java
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/xsd/package-info.java (rev 0)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/overlord/examples/xsd/package-info.java 2009-08-14 09:27:54 UTC (rev 750)
@@ -0,0 +1,2 @@
+(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://www.jboss.org/overlord/examples/xsd", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package org.jboss.overlord.examples.xsd;
Modified: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/jboss-esb.xml
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/jboss-esb.xml 2009-08-07 13:35:46 UTC (rev 749)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/jboss-esb.xml 2009-08-14 09:27:54 UTC (rev 750)
@@ -41,11 +41,11 @@
<property name="operation" value="checkCredit"/>
<property name="messageType" value="CreditCheckRequest"/>
<property name="clientRole" value="Store" />
- <property name="eprStore" value="com.acme.services.creditAgency.MemoryEPRStorage" />
+ <property name="eprStore" value="org.jboss.overlord.examples.creditAgency.MemoryEPRStorage" />
</action>
<action name="c3" process="process" class="org.jboss.savara.jbossesb.actions.IfAction">
<property name="paths">
- <if service-category="org.pi4soa.purchase.purchasegoods" service-name="PurchaseGoodsProcess_CreditAgency__2" decision-class="com.acme.services.creditAgency.CreditAgencyDecision"/>
+ <if service-category="org.pi4soa.purchase.purchasegoods" service-name="PurchaseGoodsProcess_CreditAgency__2" decision-class="org.jboss.overlord.examples.creditAgency.CreditAgencyDecision"/>
<else service-category="org.pi4soa.purchase.purchasegoods" service-name="PurchaseGoodsProcess_CreditAgency__3"/>
</property>
</action>
@@ -56,13 +56,13 @@
<jms-listener busidref="busId3" maxThreads="1" name="esb-stateless-creditAgency2"/>
</listeners>
<actions mep="OneWay">
- <action name="custom-1" process="process" class="com.acme.services.creditAgency.SetCreditCheckResponseMessageAction">
+ <action name="custom-1" process="process" class="org.jboss.overlord.examples.creditAgency.SetCreditCheckResponseMessageAction">
</action>
<action name="c4" process="process" class="org.jboss.savara.jbossesb.actions.SendMessageAction">
<property name="operation" value="checkCredit"/>
<property name="messageType" value="CreditCheckOk"/>
<property name="clientRole" value="Store"/>
- <property name="eprStore" value="com.acme.services.creditAgency.MemoryEPRStorage" />
+ <property name="eprStore" value="org.jboss.overlord.examples.creditAgency.MemoryEPRStorage" />
</action>
</actions>
</service>
@@ -71,13 +71,13 @@
<jms-listener busidref="busId4" maxThreads="1" name="esb-stateless-creditAgency3"/>
</listeners>
<actions mep="OneWay">
- <action name="custom-2" process="process" class="com.acme.services.creditAgency.SetCreditCheckInvalidMessageAction">
+ <action name="custom-2" process="process" class="org.jboss.overlord.examples.creditAgency.SetCreditCheckInvalidMessageAction">
</action>
<action name="c5" process="process" class="org.jboss.savara.jbossesb.actions.SendMessageAction">
<property name="operation" value="checkCredit"/>
<property name="messageType" value="CreditCheckInvalid"/>
<property name="clientRole" value="Store"/>
- <property name="eprStore" value="com.acme.services.creditAgency.MemoryEPRStorage" />
+ <property name="eprStore" value="org.jboss.overlord.examples.creditAgency.MemoryEPRStorage" />
</action>
</actions>
</service>
Added: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/webapp/WEB-INF/web.xml
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/webapp/WEB-INF/web.xml (rev 0)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/webapp/WEB-INF/web.xml 2009-08-14 09:27:54 UTC (rev 750)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4">
+
+ <servlet>
+ <servlet-name>CreditAgencyService</servlet-name>
+ <servlet-class>org.jboss.overlord.examples.wsdl.CreditAgencyService</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>CreditAgencyService</servlet-name>
+ <url-pattern>/CreditAgencyService</url-pattern>
+ </servlet-mapping>
+
+</web-app>
\ No newline at end of file
Modified: cdl/trunk/samples/pom.xml
===================================================================
--- cdl/trunk/samples/pom.xml 2009-08-07 13:35:46 UTC (rev 749)
+++ cdl/trunk/samples/pom.xml 2009-08-14 09:27:54 UTC (rev 750)
@@ -14,42 +14,49 @@
<version>1.0-SNAPSHOT</version>
</parent>
- <properties>
- <deploy.dir>/var/local/jboss-4.2.2.GA/server/default/deploy</deploy.dir>
- <cdl.jbossesb.version>1.0-SNAPSHOT</cdl.jbossesb.version>
- </properties>
-
-
<modules>
- <module>jbossesb/purchasing/store</module>
<module>jbossesb/common/creditAgency</module>
- <module>jbossesb/brokerage/broker</module>
- <module>jbossesb/brokerage/supplier</module>
</modules>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jboss-packaging-maven-plugin</artifactId>
- <version>2.0-20080130.110241-9</version>
- <extensions>true</extensions>
- </plugin>
- </plugins>
- </build>
+ <properties>
+ <jaxb.version>2.1</jaxb.version>
+ <savara.version>1.0-SNAPSHOT</savara.version>
+ </properties>
- <pluginRepositories>
- <pluginRepository>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots/>
- <id>jboss-plugin-snapshots</id>
- <name>JBoss Snapshot Plugin Repository</name>
- <url>http://snapshots.repository.codehaus.org</url>
- </pluginRepository>
- </pluginRepositories>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.savara.runtime</groupId>
+ <artifactId>jbossesb</artifactId>
+ <version>${savara.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>sun-jaxws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <version>2.1.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>sun-jaxws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ <version>2.1.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
-
</project>
14 years, 8 months
- 1
- 0