Overlord SVN: r869 - in bpm-console/trunk: gui/war/src/main/java/org/jboss/bpm/console/client/model and 3 other directories.
by overlord-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-10-30 10:43:24 -0400 (Fri, 30 Oct 2009)
New Revision: 869
Added:
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/model/JSOModel.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/model/JSOParser.java
Modified:
bpm-console/trunk/BPMC.iws
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateDefinitionsAction.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateInstancesAction.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/UpdateReportConfigAction.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/search/UpdateSearchDefinitionsAction.java
Log:
Replace JSOParser with overlay times to improve performance
Modified: bpm-console/trunk/BPMC.iws
===================================================================
--- bpm-console/trunk/BPMC.iws 2009-10-30 12:57:18 UTC (rev 868)
+++ bpm-console/trunk/BPMC.iws 2009-10-30 14:43:24 UTC (rev 869)
@@ -131,6 +131,19 @@
<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/model/JSOParser.java" line="82" class="org.jboss.bpm.console.client.model.JSOParser" package="org.jboss.bpm.console.client.model">
+ <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>
@@ -204,38 +217,104 @@
<component name="FileColors" enabled="false" enabledForTabs="false" />
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="RenderReportAction.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java">
+ <file leaf-file-name="ReportView.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="113" column="48" selection-start="4124" selection-end="4124" vertical-scroll-proportion="0.6233933">
+ <state line="100" column="21" selection-start="3132" selection-end="3132" vertical-scroll-proportion="0.8136247">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="BirtService.java" pinned="false" current="true" current-in-tab="true">
- <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm/report/BirtService.java">
+ <file leaf-file-name="ReportLaunchPadView.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportLaunchPadView.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="120" column="74" selection-start="3792" selection-end="3792" vertical-scroll-proportion="0.79948586">
+ <state line="95" column="71" selection-start="3790" selection-end="3790" vertical-scroll-proportion="0.5385604">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="DTOParser.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="195" column="20" selection-start="4849" selection-end="6223" vertical-scroll-proportion="0.93830335">
<folding>
+ <element signature="method#parseTaskReferenceList#0;class#DTOParser#0" expanded="false" />
+ <element signature="method#parseTaskReference#0;class#DTOParser#0" expanded="false" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="UpdateSearchDefinitionsAction.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/search/UpdateSearchDefinitionsAction.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="67" column="4" selection-start="2390" selection-end="2390" vertical-scroll-proportion="0.69922876">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="JSOParser.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/model/JSOParser.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="82" column="0" selection-start="2829" selection-end="2829" vertical-scroll-proportion="0.4552333">
+ <folding>
<element signature="imports" expanded="true" />
- <element signature="method#create#0;class#BirtService#0" expanded="false" />
- <element signature="method#loadReports#0;class#BirtService#0" expanded="false" />
- <element signature="method#extractParameterMetaData#0;class#BirtService#0" expanded="false" />
+ <element signature="method#parseProcessDefinition#0;class#JSOParser#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="ReportReference.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main/java/org/jboss/bpm/report/model/ReportReference.java">
+ <file leaf-file-name="UpdateInstanceDataAction.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateInstanceDataAction.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="82" column="66" selection-start="2160" selection-end="2160" vertical-scroll-proportion="0.69922876">
+ <state line="35" column="13" selection-start="1532" selection-end="1532" vertical-scroll-proportion="0.16452442">
<folding />
</state>
</provider>
</entry>
</file>
+ <file leaf-file-name="UpdateInstancesAction.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateInstancesAction.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="57" column="46" selection-start="2304" selection-end="2304" vertical-scroll-proportion="0.38303342">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="JSOModel.java" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/model/JSOModel.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="131" column="8" selection-start="3898" selection-end="3898" vertical-scroll-proportion="0.6368222">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="AbstractRESTAction.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="94" column="0" selection-start="3609" selection-end="3609" vertical-scroll-proportion="1.0758355">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="Request.class" pinned="false" current="false" current-in-tab="false">
+ <entry file="jar:///Users/hbraun/.m2/repository/com/google/gwt/gwt-user/1.5.3/gwt-user-1.5.3.jar!/com/google/gwt/http/client/Request.class">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="26" column="0" selection-start="1293" selection-end="1293" vertical-scroll-proportion="0.5141388">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
</leaf>
</component>
<component name="FindManager">
@@ -1094,7 +1173,7 @@
<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/client/report" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/process" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -1124,6 +1203,106 @@
<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_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client" />
+ <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/client/model" />
+ <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_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client" />
+ <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/client/common" />
+ <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>
@@ -1194,7 +1373,7 @@
</key>
</component>
<component name="RestoreUpdateTree" />
- <component name="RunManager" selected="Remote.server">
+ <component name="RunManager" selected="Remote.GWT">
<configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
<option name="MAIN_CLASS_NAME" />
<option name="VM_PARAMETERS" />
@@ -1424,16 +1603,16 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="342" y="38" width="1273" height="940" extended-state="0" />
+ <frame x="311" y="54" width="1273" height="940" 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="14" />
<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.3398693" order="0" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3398693" order="0" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.38434163" order="1" />
- <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.22303921" order="1" />
+ <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22303921" order="1" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32992035" order="9" />
<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="7" />
@@ -1540,118 +1719,120 @@
<option name="myLastEditedConfigurable" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/resources/jmaki/xhp/xhp.json">
+ <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm/report/BirtService.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="14" column="24" selection-start="350" selection-end="350" vertical-scroll-proportion="0.4869565">
- <folding />
+ <state line="53" column="69" selection-start="2025" selection-end="2025" vertical-scroll-proportion="0.32647815">
+ <folding>
+ <element signature="imports" expanded="true" />
+ <element signature="method#create#0;class#BirtService#0" expanded="false" />
+ <element signature="method#loadReports#0;class#BirtService#0" expanded="false" />
+ <element signature="method#extractParameterMetaData#0;class#BirtService#0" expanded="false" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/jmaki/xhp/HttpClient.java">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/UpdateReportConfigAction.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="279" column="25" selection-start="8210" selection-end="8210" vertical-scroll-proportion="0.44044945">
+ <state line="75" column="12" selection-start="2729" selection-end="2729" vertical-scroll-proportion="0.8184111">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportParamCallback.java">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateDefinitionsAction.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="30" column="7" selection-start="1202" selection-end="1202" vertical-scroll-proportion="0.3478261">
+ <state line="43" column="42" selection-start="1828" selection-end="1828" vertical-scroll-proportion="0.28791773">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/search/UpdateSearchDefinitionsAction.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="50" column="36" selection-start="1855" selection-end="1875" vertical-scroll-proportion="0.020565553">
+ <state line="67" column="4" selection-start="2390" selection-end="2390" vertical-scroll-proportion="0.69922876">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="84" column="46" selection-start="2829" selection-end="2829" vertical-scroll-proportion="0.41488022">
- <folding />
+ <state line="195" column="20" selection-start="4849" selection-end="6223" vertical-scroll-proportion="0.93830335">
+ <folding>
+ <element signature="method#parseTaskReferenceList#0;class#DTOParser#0" expanded="false" />
+ <element signature="method#parseTaskReference#0;class#DTOParser#0" expanded="false" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm/report/RenderMetaData.java">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportLaunchPadView.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="99" column="26" selection-start="2551" selection-end="2551" vertical-scroll-proportion="1.3803132">
+ <state line="95" column="71" selection-start="3790" selection-end="3790" vertical-scroll-proportion="0.5385604">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportLaunchPadView.java">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="154" column="18" selection-start="5870" selection-end="5870" vertical-scroll-proportion="1.0961969">
+ <state line="100" column="21" selection-start="3132" selection-end="3132" vertical-scroll-proportion="0.8136247">
<folding />
</state>
</provider>
</entry>
- <entry file="jar:///Users/hbraun/.m2/repository/org/jboss/resteasy/jaxrs-api/1.0.2.GA/jaxrs-api-1.0.2.GA.jar!/javax/ws/rs/core/Response.class">
+ <entry file="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/util/JSONWalk.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="95" column="27" selection-start="4790" selection-end="4790" vertical-scroll-proportion="0.33290488">
+ <state line="152" column="16" selection-start="3681" selection-end="3681" vertical-scroll-proportion="0.6771753">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java">
+ <entry file="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/util/SimpleDateFormat.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="183" column="21" selection-start="5799" selection-end="5799" vertical-scroll-proportion="0.57941836">
+ <state line="23" column="13" selection-start="854" selection-end="854" vertical-scroll-proportion="0.12105927">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderDispatchEvent.java">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateInstanceDataAction.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="47" column="42" selection-start="1506" selection-end="1506" vertical-scroll-proportion="0.9350649">
+ <state line="35" column="13" selection-start="1532" selection-end="1532" vertical-scroll-proportion="0.16452442">
<folding />
</state>
</provider>
</entry>
- <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm/report/ReportFacade.java">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateInstancesAction.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="173" column="0" selection-start="5270" selection-end="5270" vertical-scroll-proportion="0.33333334">
- <folding>
- <element signature="method#initBirtService#0;class#ReportFacade#0" expanded="false" />
- <element signature="method#getImage#0;class#ReportFacade#0" expanded="false" />
- <element signature="method#defaultRenderMetaData#0;class#ReportFacade#0" expanded="false" />
- <element signature="method#buildImageUrl#0;class#ReportFacade#0" expanded="false" />
- <element signature="class#BirtInitException#0;class#ReportFacade#0" expanded="false" />
- </folding>
+ <state line="57" column="46" selection-start="2304" selection-end="2304" vertical-scroll-proportion="0.38303342">
+ <folding />
</state>
</provider>
</entry>
- <entry file="jar:///Users/hbraun/.m2/repository/org/jboss/resteasy/resteasy-jaxrs/1.0.2.GA/resteasy-jaxrs-1.0.2.GA.jar!/org/jboss/resteasy/core/MethodInjectorImpl.class">
+ <entry file="jar:///Users/hbraun/.m2/repository/com/google/gwt/gwt-user/1.5.3/gwt-user-1.5.3.jar!/com/google/gwt/http/client/Request.class">
<provider selected="true" editor-type-id="text-editor">
- <state line="18" column="0" selection-start="1001" selection-end="1001" vertical-scroll-proportion="0.60850114">
+ <state line="26" column="0" selection-start="1293" selection-end="1293" vertical-scroll-proportion="0.5141388">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java">
+ <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="113" column="48" selection-start="4124" selection-end="4124" vertical-scroll-proportion="0.6233933">
+ <state line="94" column="0" selection-start="3609" selection-end="3609" vertical-scroll-proportion="1.0758355">
<folding />
</state>
</provider>
</entry>
- <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main/java/org/jboss/bpm/report/model/ReportReference.java">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/model/JSOParser.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="82" column="66" selection-start="2160" selection-end="2160" vertical-scroll-proportion="0.69922876">
- <folding />
+ <state line="82" column="0" selection-start="2829" selection-end="2829" vertical-scroll-proportion="0.4552333">
+ <folding>
+ <element signature="imports" expanded="true" />
+ <element signature="method#parseProcessDefinition#0;class#JSOParser#0" expanded="false" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm/report/BirtService.java">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/model/JSOModel.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="120" column="74" selection-start="3792" selection-end="3792" vertical-scroll-proportion="0.79948586">
+ <state line="131" column="8" selection-start="3898" selection-end="3898" vertical-scroll-proportion="0.6368222">
<folding>
<element signature="imports" expanded="true" />
- <element signature="method#create#0;class#BirtService#0" expanded="false" />
- <element signature="method#loadReports#0;class#BirtService#0" expanded="false" />
- <element signature="method#extractParameterMetaData#0;class#BirtService#0" expanded="false" />
</folding>
</state>
</provider>
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java 2009-10-30 12:57:18 UTC (rev 868)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java 2009-10-30 14:43:24 UTC (rev 869)
@@ -35,58 +35,7 @@
* @author Heiko.Braun <heiko.braun(a)jboss.com>
*/
public class DTOParser
-{
- public static List<ProcessDefinitionRef> parseProcessDefinitions(JSONValue jso)
- {
- List<ProcessDefinitionRef> results = new ArrayList<ProcessDefinitionRef>();
-
- JSONArray arr = JSONWalk.on(jso).next("definitions").asArray();
- for(int i=0; i<arr.size(); i++)
- {
- results.add(parseProcessDefinition(arr.get(i)));
- }
- return results;
- }
-
- public static ProcessDefinitionRef parseProcessDefinition(JSONValue root)
- {
- ConsoleLog.debug("parse " + root);
-
- String id = JSONWalk.on(root).next("id").asString();
- Long version = JSONWalk.on(root).next("version").asLong();
- String name = JSONWalk.on(root).next("name").asString();
- boolean isSuspended = JSONWalk.on(root).next("suspended").asBool();
-
- JSONWalk.JSONWrapper dplIdJson = JSONWalk.on(root).next("deploymentId");
- String dplId = dplIdJson!=null ? dplIdJson.asString() : null;
-
- ProcessDefinitionRef ref = new ProcessDefinitionRef(id, name, version);
- ref.setDeploymentId(dplId);
- ref.setSuspended(isSuspended);
-
- JSONWalk.JSONWrapper pkg = JSONWalk.on(root).next("packageName");
- if(pkg !=null)
- ref.setPackageName(pkg.asString());
-
- // optional start form url
- JSONWalk.JSONWrapper formUrl = JSONWalk.on(root).next("formUrl");
- if(formUrl !=null)
- ref.setFormUrl(formUrl.asString());
-
- // optional diagram url
- JSONWalk.JSONWrapper diagramUrl = JSONWalk.on(root).next("diagramUrl");
- if(diagramUrl !=null)
- ref.setDiagramUrl(diagramUrl.asString());
-
- return ref;
- }
-
- public static ProcessDefinitionRef parseProcessDefinition(String json)
- {
- JSONValue root = JSONParser.parse(json);
- return parseProcessDefinition(root);
- }
-
+{
public static List<TaskRef> parseTaskReferenceList(String json)
{
List<TaskRef> results = new ArrayList<TaskRef>();
Added: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/model/JSOModel.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/model/JSOModel.java (rev 0)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/model/JSOModel.java 2009-10-30 14:43:24 UTC (rev 869)
@@ -0,0 +1,151 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY 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 along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.console.client.model;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.Date;
+
+import com.google.gwt.core.client.JavaScriptObject;
+import com.google.gwt.core.client.JsArray;
+import com.google.gwt.core.client.JsArrayString;
+import org.jboss.bpm.console.client.util.SimpleDateFormat;
+
+/**
+ * Java overlay of a JavaScriptObject.
+ * Borrowed from Matt Raible:
+ * http://raibledesigns.com/rd/entry/json_parsing_with_javascript_overlay
+ */
+public abstract class JSOModel extends JavaScriptObject {
+
+ // Overlay types always have protected, zero-arg constructors
+ protected JSOModel() {
+ }
+
+ /**
+ * Create an empty instance.
+ *
+ * @return new Object
+ */
+ public static native JSOModel create() /*-{
+ return new Object();
+ }-*/;
+
+ /**
+ * Convert a JSON encoded string into a JSOModel instance.
+ * <p/>
+ * Expects a JSON string structured like '{"foo":"bar","number":123}'
+ *
+ * @return a populated JSOModel object
+ */
+ public static native JSOModel fromJson(String jsonString) /*-{
+ return eval('(' + jsonString + ')');
+ }-*/;
+
+ /**
+ * Convert a JSON encoded string into an array of JSOModel instance.
+ * <p/>
+ * Expects a JSON string structured like '[{"foo":"bar","number":123}, {...}]'
+ *
+ * @return a populated JsArray
+ */
+ public static native JsArray<JSOModel> arrayFromJson(String jsonString) /*-{
+ return eval('(' + jsonString + ')');
+ }-*/;
+
+ public final native boolean hasKey(String key) /*-{
+ return this[key] != undefined;
+ }-*/;
+
+ public final native JsArrayString keys() /*-{
+ var a = new Array();
+ for (var p in this) { a.push(p); }
+ return a;
+ }-*/;
+
+ @Deprecated
+ public final Set<String> keySet() {
+ JsArrayString array = keys();
+ Set<String> set = new HashSet<String>();
+ for (int i = 0; i < array.length(); i++) {
+ set.add(array.get(i));
+ }
+ return set;
+ }
+
+ public final native String get(String key) /*-{
+ return "" + this[key];
+ }-*/;
+
+ public final native String get(String key, String defaultValue) /*-{
+ return this[key] ? ("" + this[key]) : defaultValue;
+ }-*/;
+
+ public final native void set(String key, String value) /*-{
+ this[key] = value;
+ }-*/;
+
+ public final int getInt(String key) {
+ return Integer.parseInt(get(key));
+ }
+
+ public final boolean getBoolean(String key) {
+ return Boolean.parseBoolean(get(key));
+ }
+
+ public final native JSOModel getObject(String key) /*-{
+ return this[key];
+ }-*/;
+
+ public final native JsArray<JSOModel> getArray(String key) /*-{
+ return this[key] ? this[key] : new Array();
+ }-*/;
+
+ public final long getLong(String key)
+ {
+ return Long.valueOf(get(key));
+ }
+
+ public final Date getDate(String key)
+ {
+ Date result = null;
+ String value = get(key);
+ if(!isNull(value))
+ {
+ SimpleDateFormat df = new SimpleDateFormat();
+ result = df.parse(value);
+ }
+
+ return result;
+ }
+
+ public final Date getDate(String key, Date fallback)
+ {
+ Date date = getDate(key);
+ return date != null ? date : fallback;
+ }
+
+ private final boolean isNull(String val)
+ {
+ return (val != null && "null".equals(val) || "undefined".equals(val));
+ }
+}
Added: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/model/JSOParser.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/model/JSOParser.java (rev 0)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/model/JSOParser.java 2009-10-30 14:43:24 UTC (rev 869)
@@ -0,0 +1,103 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY 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 along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.console.client.model;
+
+import com.google.gwt.core.client.JsArray;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class JSOParser
+{
+ public static List<ProcessDefinitionRef> parseProcessDefinitions(String json)
+ {
+ List<ProcessDefinitionRef> results = new ArrayList<ProcessDefinitionRef>();
+ JSOModel rootModel = JSOModel.fromJson(json);
+
+ JsArray<JSOModel> definitions = rootModel.getArray("definitions");
+ for(int i=0; i<definitions.length(); i++)
+ {
+ JSOModel def = definitions.get(i);
+ results.add(parseProcessDefinition(def));
+ }
+
+ return results;
+ }
+
+ public static ProcessDefinitionRef parseProcessDefinition(JSOModel rootModel)
+ {
+ ProcessDefinitionRef def = new ProcessDefinitionRef();
+
+ def.setId(rootModel.get("id"));
+ def.setName(rootModel.get("name"));
+ def.setVersion(rootModel.getLong("version"));
+ def.setKey(rootModel.get("key"));
+ def.setDeploymentId(rootModel.get("deploymentId"));
+ def.setSuspended(rootModel.getBoolean("suspended"));
+
+ return def;
+ }
+
+ public static List<ProcessInstanceRef> parseProcessInstances(String json)
+ {
+ System.out.println(json);
+ List<ProcessInstanceRef> results = new ArrayList<ProcessInstanceRef>();
+ JSOModel rootModel = JSOModel.fromJson(json);
+
+ JsArray<JSOModel> instances = rootModel.getArray("instances");
+ for(int i=0; i<instances.length(); i++)
+ {
+ results.add(parseProcessInstance(instances.get(i)));
+ }
+ return results;
+ }
+
+ public static ProcessInstanceRef parseProcessInstance(JSOModel root)
+ {
+ String id = root.get("id");
+ String definitionId = root.get("definitionId");
+ Date start = root.getDate("startDate");
+ Date end = root.getDate("endDate", null);
+ boolean suspended = root.getBoolean("suspended");
+
+ ProcessInstanceRef processInstance = new ProcessInstanceRef(
+ id, definitionId,
+ start, end,
+ suspended
+ );
+
+ // tokens
+ /*JSONWalk.JSONWrapper rootTokenJSON = JSONWalk.on(root).next("rootToken");
+ if (rootTokenJSON != null) {
+ JSONObject tokJso = rootTokenJSON.asObject();
+
+ TokenReference rootToken = parseTokenReference(tokJso);
+ processInstance.setRootToken(rootToken);
+ } */
+
+ return processInstance;
+ }
+}
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateDefinitionsAction.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateDefinitionsAction.java 2009-10-30 12:57:18 UTC (rev 868)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateDefinitionsAction.java 2009-10-30 14:43:24 UTC (rev 869)
@@ -23,13 +23,10 @@
import com.google.gwt.http.client.RequestBuilder;
import com.google.gwt.http.client.Response;
-import com.google.gwt.json.client.JSONParser;
-import com.google.gwt.json.client.JSONValue;
import com.mvc4g.client.Controller;
-import org.jboss.bpm.console.client.ApplicationContext;
import org.jboss.bpm.console.client.URLBuilder;
import org.jboss.bpm.console.client.common.AbstractRESTAction;
-import org.jboss.bpm.console.client.model.DTOParser;
+import org.jboss.bpm.console.client.model.JSOParser;
import org.jboss.bpm.console.client.model.ProcessDefinitionRef;
import org.jboss.bpm.console.client.util.ConsoleLog;
@@ -67,11 +64,10 @@
DefinitionListView view = (DefinitionListView) controller.getView(DefinitionListView.ID);
if(view!=null) // may not be initialized (lazy)
{
- JSONValue json = JSONParser.parse(response.getText());
- List<ProcessDefinitionRef> definitions = DTOParser.parseProcessDefinitions(json);
-
+ //JSONValue json = JSONParser.parse(response.getText());
+ List<ProcessDefinitionRef> definitions =
+ JSOParser.parseProcessDefinitions(response.getText());
view.update(definitions);
-
ConsoleLog.info("Loaded " + definitions.size() + " process definitions in " +(System.currentTimeMillis()-start)+" ms");
}
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateInstancesAction.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateInstancesAction.java 2009-10-30 12:57:18 UTC (rev 868)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateInstancesAction.java 2009-10-30 14:43:24 UTC (rev 869)
@@ -32,6 +32,7 @@
import org.jboss.bpm.console.client.model.DTOParser;
import org.jboss.bpm.console.client.model.ProcessDefinitionRef;
import org.jboss.bpm.console.client.model.ProcessInstanceRef;
+import org.jboss.bpm.console.client.model.JSOParser;
import org.jboss.bpm.console.client.util.ConsoleLog;
import java.util.List;
@@ -68,9 +69,7 @@
final long start = System.currentTimeMillis();
final ProcessDefinitionRef def = (ProcessDefinitionRef)event;
- JSONValue json = JSONParser.parse(response.getText());
-
- List<ProcessInstanceRef> instances = DTOParser.parseProcessInstances(json);
+ List<ProcessInstanceRef> instances = JSOParser.parseProcessInstances(response.getText());
InstanceListView view = (InstanceListView) controller.getView(InstanceListView.ID);
view.update(def, instances);
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java 2009-10-30 12:57:18 UTC (rev 868)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java 2009-10-30 14:43:24 UTC (rev 869)
@@ -97,11 +97,8 @@
public void configure(List<ReportReference> reports)
{
- ConsoleLog.debug("Report Config: "+reports);
-
// update coverview
- coverpanel.update(reports);
-
+ coverpanel.update(reports);
deck.showWidget(1);
}
}
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/UpdateReportConfigAction.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/UpdateReportConfigAction.java 2009-10-30 12:57:18 UTC (rev 868)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/UpdateReportConfigAction.java 2009-10-30 14:43:24 UTC (rev 869)
@@ -70,8 +70,7 @@
public void handleSuccessfulResponse(
final Controller controller, final Object event, Response response)
{
- String json = response.getText();
- System.out.println(json);
+ String json = response.getText();
List<ReportReference> reports = DTOParser.parseReportConfig(json);
ReportView view = (ReportView)controller.getView(ReportView.ID);
view.configure(reports);
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/search/UpdateSearchDefinitionsAction.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/search/UpdateSearchDefinitionsAction.java 2009-10-30 12:57:18 UTC (rev 868)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/search/UpdateSearchDefinitionsAction.java 2009-10-30 14:43:24 UTC (rev 869)
@@ -31,6 +31,7 @@
import org.jboss.bpm.console.client.common.AbstractRESTAction;
import org.jboss.bpm.console.client.model.DTOParser;
import org.jboss.bpm.console.client.model.ProcessDefinitionRef;
+import org.jboss.bpm.console.client.model.JSOParser;
import org.jboss.bpm.console.client.util.ConsoleLog;
import java.util.List;
@@ -63,10 +64,8 @@
public void handleSuccessfulResponse(final Controller controller, final Object event, Response response)
{
String target = (String)event;
-
- JSONValue json = JSONParser.parse(response.getText());
- List<ProcessDefinitionRef> definitions = DTOParser.parseProcessDefinitions(json);
+ List<ProcessDefinitionRef> definitions = JSOParser.parseProcessDefinitions(response.getText());
SearchDefinitionView view = (SearchDefinitionView)controller.getView(target);
view.update(definitions);
14 years, 6 months
- 1
- 0
Overlord SVN: r868 - in report-server/trunk: core/src/main/java/org/jboss/bpm/report/util and 1 other directories.
by overlord-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-10-30 08:57:18 -0400 (Fri, 30 Oct 2009)
New Revision: 868
Modified:
report-server/trunk/core/src/main/java/org/jboss/bpm/report/BirtService.java
report-server/trunk/core/src/main/java/org/jboss/bpm/report/RenderMetaData.java
report-server/trunk/core/src/main/java/org/jboss/bpm/report/ReportFacade.java
report-server/trunk/core/src/main/java/org/jboss/bpm/report/util/BirtUtil.java
report-server/trunk/shared/src/main/java/org/jboss/bpm/report/model/ReportParameter.java
report-server/trunk/shared/src/main/java/org/jboss/bpm/report/model/ReportReference.java
Log:
Split render and view report operations
Modified: report-server/trunk/core/src/main/java/org/jboss/bpm/report/BirtService.java
===================================================================
--- report-server/trunk/core/src/main/java/org/jboss/bpm/report/BirtService.java 2009-10-30 12:55:48 UTC (rev 867)
+++ report-server/trunk/core/src/main/java/org/jboss/bpm/report/BirtService.java 2009-10-30 12:57:18 UTC (rev 868)
@@ -25,13 +25,14 @@
import org.apache.commons.logging.LogFactory;
import org.eclipse.birt.core.framework.Platform;
import org.eclipse.birt.report.engine.api.*;
+import org.jboss.bpm.report.model.ReportParameter;
import org.jboss.bpm.report.model.ReportReference;
-import org.jboss.bpm.report.model.ReportParameter;
import org.jboss.bpm.report.util.BirtUtil;
import java.io.File;
import java.io.FilenameFilter;
import java.io.Serializable;
+import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
@@ -71,28 +72,34 @@
/* blocking call*/
public void create()
{
- this.engine = BirtEngineFactory.newInstance(iConfig);
+ if(currentState!=State.NONE)
+ throw new IllegalStateException("Service already in state " + currentState);
- // parse template config
- File workDir = new File(iConfig.getReportDir());
- if(!workDir.exists())
- throw new IllegalStateException("Working directory "+iConfig.getReportDir()+" cannot be found!");
+ synchronized(reports)
+ {
+ this.engine = BirtEngineFactory.newInstance(iConfig);
- try
- {
- loadReportNames();
- extractParameterNames();
+ // parse template config
+ File workDir = new File(iConfig.getReportDir());
+ if(!workDir.exists())
+ throw new IllegalStateException("Working directory "+iConfig.getReportDir()+" cannot be found!");
+
+ try
+ {
+ loadReports();
+ extractParameterMetaData();
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException("Failed to load reports", e);
+ }
+
+ log.info("Service created: " +this.engine);
+ currentState = State.CREATED;
}
- catch (Exception e)
- {
- throw new RuntimeException("Failed to parse config", e);
- }
-
- log.info("Service created: " +this.engine);
- currentState = State.CREATED;
}
- private void loadReportNames()
+ private void loadReports()
{
File workDir = new File(iConfig.getReportDir());
assert workDir.isDirectory();
@@ -113,7 +120,7 @@
}
}
- private void extractParameterNames() throws EngineException
+ private void extractParameterMetaData() throws EngineException
{
Iterator<String> templateNames = reports.keySet().iterator();
while(templateNames.hasNext())
@@ -178,6 +185,8 @@
paramRef.setPromptText((String)map.get("Prompt Text"));
ref.getParameterMetaData().add(paramRef);
}
+
+ task.close();
}
}
@@ -203,6 +212,7 @@
}
);
+ t.setName("BirtService-Init");
t.start();
}
@@ -231,6 +241,89 @@
currentState = State.DESTROYED;
}
+ public String render(RenderMetaData metaData)
+ {
+ if( (currentState==State.CREATED || currentState==State.STARTED) == false)
+ throw new IllegalStateException("Cannot render in state " + currentState);
+
+ if(!reports.keySet().contains(metaData.getReportName()))
+ throw new IllegalArgumentException("No such report template: "+metaData.getReportName());
+
+ String outputFileName = null;
+
+ log.debug("Render " + metaData);
+
+ IRunTask task = null;
+
+ try
+ {
+ //Open a (cached) report design
+ IReportRunnable design = openCached(metaData.getReportName());
+
+ //Create runRenderTask to run and render the report,
+ task = engine.createRunTask(design);
+
+ // outputfilename
+ outputFileName = metaData.getReportName()+".rptdocument";
+
+ //Set parent classloader for engine
+ task.getAppContext().put(EngineConstants.APPCONTEXT_CLASSLOADER_KEY, metaData.getClassloader());
+ task.setParameterValues(unmarshalParameters(metaData));
+ task.run(iConfig.getOutputDir()+outputFileName);
+
+ }
+ catch (EngineException e)
+ {
+ throw new RuntimeException("Failed to render report: "+e.getMessage(), e);
+ }
+ finally
+ {
+ if(task!=null)
+ task.close();
+ }
+
+ return outputFileName;
+ }
+
+ private Map<String,Object> unmarshalParameters(RenderMetaData metaData)
+ {
+ Map<String, Object> results = new HashMap<String,Object>();
+ for(String paramName : metaData.getParameters().keySet())
+ {
+ try
+ {
+ ReportReference reportRef = reports.get(metaData.getReportName());
+ ReportParameter reportParam = reportRef.getParameter(paramName);
+ if(null==paramName)
+ throw new IllegalArgumentException("No such param "+paramName);
+
+ String paramValue = metaData.getParameters().get(paramName);
+
+ switch(reportParam.getDataType())
+ {
+ case DATETIME:
+ results.put(paramName,
+ new java.sql.Date(new SimpleDateFormat("yyyy-MM-dd").parse(paramValue).getTime()
+ ));
+ break;
+ case NUMBER:
+ results.put(paramName, Long.valueOf(paramValue));
+ break;
+ case BOOLEAN:
+ results.put(paramName, Boolean.valueOf(paramValue));
+ break;
+ default:
+ results.put(paramName, paramValue);
+ }
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException("Failed to unmarshall report parameter", e);
+ }
+ }
+ return results;
+ }
+
/**
* Render a report based on render meta data.
* this routin simply return the output filename.
@@ -242,28 +335,33 @@
* @param metaData render instruction like the template name
* @return output filename
*/
- public String render(RenderMetaData metaData)
+ public String view(RenderMetaData metaData)
{
if( (currentState==State.CREATED || currentState==State.STARTED) == false)
- throw new IllegalStateException("Cannot render in state " + currentState);
+ throw new IllegalStateException("Cannot renderTask in state " + currentState);
if(!reports.keySet().contains(metaData.getReportName()))
throw new IllegalArgumentException("No such report template: "+metaData.getReportName());
String outputFileName = null;
- log.debug("Render " + metaData);
+ log.debug("View " + metaData);
+ IRenderTask renderTask = null;
+
try
{
//Open a (cached) report design
- IReportRunnable design = openCached(metaData.getReportName());
+ IReportDocument document = engine.openReportDocument(
+ iConfig.getOutputDir()+metaData.getReportName()+".rptdocument"
+ );
- //Create runRenderTask to run and render the report,
- IRunAndRenderTask runRenderTask = engine.createRunAndRenderTask(design);
+ //Create renderTask to run and renderTask the report,
+ renderTask = engine.createRenderTask(document);
+
//Set parent classloader for engine
- runRenderTask.getAppContext().put(EngineConstants.APPCONTEXT_CLASSLOADER_KEY, metaData.getClassloader());
- runRenderTask.setParameterValues(metaData.getParameters());
+ renderTask.getAppContext().put(EngineConstants.APPCONTEXT_CLASSLOADER_KEY, metaData.getClassloader());
+ renderTask.setParameterValues(metaData.getParameters());
// ------------------
@@ -293,27 +391,32 @@
htmlOptions.setHtmlRtLFlag(false);
//Setting this to true removes html and body tags
htmlOptions.setEmbeddable(false);
- runRenderTask.setRenderOption(htmlOptions);
+ renderTask.setRenderOption(htmlOptions);
}
else if( options.getOutputFormat().equalsIgnoreCase("pdf") ){
PDFRenderOption pdfOptions = new PDFRenderOption( options );
pdfOptions.setOption( IPDFRenderOption.FIT_TO_PAGE, new Boolean(true) );
pdfOptions.setOption( IPDFRenderOption.PAGEBREAK_PAGINATION_ONLY, new Boolean(true) );
- runRenderTask.setRenderOption(pdfOptions);
+ renderTask.setRenderOption(pdfOptions);
}
// ------------------
- if(runRenderTask.getRenderOption()==null)
- runRenderTask.setRenderOption(options);
+ if(renderTask.getRenderOption()==null)
+ renderTask.setRenderOption(options);
- runRenderTask.run();
- runRenderTask.close();
+ renderTask.render();
+
}
catch (EngineException e)
{
- throw new RuntimeException("Failed to render report: "+e.getMessage(), e);
+ throw new RuntimeException("Failed to renderTask report: "+e.getMessage(), e);
}
+ finally
+ {
+ if(renderTask !=null)
+ renderTask.close();
+ }
return outputFileName;
}
Modified: report-server/trunk/core/src/main/java/org/jboss/bpm/report/RenderMetaData.java
===================================================================
--- report-server/trunk/core/src/main/java/org/jboss/bpm/report/RenderMetaData.java 2009-10-30 12:55:48 UTC (rev 867)
+++ report-server/trunk/core/src/main/java/org/jboss/bpm/report/RenderMetaData.java 2009-10-30 12:57:18 UTC (rev 868)
@@ -36,7 +36,7 @@
private ClassLoader classloader;
private String reportName;
private Format format;
- private Map parameters = new HashMap();
+ private Map<String,String> parameters = new HashMap<String,String>();
private String imageBaseUrl;
public RenderMetaData()
@@ -97,7 +97,7 @@
return "RenderMetaData {reportName="+reportName+", format="+format+"}";
}
- public Map getParameters()
+ public Map<String,String> getParameters()
{
return parameters;
}
Modified: report-server/trunk/core/src/main/java/org/jboss/bpm/report/ReportFacade.java
===================================================================
--- report-server/trunk/core/src/main/java/org/jboss/bpm/report/ReportFacade.java 2009-10-30 12:55:48 UTC (rev 867)
+++ report-server/trunk/core/src/main/java/org/jboss/bpm/report/ReportFacade.java 2009-10-30 12:57:18 UTC (rev 868)
@@ -21,25 +21,23 @@
*/
package org.jboss.bpm.report;
+import com.google.gson.GsonBuilder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.bpm.report.model.ReportReference;
import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
+import javax.ws.rs.*;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response;
+import java.io.BufferedReader;
import java.io.File;
-import java.util.Enumeration;
+import java.io.IOException;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
-import java.util.List;
+import java.util.StringTokenizer;
-import com.google.gson.GsonBuilder;
-
/**
* BIRT integration facade.<p>
*
@@ -79,7 +77,7 @@
}
public void initBirtService()
- throws BirtInitException
+ throws BirtInitException
{
if(!isInitialized)
{
@@ -105,7 +103,7 @@
iConfig.setBirtHome(defaultBirtHome);
iConfig.setOutputDir( birtOutputDir );
iConfig.setReportDir( birtDataDir );
-
+
log.info("BIRT home: " +iConfig.getBirtHome());
log.info("Output dir: " +iConfig.getOutputDir());
log.info("Report dir: " +iConfig.getReportDir());
@@ -124,52 +122,59 @@
}
}
- private String buildImageUrl(HttpServletRequest request)
- {
- StringBuffer sb = new StringBuffer();
- sb.append("http://");
- sb.append(request.getServerName()).append(":");
- sb.append(request.getServerPort());
- sb.append(request.getContextPath());
- sb.append(request.getServletPath());
- sb.append("/report/view/image");
- return sb.toString();
- }
-
@GET
- @Path("view/{fileName}")
+ @Path("render/{fileName}")
@Produces("text/html")
public Response viewReportHtml(
@PathParam("fileName")
String fileName,
- @Context HttpServletRequest
- request
+ @Context HttpServletRequest request
)
{
try
- {
- Map queryParams = convertRequestParametersToMap(request);
+ {
+ RenderMetaData renderMeta = defaultRenderMetaData(fileName, request);
- RenderMetaData renderMeta = new RenderMetaData();
- renderMeta.setReportName(fileName);
- renderMeta.setFormat(RenderMetaData.Format.HTML);
- renderMeta.setClassloader(Thread.currentThread().getContextClassLoader());
- renderMeta.setImageBaseUrl(buildImageUrl(request));
- renderMeta.getParameters().putAll(queryParams);
-
- String outputFileName = birtService.render(renderMeta);
+ String outputFileName = birtService.view(renderMeta);
String absoluteFile = birtService.getIntegrationConfig().getOutputDir() + outputFileName;
- log.info("Render " + absoluteFile);
+ log.debug("View " + absoluteFile);
File reportFile = new File(absoluteFile);
return Response.ok(reportFile).type("text/html").build();
- }
+ }
catch(Throwable e1)
{
return gracefulException(e1);
}
}
+ @POST
+ @Path("render/{fileName}")
+ @Produces("text/html")
+ public Response renderReportHtml(
+ @PathParam("fileName")
+ String fileName,
+ @Context HttpServletRequest request
+ )
+ {
+ try
+ {
+ RenderMetaData renderMeta = defaultRenderMetaData(fileName, request);
+ Map<String,String> postParams = convertRequestParametersToMap(request);
+ renderMeta.getParameters().putAll(postParams);
+
+ String outputFileName = birtService.render(renderMeta);
+ String absoluteFile = birtService.getIntegrationConfig().getOutputDir() + outputFileName;
+ log.debug("Render " + absoluteFile);
+
+ return Response.ok().type("text/html").build();
+ }
+ catch(Throwable e1)
+ {
+ return gracefulException(e1);
+ }
+ }
+
@GET
@Path("view/image/{fileName}")
public Response getImage(
@@ -186,28 +191,69 @@
throw new IllegalArgumentException("Image " +absName+" doesn't exist");
return Response.ok(imageFile).build();
}
+
+ private RenderMetaData defaultRenderMetaData(String fileName, HttpServletRequest request)
+ {
+ RenderMetaData renderMeta = new RenderMetaData();
+ renderMeta.setReportName(fileName);
+ renderMeta.setFormat(RenderMetaData.Format.HTML);
+ renderMeta.setClassloader(Thread.currentThread().getContextClassLoader());
+ renderMeta.setImageBaseUrl(buildImageUrl(request));
+ return renderMeta;
+ }
+ private String buildImageUrl(HttpServletRequest request)
+ {
+ StringBuffer sb = new StringBuffer();
+ sb.append("http://");
+ sb.append(request.getServerName()).append(":");
+ sb.append(request.getServerPort());
+ sb.append(request.getContextPath());
+ sb.append(request.getServletPath());
+ sb.append("/report/view/image");
+ return sb.toString();
+ }
+
private Response gracefulException(Throwable e)
{
- log.error(e);
+ log.error("Error processing report", e);
StringBuffer sb = new StringBuffer();
sb.append("<div style='font-family:sans-serif; padding:10px;'>");
sb.append("<h3>Unable to process report").append("</h3>");
sb.append(e.getMessage());
sb.append("</div>");
- return Response.ok(sb.toString()).build();
+ return Response.ok(sb.toString()).status(400).build();
}
-
+
static public Map<String, String> convertRequestParametersToMap(HttpServletRequest request){
- Enumeration<?> initParameters=request.getParameterNames();
HashMap<String, String> parameterMap = new HashMap<String, String>();
- while (initParameters.hasMoreElements()) {
- String param = (String) initParameters.nextElement();
- String value = request.getParameter(param);
- if (param != null & value != null)
- parameterMap.put(param, value);
+ try
+ {
+
+ BufferedReader br = request.getReader();
+ String line;
+ while ((line = br.readLine()) != null)
+ {
+ StringTokenizer st = new StringTokenizer(line, ";");
+ while(st.hasMoreTokens())
+ {
+ String s = st.nextToken();
+ if(s.indexOf("=")!=-1)
+ {
+ String[] tuple = s.split("=");
+ parameterMap.put(tuple[0], tuple[1]);
+ }
+ }
+ }
+
+ br.close();
}
+ catch (IOException e)
+ {
+ log.error("", e);
+ }
+
return parameterMap;
}
Modified: report-server/trunk/core/src/main/java/org/jboss/bpm/report/util/BirtUtil.java
===================================================================
--- report-server/trunk/core/src/main/java/org/jboss/bpm/report/util/BirtUtil.java 2009-10-30 12:55:48 UTC (rev 867)
+++ report-server/trunk/core/src/main/java/org/jboss/bpm/report/util/BirtUtil.java 2009-10-30 12:57:18 UTC (rev 868)
@@ -25,6 +25,9 @@
import org.eclipse.birt.report.model.api.ReportDesignHandle;
import org.eclipse.birt.report.model.api.ScalarParameterHandle;
import org.eclipse.birt.report.model.api.CascadingParameterGroupHandle;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jboss.bpm.report.BirtService;
import java.io.Serializable;
import java.util.HashMap;
@@ -37,6 +40,8 @@
*/
public class BirtUtil
{
+ private static final Log log = LogFactory.getLog(BirtService.class);
+
//Function to load parameter details in a map.
public static HashMap<String, Serializable> loadParameterDetails(
IGetParameterDefinitionTask task,
@@ -138,7 +143,7 @@
Object value = sI.getValue( );
Object label = sI.getLabel( );
- System.out.println( label + "--" + value);
+ log.debug( label + "--" + value);
dynamicList.put(value,(String) label);
}
@@ -160,7 +165,7 @@
Object value = selectionItem.getValue( );
String label = selectionItem.getLabel( );
- //System.out.println( label + "--" + value);
+ //log.debug( label + "--" + value);
dynamicList.put(value,label);
}
@@ -173,7 +178,7 @@
//Print out results
Iterator iter = parameter.keySet().iterator();
- System.out.println("======================Parameter =" + scalar.getName());
+ log.debug("======================Parameter =" + scalar.getName());
while (iter.hasNext()) {
String name = (String) iter.next();
if( name.equals("Selection List")){
@@ -181,11 +186,11 @@
Iterator selIter = selList.keySet().iterator();
while (selIter.hasNext()) {
Object lbl = selIter.next();
- System.out.println( "Selection List Entry ===== Key = " + lbl + " Value = " + selList.get(lbl));
+ log.debug( "Selection List Entry ===== Key = " + lbl + " Value = " + selList.get(lbl));
}
}else{
- System.out.println( name + " = " + parameter.get(name));
+ log.debug( name + " = " + parameter.get(name));
}
}
return parameter;
Modified: report-server/trunk/shared/src/main/java/org/jboss/bpm/report/model/ReportParameter.java
===================================================================
--- report-server/trunk/shared/src/main/java/org/jboss/bpm/report/model/ReportParameter.java 2009-10-30 12:55:48 UTC (rev 867)
+++ report-server/trunk/shared/src/main/java/org/jboss/bpm/report/model/ReportParameter.java 2009-10-30 12:57:18 UTC (rev 868)
@@ -81,4 +81,28 @@
{
this.dataType = dataType;
}
+
+
+ public boolean equals(Object o)
+ {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+
+ ReportParameter that = (ReportParameter) o;
+
+ if (dataType != that.dataType) return false;
+ if (name != null ? !name.equals(that.name) : that.name != null) return false;
+ if (type != that.type) return false;
+
+ return true;
+ }
+
+ public int hashCode()
+ {
+ int result;
+ result = (name != null ? name.hashCode() : 0);
+ result = 31 * result + (type != null ? type.hashCode() : 0);
+ result = 31 * result + (dataType != null ? dataType.hashCode() : 0);
+ return result;
+ }
}
Modified: report-server/trunk/shared/src/main/java/org/jboss/bpm/report/model/ReportReference.java
===================================================================
--- report-server/trunk/shared/src/main/java/org/jboss/bpm/report/model/ReportReference.java 2009-10-30 12:55:48 UTC (rev 867)
+++ report-server/trunk/shared/src/main/java/org/jboss/bpm/report/model/ReportReference.java 2009-10-30 12:57:18 UTC (rev 868)
@@ -21,10 +21,7 @@
*/
package org.jboss.bpm.report.model;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Set;
-import java.util.HashSet;
+import java.util.*;
/**
* @author Heiko.Braun <heiko.braun(a)jboss.com>
@@ -34,9 +31,8 @@
private String title;
private String description;
private String reportFileName;
- private Set<ReportParameter> parameterMetaData = new HashSet<ReportParameter>();
+ private List<ReportParameter> parameterMetaData = new LinkedList<ReportParameter>();
-
public ReportReference(String reportFileName)
{
this.reportFileName = reportFileName;
@@ -67,8 +63,48 @@
return reportFileName;
}
- public Set<ReportParameter> getParameterMetaData()
+ public List<ReportParameter> getParameterMetaData()
{
return parameterMetaData;
}
+
+ public ReportParameter getParameter(String name)
+ {
+ ReportParameter match = null;
+ for(ReportParameter p : parameterMetaData)
+ {
+ if(p.getName().equals(name))
+ {
+ match = p;
+ break;
+ }
+ }
+
+ return match;
+ }
+
+ public boolean equals(Object o)
+ {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+
+ ReportReference that = (ReportReference) o;
+
+ if (parameterMetaData != null ? !parameterMetaData.equals(that.parameterMetaData) : that.parameterMetaData != null)
+ return false;
+ if (reportFileName != null ? !reportFileName.equals(that.reportFileName) : that.reportFileName != null)
+ return false;
+ if (title != null ? !title.equals(that.title) : that.title != null) return false;
+
+ return true;
+ }
+
+ public int hashCode()
+ {
+ int result;
+ result = (title != null ? title.hashCode() : 0);
+ result = 31 * result + (reportFileName != null ? reportFileName.hashCode() : 0);
+ result = 31 * result + (parameterMetaData != null ? parameterMetaData.hashCode() : 0);
+ return result;
+ }
}
14 years, 6 months
- 1
- 0
Overlord SVN: r867 - in bpm-console/trunk: gui/war/src/main/java/org/jboss/bpm/console/client and 1 other directories.
by overlord-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-10-30 08:55:48 -0400 (Fri, 30 Oct 2009)
New Revision: 867
Added:
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportLaunchPadView.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportParamCallback.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportParameterForm.java
Removed:
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/CoverPanel.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportRef.java
Modified:
bpm-console/trunk/BPMC.iws
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/report/RenderDispatchEvent.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportFrame.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/UpdateReportConfigAction.java
Log:
Split POST/GET for rendering and viewing reports
Modified: bpm-console/trunk/BPMC.iws
===================================================================
--- bpm-console/trunk/BPMC.iws 2009-10-29 12:12:49 UTC (rev 866)
+++ bpm-console/trunk/BPMC.iws 2009-10-30 12:55:48 UTC (rev 867)
@@ -92,7 +92,7 @@
</component>
<component name="DebuggerManager">
<line_breakpoints>
- <breakpoint url="file:///Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm/report/BirtService.java" line="169" class="org.jboss.bpm.report.BirtService" package="org.jboss.bpm.report">
+ <breakpoint url="file:///Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm/report/ReportFacade.java" line="173" class="org.jboss.bpm.report.ReportFacade" package="org.jboss.bpm.report">
<option name="ENABLED" value="true" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
@@ -105,6 +105,32 @@
<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/report/RenderReportAction.java" line="80" class="Class at RenderReportAction.java:80" package="org.jboss.bpm.console.client.report">
+ <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:///Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm/report/BirtService.java" line="301" class="org.jboss.bpm.report.BirtService" package="org.jboss.bpm.report">
+ <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>
@@ -178,20 +204,25 @@
<component name="FileColors" enabled="false" enabledForTabs="false" />
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="CoverPanel.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/CoverPanel.java">
+ <file leaf-file-name="RenderReportAction.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="81" column="37" selection-start="3207" selection-end="3207" vertical-scroll-proportion="0.2916129">
+ <state line="113" column="48" selection-start="4124" selection-end="4124" vertical-scroll-proportion="0.6233933">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="IconHeader.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/IconHeader.java">
+ <file leaf-file-name="BirtService.java" pinned="false" current="true" current-in-tab="true">
+ <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm/report/BirtService.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="40" column="82" selection-start="1655" selection-end="1655" vertical-scroll-proportion="0.32405064">
- <folding />
+ <state line="120" column="74" selection-start="3792" selection-end="3792" vertical-scroll-proportion="0.79948586">
+ <folding>
+ <element signature="imports" expanded="true" />
+ <element signature="method#create#0;class#BirtService#0" expanded="false" />
+ <element signature="method#loadReports#0;class#BirtService#0" expanded="false" />
+ <element signature="method#extractParameterMetaData#0;class#BirtService#0" expanded="false" />
+ </folding>
</state>
</provider>
</entry>
@@ -199,7 +230,7 @@
<file leaf-file-name="ReportReference.java" pinned="false" current="false" current-in-tab="false">
<entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main/java/org/jboss/bpm/report/model/ReportReference.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="31" column="19" selection-start="1240" selection-end="1240" vertical-scroll-proportion="0.1493671">
+ <state line="82" column="66" selection-start="2160" selection-end="2160" vertical-scroll-proportion="0.69922876">
<folding />
</state>
</provider>
@@ -513,6 +544,100 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/shared" />
+ <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="report-server" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/shared" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/shared/src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/shared/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="report-server" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/shared" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/shared/src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main/java" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main/java/org" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/shared/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:/Users/hbraun/dev/prj/soag/report-server/trunk/shared/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:/Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main/java/org/jboss/bpm/report" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main/java/org/jboss/bpm/report/model" />
+ <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="report-server" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/core" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
@@ -576,6 +701,18 @@
<option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/core/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:/Users/hbraun/dev/prj/soag/report-server/trunk/core/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:/Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm/report" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -583,6 +720,56 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
+ <option name="myItemId" value="report-server" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/core" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/core/src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/core/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:/Users/hbraun/dev/prj/soag/report-server/trunk/core/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:/Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm/report" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm/report/util" />
+ <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>
@@ -731,6 +918,40 @@
<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>
@@ -902,6 +1123,14 @@
<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>
@@ -916,7 +1145,7 @@
<showLibraryContents />
<hideEmptyPackages PackagesPane="false" ProjectPane="false" />
<abbreviatePackageNames />
- <showStructure Favorites="false" PackagesPane="false" Scope="false" ProjectPane="false" />
+ <showStructure ProjectPane="false" PackagesPane="false" Scope="false" Favorites="false" />
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
@@ -966,6 +1195,40 @@
</component>
<component name="RestoreUpdateTree" />
<component name="RunManager" selected="Remote.server">
+ <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="AntTarget" value="false" />
+ <option name="Maven.BeforeRunTask" value="false" />
+ <option name="Make" value="false" />
+ <option name="BuildArtifacts" value="false" />
+ </method>
+ </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" />
+ <method>
+ <option name="AntTarget" value="false" />
+ <option name="Maven.BeforeRunTask" value="false" />
+ <option name="Make" value="false" />
+ <option name="BuildArtifacts" value="false" />
+ </method>
+ </configuration>
<configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
<module name="" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -988,22 +1251,6 @@
<option name="BuildArtifacts" value="false" />
</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="AntTarget" value="false" />
- <option name="Maven.BeforeRunTask" value="false" />
- <option name="Make" value="false" />
- <option name="BuildArtifacts" value="false" />
- </method>
- </configuration>
<configuration default="true" type="Remote" factoryName="Remote">
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
@@ -1016,24 +1263,6 @@
<option name="BuildArtifacts" value="false" />
</method>
</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" />
- <method>
- <option name="AntTarget" value="false" />
- <option name="Maven.BeforeRunTask" value="false" />
- <option name="Make" value="false" />
- <option name="BuildArtifacts" value="false" />
- </method>
- </configuration>
<configuration default="false" name="GWT" type="Remote" factoryName="Remote">
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
@@ -1195,16 +1424,16 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="420" y="51" width="1217" height="937" extended-state="0" />
+ <frame x="342" y="38" width="1273" height="940" 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="14" />
<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.32363012" order="0" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.38809523" order="1" />
- <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2234589" order="1" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3398693" order="0" />
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.38434163" order="1" />
+ <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.22303921" order="1" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32992035" order="9" />
<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="7" />
@@ -1216,7 +1445,7 @@
<window_info id="Maven" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="12" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24818695" 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="6" />
- <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.38809523" order="4" />
+ <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.38434163" 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="13" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32873562" order="8" />
@@ -1311,145 +1540,119 @@
<option name="myLastEditedConfigurable" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/gui/war/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="160" column="65" selection-start="4545" selection-end="4545" vertical-scroll-proportion="0.026143791">
- <folding>
- <marker date="1256760848000" expanded="true" signature="10145:16658" placeholder="..." />
- <marker date="1256760848000" expanded="false" signature="10145:11484" placeholder="..." />
- <marker date="1256760848000" expanded="false" signature="10145:10164" placeholder="..." />
- </folding>
+ <state line="14" column="24" selection-start="350" selection-end="350" vertical-scroll-proportion="0.4869565">
+ <folding />
</state>
</provider>
</entry>
- <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main/resources/org/jboss/bpm/report/BPMReport.gwt.xml">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/jmaki/xhp/HttpClient.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="1" column="21" selection-start="30" selection-end="30" vertical-scroll-proportion="0.020253165">
+ <state line="279" column="25" selection-start="8210" selection-end="8210" vertical-scroll-proportion="0.44044945">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportParamCallback.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="24" selection-start="8" selection-end="8" vertical-scroll-proportion="0.0">
+ <state line="30" column="7" selection-start="1202" selection-end="1202" vertical-scroll-proportion="0.3478261">
<folding />
</state>
</provider>
</entry>
- <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm/report/JMXServerConfig.java">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="34" column="13" selection-start="1314" selection-end="1314" vertical-scroll-proportion="0.22709678">
+ <state line="50" column="36" selection-start="1855" selection-end="1875" vertical-scroll-proportion="0.020565553">
<folding />
</state>
</provider>
</entry>
- <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm/report/util/DOMWriter.java">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="81" column="13" selection-start="3277" selection-end="3277" vertical-scroll-proportion="0.33290324">
+ <state line="84" column="46" selection-start="2829" selection-end="2829" vertical-scroll-proportion="0.41488022">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java">
+ <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm/report/RenderMetaData.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="107" column="19" selection-start="3360" selection-end="3360" vertical-scroll-proportion="0.9380645">
- <folding>
- <marker date="1256761451000" expanded="false" signature="0:1031" placeholder="/.../" />
- <marker date="1256761451000" expanded="true" signature="1821:1875" placeholder="/**...*/" />
- <marker date="1256761451000" expanded="true" signature="2144:2297" placeholder="{...}" />
- <marker date="1256761451000" expanded="true" signature="2334:2365" placeholder="{...}" />
- <marker date="1256761451000" expanded="true" signature="2396:3110" placeholder="{...}" />
- <marker date="1256761451000" expanded="true" signature="3165:3204" placeholder="{...}" />
- <marker date="1256761451000" expanded="true" signature="3265:3405" placeholder="{...}" />
- </folding>
+ <state line="99" column="26" selection-start="2551" selection-end="2551" vertical-scroll-proportion="1.3803132">
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/UpdateReportConfigAction.java">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportLaunchPadView.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="73" column="51" selection-start="2476" selection-end="2476" vertical-scroll-proportion="0.87848103">
+ <state line="154" column="18" selection-start="5870" selection-end="5870" vertical-scroll-proportion="1.0961969">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/WidgetWindowPanel.java">
+ <entry file="jar:///Users/hbraun/.m2/repository/org/jboss/resteasy/jaxrs-api/1.0.2.GA/jaxrs-api-1.0.2.GA.jar!/javax/ws/rs/core/Response.class">
<provider selected="true" editor-type-id="text-editor">
- <state line="41" column="9" selection-start="1625" selection-end="1625" vertical-scroll-proportion="0.18987341">
+ <state line="95" column="27" selection-start="4790" selection-end="4790" vertical-scroll-proportion="0.33290488">
<folding />
</state>
</provider>
</entry>
- <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm/report/BirtService.java">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="212" column="45" selection-start="7035" selection-end="7035" vertical-scroll-proportion="0.58064514">
- <folding>
- <marker date="1256807807000" expanded="false" signature="0:1031" placeholder="/.../" />
- <element signature="imports" expanded="true" />
- <marker date="1256807807000" expanded="true" signature="1537:1963" placeholder="/**...*/" />
- <marker date="1256807807000" expanded="true" signature="2155:2199" placeholder="{...}" />
- <marker date="1256807807000" expanded="true" signature="2493:2526" placeholder="{...}" />
- <marker date="1256807807000" expanded="true" signature="2574:3109" placeholder="{...}" />
- <marker date="1256807807000" expanded="true" signature="3146:3575" placeholder="{...}" />
- <marker date="1256807807000" expanded="true" signature="3317:3455" placeholder="{...}" />
- <marker date="1256807807000" expanded="true" signature="3384:3445" placeholder="{...}" />
- <marker date="1256807807000" expanded="true" signature="3641:6440" placeholder="{...}" />
- <marker date="1256807807000" expanded="true" signature="6515:6577" placeholder="{...}" />
- <marker date="1256807807000" expanded="true" signature="6635:6872" placeholder="{...}" />
- <marker date="1256807807000" expanded="true" signature="6695:6845" placeholder="{...}" />
- <marker date="1256807807000" expanded="true" signature="6735:6835" placeholder="{...}" />
- <marker date="1256807807000" expanded="true" signature="6898:7073" placeholder="{...}" />
- <marker date="1256807807000" expanded="true" signature="7098:7272" placeholder="{...}" />
- <marker date="1256807807000" expanded="true" signature="7300:7446" placeholder="{...}" />
- <marker date="1256807807000" expanded="true" signature="7450:7849" placeholder="/**...*/" />
- <marker date="1256807807000" expanded="false" signature="7900:10627" placeholder="{...}" />
- <marker date="1256807807000" expanded="true" signature="10716:10955" placeholder="{...}" />
- <marker date="1256807807000" expanded="true" signature="11009:11034" placeholder="{...}" />
- <marker date="1256807807000" expanded="true" signature="11098:11165" placeholder="{...}" />
- <marker date="1256807807000" expanded="true" signature="11202:11232" placeholder="{...}" />
- <marker date="1256807807000" expanded="true" signature="11289:11632" placeholder="{...}" />
- </folding>
+ <state line="183" column="21" selection-start="5799" selection-end="5799" vertical-scroll-proportion="0.57941836">
+ <folding />
</state>
</provider>
</entry>
- <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm/report/util/BirtUtil.java">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderDispatchEvent.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="106" column="30" selection-start="4345" selection-end="4356" vertical-scroll-proportion="0.6606452">
+ <state line="47" column="42" selection-start="1506" selection-end="1506" vertical-scroll-proportion="0.9350649">
<folding />
</state>
</provider>
</entry>
- <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main/java/org/jboss/bpm/report/model/ReportParameter.java">
+ <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm/report/ReportFacade.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="33" column="22" selection-start="1354" selection-end="1354" vertical-scroll-proportion="-0.15443037">
- <folding />
+ <state line="173" column="0" selection-start="5270" selection-end="5270" vertical-scroll-proportion="0.33333334">
+ <folding>
+ <element signature="method#initBirtService#0;class#ReportFacade#0" expanded="false" />
+ <element signature="method#getImage#0;class#ReportFacade#0" expanded="false" />
+ <element signature="method#defaultRenderMetaData#0;class#ReportFacade#0" expanded="false" />
+ <element signature="method#buildImageUrl#0;class#ReportFacade#0" expanded="false" />
+ <element signature="class#BirtInitException#0;class#ReportFacade#0" expanded="false" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main/java/org/jboss/bpm/report/model/ReportReference.java">
+ <entry file="jar:///Users/hbraun/.m2/repository/org/jboss/resteasy/resteasy-jaxrs/1.0.2.GA/resteasy-jaxrs-1.0.2.GA.jar!/org/jboss/resteasy/core/MethodInjectorImpl.class">
<provider selected="true" editor-type-id="text-editor">
- <state line="31" column="19" selection-start="1240" selection-end="1240" vertical-scroll-proportion="0.1493671">
+ <state line="18" column="0" selection-start="1001" selection-end="1001" vertical-scroll-proportion="0.60850114">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/CoverPanel.java">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="81" column="37" selection-start="3207" selection-end="3207" vertical-scroll-proportion="0.2916129">
+ <state line="113" column="48" selection-start="4124" selection-end="4124" vertical-scroll-proportion="0.6233933">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java">
+ <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main/java/org/jboss/bpm/report/model/ReportReference.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="387" column="0" selection-start="12311" selection-end="12311" vertical-scroll-proportion="0.23544304">
+ <state line="82" column="66" selection-start="2160" selection-end="2160" vertical-scroll-proportion="0.69922876">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/IconHeader.java">
+ <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm/report/BirtService.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="40" column="82" selection-start="1655" selection-end="1655" vertical-scroll-proportion="0.32405064">
- <folding />
+ <state line="120" column="74" selection-start="3792" selection-end="3792" vertical-scroll-proportion="0.79948586">
+ <folding>
+ <element signature="imports" expanded="true" />
+ <element signature="method#create#0;class#BirtService#0" expanded="false" />
+ <element signature="method#loadReports#0;class#BirtService#0" expanded="false" />
+ <element signature="method#extractParameterMetaData#0;class#BirtService#0" expanded="false" />
+ </folding>
</state>
</provider>
</entry>
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-10-29 12:12:49 UTC (rev 866)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java 2009-10-30 12:55:48 UTC (rev 867)
@@ -181,25 +181,15 @@
return config.getConsoleServerUrl() + "/rs/test/undeploy/harness";
}
- public String getGeneralReportUrl(String templateName)
+ public String getReportURL(String templateName)
{
String reportFileName = URL.encode(templateName);
- String url = config.getConsoleServerUrl() + "/rs/report/view/" + reportFileName;
+ String url = config.getConsoleServerUrl() + "/rs/report/render/" + reportFileName;
if (!GWT.isScript())
url += "?id=birt";
return url;
}
- public String getProcessSummaryReportUrl(String templateName, String definitionId)
- {
- String encId = URL.encode(definitionId);
- String reportFileName = URL.encode(templateName);
- String url = config.getConsoleServerUrl() + "/rs/report/view/" + reportFileName + "?procId=" + encId;
- if (!GWT.isScript())
- url += "&id=birt";
- return url;
- }
-
public String getDeploymentsUrl()
{
return config.getConsoleServerUrl() + "/rs/engine/deployments";
Deleted: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/CoverPanel.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/CoverPanel.java 2009-10-29 12:12:49 UTC (rev 866)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/CoverPanel.java 2009-10-30 12:55:48 UTC (rev 867)
@@ -1,172 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, Red Hat Middleware LLC, and individual contributors
-* as indicated by the @author tags. See the copyright.txt file in the
-* distribution for a full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY 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 along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.bpm.console.client.report;
-
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.user.client.ui.*;
-import com.mvc4g.client.Controller;
-import com.mvc4g.client.Event;
-import com.mvc4g.client.ViewInterface;
-import org.gwt.mosaic.ui.client.layout.BoxLayout;
-import org.gwt.mosaic.ui.client.layout.BoxLayoutData;
-import org.gwt.mosaic.ui.client.layout.LayoutPanel;
-import org.jboss.bpm.console.client.ApplicationContext;
-import org.jboss.bpm.console.client.Registry;
-import org.jboss.bpm.console.client.URLBuilder;
-import org.jboss.bpm.console.client.common.HeaderLabel;
-import org.jboss.bpm.console.client.common.IconHeader;
-import org.jboss.bpm.console.client.common.WidgetWindowPanel;
-import org.jboss.bpm.console.client.icons.ConsoleIconBundle;
-import org.jboss.bpm.report.model.ReportReference;
-import org.jboss.bpm.report.model.ReportParameter;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author Heiko.Braun <heiko.braun(a)jboss.com>
- */
-class CoverPanel extends LayoutPanel implements ViewInterface
-{
- public final static String ID = CoverPanel.class.getName();
-
- private Controller controller;
- private ApplicationContext appContext;
- private WidgetWindowPanel window;
-
- public CoverPanel()
- {
- super(new BoxLayout(BoxLayout.Orientation.VERTICAL));
- this.setPadding(10);
- HTML html = new HTML("The following reports are available.<br/> " +
- "Please note that rendering may take a while.");
- this.add(html);
-
- this.appContext = Registry.get(ApplicationContext.class);
- }
-
- public void update(List<ReportReference> reports)
- {
- ConsoleIconBundle icons = GWT.create(ConsoleIconBundle.class);
-
- for(final ReportReference reportRef : reports)
- {
- final boolean hasParameters = reportRef.getParameterMetaData().size()>0;
-
- //p.add(new HeaderLabel(group.name));
- LayoutPanel inner = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL));
-
- // a single report description
- LayoutPanel row = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.HORIZONTAL));
-
- LayoutPanel desc = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL));
- IconHeader header = new IconHeader(icons.pieceIcon(), reportRef.getTitle());
- header.setWidth("95%");
- desc.add(header);
- String description = reportRef.getDescription()!=null ? reportRef.getDescription() : "";
- desc.add(new HTML(description));
- row.add(desc,new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
-
- // render button
- row.add(new Button("Render",
- new ClickListener()
- {
- public void onClick(Widget widget)
- {
- if(hasParameters)
- {
- window = new WidgetWindowPanel("Report Parameter", createForm(reportRef));
- }
- else
- {
- String url = URLBuilder.getInstance().getGeneralReportUrl(reportRef.getReportFileName());
- controller.handleEvent(
- new Event(RenderReportAction.ID,
- new RenderDispatchEvent(reportRef.getTitle(), url)
- )
- );
- }
- }
- })
- );
-
- inner.add(row, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
-
-
- this.add(inner, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
-
- }
-
-
- Registry.get(ApplicationContext.class).refreshView();
- }
-
-
- public void setController(Controller controller)
- {
- this.controller = controller;
- }
-
- private Widget createForm(final ReportReference reportRef)
- {
- LayoutPanel p = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL));
- HeaderLabel label = new HeaderLabel("Report Parameters", true);
- p.add(label, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
-
- Grid grid = new Grid(reportRef.getParameterMetaData().size(),2);
-
- int row = 0;
- final List<TextBox> inputFields = new ArrayList<TextBox>();
- for(ReportParameter reportParam : reportRef.getParameterMetaData())
- {
- String promptText = reportParam.getPromptText() != null ? reportParam.getPromptText() : reportParam.getName();
- String helpText = reportParam.getHelptext() != null ? reportParam.getHelptext() : "";
-
- grid.setWidget(row,0, new HTML("<h4>"+promptText+"</h4>"+helpText));
- TextBox textBox = new TextBox();
- inputFields.add(textBox);
- grid.setWidget(row,1, textBox);
- row++;
- }
-
- p.add(grid);
- p.add(new Button("Submit",
- new ClickListener()
- {
- public void onClick(Widget widget)
- {
- String url = URLBuilder.getInstance().getProcessSummaryReportUrl(
- reportRef.getReportFileName(), inputFields.get(0).getText()); // TODO: match params
-
- controller.handleEvent(
- new Event(RenderReportAction.ID,
- new RenderDispatchEvent(reportRef.getTitle(), url))
- );
-
- window.close();
- }
- })
- );
-
- return p;
- }
-}
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderDispatchEvent.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderDispatchEvent.java 2009-10-29 12:12:49 UTC (rev 866)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderDispatchEvent.java 2009-10-30 12:55:48 UTC (rev 867)
@@ -28,6 +28,7 @@
{
String title;
String dispatchUrl;
+ String parameters = "None";
public RenderDispatchEvent(String targetView, String dispatchUrl)
{
@@ -44,4 +45,14 @@
{
return dispatchUrl;
}
+
+ public void setParameters(String parameters)
+ {
+ this.parameters = parameters;
+ }
+
+ public String getParameters()
+ {
+ return parameters;
+ }
}
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java 2009-10-29 12:12:49 UTC (rev 866)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java 2009-10-30 12:55:48 UTC (rev 867)
@@ -35,7 +35,7 @@
/**
* Engage a report generation and update {@link org.jboss.bpm.console.client.report.ReportView}
* when the report is finished.
- *
+ *
* @author Heiko.Braun <heiko.braun(a)jboss.com>
*/
public class RenderReportAction implements ActionInterface
@@ -55,10 +55,9 @@
final RenderDispatchEvent event = (RenderDispatchEvent)object;
final String url = event.getDispatchUrl();
- RequestBuilder builder = new RequestBuilder(
- RequestBuilder.GET, url);
+ RequestBuilder builder = new RequestBuilder(RequestBuilder.POST, url);
- ConsoleLog.debug(RequestBuilder.GET +": " + url);
+ ConsoleLog.debug(RequestBuilder.POST+": " + url);
final ReportEditor view = (ReportEditor)controller.getView(ReportEditor.ID);
try
@@ -66,12 +65,13 @@
controller.handleEvent( LoadingStatusAction.ON );
//view.setLoading(true);
- final Request request = builder.sendRequest(null,
+ String parameters = event.getParameters();
+ final Request request = builder.sendRequest(parameters,
new RequestCallback()
{
public void onError(Request request, Throwable exception) {
// Couldn't connect to server (could be timeout, SOP violation, etc.)
- handleError(url, exception);
+ handleError(controller,url, exception);
controller.handleEvent( LoadingStatusAction.OFF );
}
@@ -85,13 +85,13 @@
else if (200 == response.getStatusCode())
{
// update view
-
view.displayReport(event.getTitle(), event.getDispatchUrl());
}
else
- {
+ {
final String msg = response.getText().equals("") ? "Unknown error" : response.getText();
handleError(
+ controller,
url,
new RequestException("HTTP "+ response.getStatusCode()+ ": " + msg)
);
@@ -115,6 +115,7 @@
{
request.cancel();
handleError(
+ controller,
url,
new IOException("Request timeout")
);
@@ -125,16 +126,16 @@
t.schedule(20000);
}
- catch (RequestException e)
+ catch (Throwable e)
{
// Couldn't connect to server
- handleError(url, e);
controller.handleEvent( LoadingStatusAction.OFF );
+ handleError(controller, url, e);
//view.setLoading(false);
}
}
- protected void handleError(String url, Throwable t)
+ protected void handleError(Controller controller, String url, Throwable t)
{
final String out =
"<ul>"+
@@ -147,5 +148,6 @@
ConsoleLog.error(out, t);
appContext.displayMessage(out, true);
+ controller.handleEvent( LoadingStatusAction.OFF );
}
}
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportFrame.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportFrame.java 2009-10-29 12:12:49 UTC (rev 866)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportFrame.java 2009-10-30 12:55:48 UTC (rev 867)
@@ -29,6 +29,8 @@
import java.util.Date;
/**
+ * Embeds an HTML report.
+ *
* @author Heiko.Braun <heiko.braun(a)jboss.com>
*/
public class ReportFrame extends LayoutPanel implements LazyPanel
Added: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportLaunchPadView.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportLaunchPadView.java (rev 0)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportLaunchPadView.java 2009-10-30 12:55:48 UTC (rev 867)
@@ -0,0 +1,167 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY 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 along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.bpm.console.client.report;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.user.client.ui.Button;
+import com.google.gwt.user.client.ui.ClickListener;
+import com.google.gwt.user.client.ui.HTML;
+import com.google.gwt.user.client.ui.Widget;
+import com.mvc4g.client.Controller;
+import com.mvc4g.client.Event;
+import com.mvc4g.client.ViewInterface;
+import org.gwt.mosaic.ui.client.layout.BoxLayout;
+import org.gwt.mosaic.ui.client.layout.BoxLayoutData;
+import org.gwt.mosaic.ui.client.layout.LayoutPanel;
+import org.jboss.bpm.console.client.ApplicationContext;
+import org.jboss.bpm.console.client.Registry;
+import org.jboss.bpm.console.client.URLBuilder;
+import org.jboss.bpm.console.client.common.IconHeader;
+import org.jboss.bpm.console.client.common.WidgetWindowPanel;
+import org.jboss.bpm.console.client.icons.ConsoleIconBundle;
+import org.jboss.bpm.report.model.ReportReference;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Iterator;
+
+/**
+ * List the available reports and allows to redner them.<br>
+ * Driven by a list of {@link org.jboss.bpm.report.model.ReportReference}s
+ * that need to be retrieved from the server module.
+ *
+ * @see org.jboss.bpm.console.client.report.UpdateReportConfigAction
+ *
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+class ReportLaunchPadView extends LayoutPanel implements ViewInterface
+{
+ public final static String ID = ReportLaunchPadView.class.getName();
+
+ private Controller controller;
+
+ private WidgetWindowPanel window;
+
+ public ReportLaunchPadView()
+ {
+ super(new BoxLayout(BoxLayout.Orientation.VERTICAL));
+ this.setPadding(10);
+ HTML html = new HTML("The following reports are available.<br/> " +
+ "Please note that rendering may take a while.");
+ this.add(html);
+
+ }
+
+ public void update(List<ReportReference> reports)
+ {
+ ConsoleIconBundle icons = GWT.create(ConsoleIconBundle.class);
+
+ for(final ReportReference reportRef : reports)
+ {
+ final boolean hasParameters = reportRef.getParameterMetaData().size()>0;
+
+ //p.add(new HeaderLabel(group.name));
+ LayoutPanel inner = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL));
+
+ // a single report description
+ LayoutPanel row = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.HORIZONTAL));
+
+ LayoutPanel desc = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL));
+ IconHeader header = new IconHeader(icons.pieceIcon(), reportRef.getTitle());
+ header.setWidth("95%");
+ desc.add(header);
+ String description = reportRef.getDescription()!=null ? reportRef.getDescription() : "";
+ desc.add(new HTML(description));
+ row.add(desc,new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
+
+ // render button
+ row.add(new Button("Render",
+ new ClickListener()
+ {
+ public void onClick(Widget widget)
+ {
+ if(hasParameters)
+ {
+ ReportParameterForm form =
+ new ReportParameterForm(reportRef,
+ new ReportParamCallback()
+ {
+
+ public void onSumbit(Map<String, String> paramValues)
+ {
+
+ String url = URLBuilder.getInstance().getReportURL(reportRef.getReportFileName());
+
+ RenderDispatchEvent eventPayload = new RenderDispatchEvent(reportRef.getTitle(), url);
+ eventPayload.setParameters(fieldValues2PostParams(paramValues));
+ controller.handleEvent( new Event(RenderReportAction.ID, eventPayload));
+
+ window.close();
+ }
+ });
+
+ window = new WidgetWindowPanel("Report Parameter", form);
+ }
+ else
+ {
+ String url = URLBuilder.getInstance().getReportURL(reportRef.getReportFileName());
+ controller.handleEvent(
+ new Event(RenderReportAction.ID,
+ new RenderDispatchEvent(reportRef.getTitle(), url)
+ )
+ );
+ }
+ }
+ })
+ );
+
+
+ inner.add(row, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
+ this.add(inner, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
+
+ }
+
+
+ Registry.get(ApplicationContext.class).refreshView();
+ }
+
+ private static String fieldValues2PostParams(Map<String,String> values)
+ {
+ StringBuffer sb = new StringBuffer();
+ Iterator<String> keys = values.keySet().iterator();
+ while(keys.hasNext())
+ {
+ String key = keys.next();
+ sb.append(key).append("=").append(values.get(key));
+ sb.append(";");
+ }
+
+ System.out.println(sb.toString());
+ return sb.toString();
+ }
+
+ public void setController(Controller controller)
+ {
+ this.controller = controller;
+ }
+
+}
Added: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportParamCallback.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportParamCallback.java (rev 0)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportParamCallback.java 2009-10-30 12:55:48 UTC (rev 867)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY 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 along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.console.client.report;
+
+import java.util.Map;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public interface ReportParamCallback
+{
+ void onSumbit(Map<String, String> paramValues);
+}
Added: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportParameterForm.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportParameterForm.java (rev 0)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportParameterForm.java 2009-10-30 12:55:48 UTC (rev 867)
@@ -0,0 +1,122 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY 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 along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.console.client.report;
+
+import com.google.gwt.user.client.ui.*;
+import org.gwt.mosaic.ui.client.layout.BoxLayout;
+import org.gwt.mosaic.ui.client.layout.BoxLayoutData;
+import org.gwt.mosaic.ui.client.layout.LayoutPanel;
+import org.jboss.bpm.console.client.common.HeaderLabel;
+import org.jboss.bpm.report.model.ReportParameter;
+import org.jboss.bpm.report.model.ReportReference;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+
+/**
+ * Report parameter input.
+ *
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class ReportParameterForm extends LayoutPanel
+{
+ private ReportReference reportReference;
+ private ReportParamCallback callback;
+ private List<InputField> fields = new ArrayList<InputField>();
+
+ public ReportParameterForm(ReportReference reportReference, ReportParamCallback callback)
+ {
+ this.reportReference = reportReference;
+ this.callback = callback;
+
+ Widget form = createForm(reportReference);
+ this.add(form);
+ }
+
+ private Widget createForm(final ReportReference reportRef)
+ {
+ LayoutPanel p = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL));
+ HeaderLabel label = new HeaderLabel("Report Parameters", true);
+ p.add(label, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
+
+ Grid grid = new Grid(reportRef.getParameterMetaData().size(),2);
+
+ int row = 0;
+
+ for(final ReportParameter reportParam : reportRef.getParameterMetaData())
+ {
+ String promptText = reportParam.getPromptText() != null ? reportParam.getPromptText() : reportParam.getName();
+ String helpText = reportParam.getHelptext() != null ? reportParam.getHelptext() : "";
+
+ grid.setWidget(row,0, new HTML("<h4>"+promptText+"</h4>"+helpText));
+ final TextBox textBox = new TextBox();
+
+ // retain access to values
+ final InputField field = new InputField()
+ {
+ String getValue()
+ {
+ return textBox.getText();
+ }
+
+ {
+ widget = textBox;
+ id = reportParam.getName();
+
+ }};
+ fields.add(field);
+
+ grid.setWidget(row,1, textBox);
+ row++;
+ }
+
+ p.add(grid);
+ p.add(new Button("Submit",
+ new ClickListener()
+ {
+ public void onClick(Widget widget)
+ {
+ Map<String, String> values = new HashMap<String,String>();
+ for(InputField field : fields)
+ values.put(field.id, field.getValue());
+
+ callback.onSumbit(values);
+ }
+ })
+ );
+
+ return p;
+ }
+
+ class InputField
+ {
+ Widget widget;
+ String id;
+
+ String getValue()
+ {
+ throw new IllegalArgumentException("Override this method");
+ }
+ }
+}
Deleted: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportRef.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportRef.java 2009-10-29 12:12:49 UTC (rev 866)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportRef.java 2009-10-30 12:55:48 UTC (rev 867)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY 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 along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.console.client.report;
-
-/**
- * @author Heiko.Braun <heiko.braun(a)jboss.com>
- */
-class ReportRef
-{
- String name;
- String template;
-
- public ReportRef(String name, String template)
- {
- this.name = name;
- this.template = template;
- }
-
-}
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java 2009-10-29 12:12:49 UTC (rev 866)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java 2009-10-30 12:55:48 UTC (rev 867)
@@ -22,9 +22,6 @@
package org.jboss.bpm.console.client.report;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.xml.client.Document;
-import com.google.gwt.xml.client.NamedNodeMap;
-import com.google.gwt.xml.client.Node;
import com.mvc4g.client.Controller;
import org.gwt.mosaic.ui.client.DeckLayoutPanel;
import org.gwt.mosaic.ui.client.Label;
@@ -33,10 +30,8 @@
import org.jboss.bpm.console.client.icons.ConsoleIconBundle;
import org.jboss.bpm.console.client.search.UpdateSearchDefinitionsAction;
import org.jboss.bpm.console.client.util.ConsoleLog;
-import org.jboss.bpm.console.client.util.DOMUtil;
import org.jboss.bpm.report.model.ReportReference;
-import java.util.ArrayList;
import java.util.List;
/**
@@ -49,7 +44,7 @@
private Controller controller;
private boolean isInitialized;
private DeckLayoutPanel deck;
- private CoverPanel coverpanel;
+ private ReportLaunchPadView coverpanel;
public ReportView()
{
@@ -78,13 +73,13 @@
deck.add(loadingPanel);
// cover
- coverpanel = new CoverPanel();
+ coverpanel = new ReportLaunchPadView();
deck.add(coverpanel);
this.add(deck);
// views and actions
- controller.addView(CoverPanel.ID, coverpanel);
+ controller.addView(ReportLaunchPadView.ID, coverpanel);
controller.addAction(UpdateSearchDefinitionsAction.ID, new UpdateSearchDefinitionsAction());
controller.addAction(RenderReportAction.ID, new RenderReportAction());
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/UpdateReportConfigAction.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/UpdateReportConfigAction.java 2009-10-29 12:12:49 UTC (rev 866)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/UpdateReportConfigAction.java 2009-10-30 12:55:48 UTC (rev 867)
@@ -33,6 +33,12 @@
import java.util.List;
/**
+ * Retrieves the inital reporting config in order to setup the
+ * {@link org.jboss.bpm.console.client.report.ReportLaunchPadView}
+ *
+ * @see org.jboss.bpm.console.client.report.ReportView#configure(java.util.List)
+ * @see org.jboss.bpm.console.client.report.ReportLaunchPadView#update(java.util.List)
+ *
* @author Heiko.Braun <heiko.braun(a)jboss.com>
*/
public class UpdateReportConfigAction extends AbstractRESTAction
14 years, 6 months
- 1
- 0
Overlord SVN: r866 - in report-server/trunk: core/src/main/java/org/jboss/bpm/report and 3 other directories.
by overlord-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-10-29 08:12:49 -0400 (Thu, 29 Oct 2009)
New Revision: 866
Added:
report-server/trunk/core/src/main/java/org/jboss/bpm/report/util/DOMWriter.java
report-server/trunk/core/src/main/java/org/jboss/bpm/report/util/FileWriter.java
Removed:
report-server/trunk/core/src/main/java/org/jboss/bpm/report/DOMWriter.java
report-server/trunk/core/src/main/java/org/jboss/bpm/report/FileWriter.java
Modified:
report-server/trunk/core/src/main/java/org/jboss/bpm/report/BirtService.java
report-server/trunk/pom.xml
report-server/trunk/server/src/main/webapp/WEB-INF/web.xml
report-server/trunk/shared/src/main/java/org/jboss/bpm/report/model/ReportParameter.java
Log:
Move some classes to util package
Modified: report-server/trunk/core/src/main/java/org/jboss/bpm/report/BirtService.java
===================================================================
--- report-server/trunk/core/src/main/java/org/jboss/bpm/report/BirtService.java 2009-10-29 12:11:43 UTC (rev 865)
+++ report-server/trunk/core/src/main/java/org/jboss/bpm/report/BirtService.java 2009-10-29 12:12:49 UTC (rev 866)
@@ -77,7 +77,7 @@
File workDir = new File(iConfig.getReportDir());
if(!workDir.exists())
throw new IllegalStateException("Working directory "+iConfig.getReportDir()+" cannot be found!");
-
+
try
{
loadReportNames();
@@ -108,7 +108,7 @@
);
for(File f : reportFiles)
- {
+ {
reports.put(f.getName(), new ReportReference(f.getName()));
}
}
@@ -122,8 +122,8 @@
IReportRunnable template = openCached(templateName);
// Update report reference details
- String title = prop(template, IReportRunnable.TITLE, "No title");
- String description = prop(template, IReportRunnable.DESCRIPTION, "No description");
+ String title = nonNull((String)template.getProperty(IReportRunnable.TITLE), "No title");
+ String description = nonNull((String)template.getProperty(IReportRunnable.DESCRIPTION), "No description");
ReportReference reportRef = reports.get(templateName);
reportRef.setTitle(title);
reportRef.setDescription(description);
@@ -143,7 +143,7 @@
if ( param instanceof IParameterGroupDefn )
{
- IParameterGroupDefn group = (IParameterGroupDefn) param;
+ IParameterGroupDefn group = (IParameterGroupDefn) param;
// Do something with the parameter group.
// Iterate over group contents.
@@ -175,7 +175,7 @@
);
paramRef.setDataType(ReportParameter.DataType.valueOf((String)map.get("DataType")));
paramRef.setHelptext((String)map.get("Help Text"));
- paramRef.setDisplayName((String)map.get("Display Name"));
+ paramRef.setPromptText((String)map.get("Prompt Text"));
ref.getParameterMetaData().add(paramRef);
}
}
@@ -184,10 +184,9 @@
}
- private String prop(IReportRunnable report, String name, String value)
+ private static String nonNull(String candidate, String defaultValue)
{
- return report.getProperty(name) != null ?
- (String)report.getProperty(name) : value;
+ return candidate != null ? candidate : defaultValue;
}
/* non blocking init */
Deleted: report-server/trunk/core/src/main/java/org/jboss/bpm/report/DOMWriter.java
===================================================================
--- report-server/trunk/core/src/main/java/org/jboss/bpm/report/DOMWriter.java 2009-10-29 12:11:43 UTC (rev 865)
+++ report-server/trunk/core/src/main/java/org/jboss/bpm/report/DOMWriter.java 2009-10-29 12:12:49 UTC (rev 866)
@@ -1,634 +0,0 @@
-package org.jboss.bpm.report;
-
-/*
- * ====================================================================
- *
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution, if
- * any, must include the following acknowlegement:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowlegement may appear in the software itself,
- * if and wherever such third-party acknowlegements normally appear.
- *
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
- * Foundation" must not be used to endorse or promote products derived
- * from this software without prior written permission. For written
- * permission, please contact apache(a)apache.org.
- *
- * 5. Products derived from this software may not be called "Apache"
- * nor may "Apache" appear in their names without prior written
- * permission of the Apache Group.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- */
-
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
-import java.io.Writer;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * Traverse a DOM tree in order to print a document that is parsed.
- *
- * @author Andy Clark, IBM
- * @author Thomas.Diesler(a)jboss.org
- */
-@SuppressWarnings("unchecked")
-public class DOMWriter
-{
- // Print writer
- private PrintWriter out;
- // True, if canonical output
- private boolean canonical;
- // True, if pretty printing should be used
- private boolean prettyprint;
- // True, if the XML declaration should be written
- private boolean writeXMLDeclaration;
- // True, if whitespace should be ignored
- private boolean ignoreWhitespace;
- // Explicit character set encoding
- private String charsetName;
- // indent for the pretty printer
- private int prettyIndent;
- // True, if the XML declaration has been written
- private boolean wroteXMLDeclaration;
- // The node that started the write
- private Node rootNode;
- // True if we want namespace completion
- private boolean completeNamespaces = true;
- // The current default namespace
- private String currentDefaultNamespace;
-
- public DOMWriter(Writer w)
- {
- this.out = new PrintWriter(w);
- }
-
- public DOMWriter(Writer w, String charsetName)
- {
- this.out = new PrintWriter(w);
- this.charsetName = charsetName;
- this.writeXMLDeclaration = true;
- }
-
- public DOMWriter(OutputStream stream)
- {
- try
- {
- this.out = new PrintWriter(new OutputStreamWriter(stream, "UTF-8"));
- }
- catch (UnsupportedEncodingException e)
- {
- // ignore, UTF-8 should be available
- }
- }
-
- public DOMWriter(OutputStream stream, String charsetName)
- {
- try
- {
- this.out = new PrintWriter(new OutputStreamWriter(stream, charsetName));
- this.charsetName = charsetName;
- this.writeXMLDeclaration = true;
- }
- catch (UnsupportedEncodingException e)
- {
- throw new IllegalArgumentException("Unsupported encoding: " + charsetName);
- }
- }
-
- /**
- * Print a node with explicit prettyprinting.
- * The defaults for all other DOMWriter properties apply.
- *
- */
- public static String printNode(Node node, boolean prettyprint)
- {
- StringWriter strw = new StringWriter();
- new DOMWriter(strw).setPrettyprint(prettyprint).print(node);
- return strw.toString();
- }
-
- public boolean isCanonical()
- {
- return canonical;
- }
-
- /**
- * Set wheter entities should appear in their canonical form.
- * The default is false.
- */
- public DOMWriter setCanonical(boolean canonical)
- {
- this.canonical = canonical;
- return this;
- }
-
- public boolean isIgnoreWhitespace()
- {
- return ignoreWhitespace;
- }
-
- /**
- * Set whether whitespace should be ignored.
- * The default is false.
- */
- public DOMWriter setIgnoreWhitespace(boolean ignoreWhitespace)
- {
- this.ignoreWhitespace = ignoreWhitespace;
- return this;
- }
-
- /**
- * Set wheter subelements should have their namespaces completed.
- * Setting this to false may lead to invalid XML fragments.
- * The default is true.
- */
- public DOMWriter setCompleteNamespaces(boolean complete)
- {
- this.completeNamespaces = complete;
- return this;
- }
-
- public boolean isPrettyprint()
- {
- return prettyprint;
- }
-
- /**
- * Set wheter element should be indented.
- * The default is false.
- */
- public DOMWriter setPrettyprint(boolean prettyprint)
- {
- this.prettyprint = prettyprint;
- return this;
- }
-
- public boolean isWriteXMLDeclaration()
- {
- return writeXMLDeclaration;
- }
-
- /**
- * Set wheter the XML declaration should be written.
- * The default is false.
- */
- public DOMWriter setWriteXMLDeclaration(boolean flag)
- {
- this.writeXMLDeclaration = flag;
- return this;
- }
-
- public void print(Node node)
- {
- if (prettyprint && ignoreWhitespace)
- throw new IllegalStateException("Cannot pretty print and ignore whitespace");
-
- rootNode = node;
- printInternal(node, false);
- }
-
- private void printInternal(Node node, boolean indentEndMarker)
- {
- // is there anything to do?
- if (node == null)
- {
- return;
- }
-
- // JBAS-2117 - Don't skip the DOCUMENT_NODE
- // if (node instanceof Document) node = ((Document)node).getDocumentElement();
-
- if (wroteXMLDeclaration == false && writeXMLDeclaration == true && canonical == false)
- {
- out.print("<?xml version='1.0'");
- if (charsetName != null)
- out.print(" encoding='" + charsetName + "'");
-
- out.print("?>");
- if (prettyprint)
- out.println();
-
- wroteXMLDeclaration = true;
- }
-
- int type = node.getNodeType();
- boolean hasChildNodes = node.getChildNodes().getLength() > 0;
-
- String nodeName = node.getNodeName();
- switch (type)
- {
- // print document
- case Node.DOCUMENT_NODE:
- {
- NodeList children = node.getChildNodes();
- for (int iChild = 0; iChild < children.getLength(); iChild++)
- {
- printInternal(children.item(iChild), false);
- }
- out.flush();
- break;
- }
-
- // print element with attributes
- case Node.ELEMENT_NODE:
- {
- Element element = (Element)node;
- if (prettyprint)
- {
- for (int i = 0; i < prettyIndent; i++)
- {
- out.print(' ');
- }
- prettyIndent++;
- }
-
- out.print('<');
- out.print(nodeName);
-
- Map nsMap = new HashMap();
- String elPrefix = node.getPrefix();
- String elNamespaceURI = node.getNamespaceURI();
- if (elPrefix != null)
- {
- String nsURI = getNamespaceURI(elPrefix, element, rootNode);
- nsMap.put(elPrefix, nsURI);
- }
-
- Attr attrs[] = sortAttributes(node.getAttributes());
- for (int i = 0; i < attrs.length; i++)
- {
- Attr attr = attrs[i];
- String atPrefix = attr.getPrefix();
- String atName = attr.getNodeName();
- String atValue = normalize(attr.getNodeValue(), canonical);
-
- if (atName.equals("xmlns"))
- currentDefaultNamespace = atValue;
-
- if (atPrefix != null && !atPrefix.equals("xmlns") && !atPrefix.equals("xml"))
- {
- String nsURI = getNamespaceURI(atPrefix, element, rootNode);
- nsMap.put(atPrefix, nsURI);
- // xsi:type='ns1:SubType', xsi:type='xsd:string'
- if (atName.equals(atPrefix + ":type") && atValue.indexOf(":") > 0)
- {
- // xsi defined on the envelope
- if (nsURI == null)
- nsURI = getNamespaceURI(atPrefix, element, null);
-
- if ("http://www.w3.org/2001/XMLSchema-instance".equals(nsURI))
- {
- String typePrefix = atValue.substring(0, atValue.indexOf(":"));
- String typeURI = getNamespaceURI(typePrefix, element, rootNode);
- nsMap.put(typePrefix, typeURI);
- }
- }
- }
-
- out.print(" " + atName + "='" + atValue + "'");
- }
-
- // Add namespace declaration for prefixes
- // that are defined further up the tree
- if (completeNamespaces)
- {
- Iterator itPrefix = nsMap.keySet().iterator();
- while (itPrefix.hasNext())
- {
- String prefix = (String)itPrefix.next();
- String nsURI = (String)nsMap.get(prefix);
- if (nsURI == null)
- {
- nsURI = getNamespaceURI(prefix, element, null);
- out.print(" xmlns:" + prefix + "='" + nsURI + "'");
- }
- }
- }
-
- // The SAX ContentHandler will by default not add the namespace declaration
- // <Hello xmlns='http://somens'>World</Hello>
- if (elPrefix == null && elNamespaceURI != null)
- {
- String defaultNamespace = element.getAttribute("xmlns");
- if (defaultNamespace.length() == 0 && !elNamespaceURI.equals(currentDefaultNamespace))
- {
- out.print(" xmlns='" + elNamespaceURI + "'");
- currentDefaultNamespace = elNamespaceURI;
- }
- }
-
- if (hasChildNodes)
- {
- out.print('>');
- }
-
- // Find out if the end marker is indented
- indentEndMarker = isEndMarkerIndented(node);
-
- if (indentEndMarker)
- {
- out.print('\n');
- }
-
- NodeList childNodes = node.getChildNodes();
- int len = childNodes.getLength();
- for (int i = 0; i < len; i++)
- {
- Node childNode = childNodes.item(i);
- printInternal(childNode, false);
- }
- break;
- }
-
- // handle entity reference nodes
- case Node.ENTITY_REFERENCE_NODE:
- {
- if (canonical)
- {
- NodeList children = node.getChildNodes();
- if (children != null)
- {
- int len = children.getLength();
- for (int i = 0; i < len; i++)
- {
- printInternal(children.item(i), false);
- }
- }
- }
- else
- {
- out.print('&');
- out.print(nodeName);
- out.print(';');
- }
- break;
- }
-
- // print cdata sections
- case Node.CDATA_SECTION_NODE:
- {
- if (canonical)
- {
- out.print(normalize(node.getNodeValue(), canonical));
- }
- else
- {
- out.print("<![CDATA[");
- out.print(node.getNodeValue());
- out.print("]]>");
- }
- break;
- }
-
- // print text
- case Node.TEXT_NODE:
- {
- String text = normalize(node.getNodeValue(), canonical);
- if (text.trim().length() > 0)
- {
- out.print(text);
- }
- else if (prettyprint == false && ignoreWhitespace == false)
- {
- out.print(text);
- }
- break;
- }
-
- // print processing instruction
- case Node.PROCESSING_INSTRUCTION_NODE:
- {
- out.print("<?");
- out.print(nodeName);
- String data = node.getNodeValue();
- if (data != null && data.length() > 0)
- {
- out.print(' ');
- out.print(data);
- }
- out.print("?>");
- break;
- }
-
- // print comment
- case Node.COMMENT_NODE:
- {
- for (int i = 0; i < prettyIndent; i++)
- {
- out.print(' ');
- }
-
- out.print("<!--");
- String data = node.getNodeValue();
- if (data != null)
- {
- out.print(data);
- }
- out.print("-->");
-
- if (prettyprint)
- {
- out.print('\n');
- }
-
- break;
- }
- }
-
- if (type == Node.ELEMENT_NODE)
- {
- if (prettyprint)
- prettyIndent--;
-
- if (hasChildNodes == false)
- {
- out.print("/>");
- }
- else
- {
- if (indentEndMarker)
- {
- for (int i = 0; i < prettyIndent; i++)
- {
- out.print(' ');
- }
- }
-
- out.print("</");
- out.print(nodeName);
- out.print('>');
- }
-
- if (prettyIndent > 0)
- {
- out.print('\n');
- }
- }
- out.flush();
- }
-
- private String getNamespaceURI(String prefix, Element element, Node stopNode)
- {
- Node parent = element.getParentNode();
- String nsURI = element.getAttribute("xmlns:" + prefix);
- if (nsURI.length() == 0 && element != stopNode && parent instanceof Element)
- return getNamespaceURI(prefix, (Element)parent, stopNode);
-
- return (nsURI.length() > 0 ? nsURI : null);
- }
-
- private boolean isEndMarkerIndented(Node node)
- {
- if (prettyprint)
- {
- NodeList childNodes = node.getChildNodes();
- int len = childNodes.getLength();
- for (int i = 0; i < len; i++)
- {
- Node children = childNodes.item(i);
- if (children.getNodeType() == Node.ELEMENT_NODE)
- {
- return true;
- }
- }
- }
- return false;
- }
-
- /** Returns a sorted list of attributes. */
- private Attr[] sortAttributes(NamedNodeMap attrs)
- {
-
- int len = (attrs != null) ? attrs.getLength() : 0;
- Attr array[] = new Attr[len];
- for (int i = 0; i < len; i++)
- {
- array[i] = (Attr)attrs.item(i);
- }
- for (int i = 0; i < len - 1; i++)
- {
- String name = array[i].getNodeName();
- int index = i;
- for (int j = i + 1; j < len; j++)
- {
- String curName = array[j].getNodeName();
- if (curName.compareTo(name) < 0)
- {
- name = curName;
- index = j;
- }
- }
- if (index != i)
- {
- Attr temp = array[i];
- array[i] = array[index];
- array[index] = temp;
- }
- }
- return (array);
- }
-
- /** Normalizes the given string. */
- public static String normalize(String s, boolean canonical)
- {
- StringBuffer str = new StringBuffer();
-
- int len = (s != null) ? s.length() : 0;
- for (int i = 0; i < len; i++)
- {
- char ch = s.charAt(i);
- switch (ch)
- {
- case '<':
- {
- str.append("<");
- break;
- }
- case '>':
- {
- str.append(">");
- break;
- }
- case '&':
- {
- str.append("&");
- break;
- }
- case '"':
- {
- str.append(""");
- break;
- }
- case '\'':
- {
- str.append("'");
- break;
- }
- case '\r':
- case '\n':
- {
- if (canonical)
- {
- str.append("&#");
- str.append(Integer.toString(ch));
- str.append(';');
- break;
- }
- // else, default append char
- }
- default:
- {
- str.append(ch);
- }
- }
- }
- return (str.toString());
- }
-}
\ No newline at end of file
Deleted: report-server/trunk/core/src/main/java/org/jboss/bpm/report/FileWriter.java
===================================================================
--- report-server/trunk/core/src/main/java/org/jboss/bpm/report/FileWriter.java 2009-10-29 12:11:43 UTC (rev 865)
+++ report-server/trunk/core/src/main/java/org/jboss/bpm/report/FileWriter.java 2009-10-29 12:12:49 UTC (rev 866)
@@ -1,67 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY 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 along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.report;
-
-import javax.ws.rs.ext.Provider;
-import javax.ws.rs.ext.MessageBodyWriter;
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import java.lang.reflect.Type;
-import java.lang.annotation.Annotation;
-import java.io.OutputStream;
-import java.io.IOException;
-import java.io.FileInputStream;
-import java.io.File;
-
-/**
- * @author Heiko.Braun <heiko.braun(a)jboss.com>
- */
-@Provider
-@Produces({"text/html", "image/*"})
-public class FileWriter implements MessageBodyWriter
-{
-
- public boolean isWriteable(Class aClass, Type type, Annotation[] annotations, MediaType mediaType)
- {
- return aClass.equals(java.io.File.class);
- }
-
- public long getSize(Object o, Class aClass, Type type, Annotation[] annotations, MediaType mediaType)
- {
- return ((File)o).length();
- }
-
- public void writeTo(Object o, Class aClass, Type type, Annotation[] annotations, MediaType mediaType, MultivaluedMap multivaluedMap, OutputStream outputStream) throws IOException, WebApplicationException
- {
- FileInputStream fin = new FileInputStream((File)o);
- int c;
- while ((c = fin.read()) != -1)
- {
- outputStream.write(c);
- }
-
- fin.close();
-
- }
-}
Added: report-server/trunk/core/src/main/java/org/jboss/bpm/report/util/DOMWriter.java
===================================================================
--- report-server/trunk/core/src/main/java/org/jboss/bpm/report/util/DOMWriter.java (rev 0)
+++ report-server/trunk/core/src/main/java/org/jboss/bpm/report/util/DOMWriter.java 2009-10-29 12:12:49 UTC (rev 866)
@@ -0,0 +1,634 @@
+package org.jboss.bpm.report.util;
+
+/*
+ * ====================================================================
+ *
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ * any, must include the following acknowlegement:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowlegement may appear in the software itself,
+ * if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * Foundation" must not be used to endorse or promote products derived
+ * from this software without prior written permission. For written
+ * permission, please contact apache(a)apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ * nor may "Apache" appear in their names without prior written
+ * permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.io.UnsupportedEncodingException;
+import java.io.Writer;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.w3c.dom.Attr;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+/**
+ * Traverse a DOM tree in order to print a document that is parsed.
+ *
+ * @author Andy Clark, IBM
+ * @author Thomas.Diesler(a)jboss.org
+ */
+@SuppressWarnings("unchecked")
+public class DOMWriter
+{
+ // Print writer
+ private PrintWriter out;
+ // True, if canonical output
+ private boolean canonical;
+ // True, if pretty printing should be used
+ private boolean prettyprint;
+ // True, if the XML declaration should be written
+ private boolean writeXMLDeclaration;
+ // True, if whitespace should be ignored
+ private boolean ignoreWhitespace;
+ // Explicit character set encoding
+ private String charsetName;
+ // indent for the pretty printer
+ private int prettyIndent;
+ // True, if the XML declaration has been written
+ private boolean wroteXMLDeclaration;
+ // The node that started the write
+ private Node rootNode;
+ // True if we want namespace completion
+ private boolean completeNamespaces = true;
+ // The current default namespace
+ private String currentDefaultNamespace;
+
+ public DOMWriter(Writer w)
+ {
+ this.out = new PrintWriter(w);
+ }
+
+ public DOMWriter(Writer w, String charsetName)
+ {
+ this.out = new PrintWriter(w);
+ this.charsetName = charsetName;
+ this.writeXMLDeclaration = true;
+ }
+
+ public DOMWriter(OutputStream stream)
+ {
+ try
+ {
+ this.out = new PrintWriter(new OutputStreamWriter(stream, "UTF-8"));
+ }
+ catch (UnsupportedEncodingException e)
+ {
+ // ignore, UTF-8 should be available
+ }
+ }
+
+ public DOMWriter(OutputStream stream, String charsetName)
+ {
+ try
+ {
+ this.out = new PrintWriter(new OutputStreamWriter(stream, charsetName));
+ this.charsetName = charsetName;
+ this.writeXMLDeclaration = true;
+ }
+ catch (UnsupportedEncodingException e)
+ {
+ throw new IllegalArgumentException("Unsupported encoding: " + charsetName);
+ }
+ }
+
+ /**
+ * Print a node with explicit prettyprinting.
+ * The defaults for all other DOMWriter properties apply.
+ *
+ */
+ public static String printNode(Node node, boolean prettyprint)
+ {
+ StringWriter strw = new StringWriter();
+ new DOMWriter(strw).setPrettyprint(prettyprint).print(node);
+ return strw.toString();
+ }
+
+ public boolean isCanonical()
+ {
+ return canonical;
+ }
+
+ /**
+ * Set wheter entities should appear in their canonical form.
+ * The default is false.
+ */
+ public DOMWriter setCanonical(boolean canonical)
+ {
+ this.canonical = canonical;
+ return this;
+ }
+
+ public boolean isIgnoreWhitespace()
+ {
+ return ignoreWhitespace;
+ }
+
+ /**
+ * Set whether whitespace should be ignored.
+ * The default is false.
+ */
+ public DOMWriter setIgnoreWhitespace(boolean ignoreWhitespace)
+ {
+ this.ignoreWhitespace = ignoreWhitespace;
+ return this;
+ }
+
+ /**
+ * Set wheter subelements should have their namespaces completed.
+ * Setting this to false may lead to invalid XML fragments.
+ * The default is true.
+ */
+ public DOMWriter setCompleteNamespaces(boolean complete)
+ {
+ this.completeNamespaces = complete;
+ return this;
+ }
+
+ public boolean isPrettyprint()
+ {
+ return prettyprint;
+ }
+
+ /**
+ * Set wheter element should be indented.
+ * The default is false.
+ */
+ public DOMWriter setPrettyprint(boolean prettyprint)
+ {
+ this.prettyprint = prettyprint;
+ return this;
+ }
+
+ public boolean isWriteXMLDeclaration()
+ {
+ return writeXMLDeclaration;
+ }
+
+ /**
+ * Set wheter the XML declaration should be written.
+ * The default is false.
+ */
+ public DOMWriter setWriteXMLDeclaration(boolean flag)
+ {
+ this.writeXMLDeclaration = flag;
+ return this;
+ }
+
+ public void print(Node node)
+ {
+ if (prettyprint && ignoreWhitespace)
+ throw new IllegalStateException("Cannot pretty print and ignore whitespace");
+
+ rootNode = node;
+ printInternal(node, false);
+ }
+
+ private void printInternal(Node node, boolean indentEndMarker)
+ {
+ // is there anything to do?
+ if (node == null)
+ {
+ return;
+ }
+
+ // JBAS-2117 - Don't skip the DOCUMENT_NODE
+ // if (node instanceof Document) node = ((Document)node).getDocumentElement();
+
+ if (wroteXMLDeclaration == false && writeXMLDeclaration == true && canonical == false)
+ {
+ out.print("<?xml version='1.0'");
+ if (charsetName != null)
+ out.print(" encoding='" + charsetName + "'");
+
+ out.print("?>");
+ if (prettyprint)
+ out.println();
+
+ wroteXMLDeclaration = true;
+ }
+
+ int type = node.getNodeType();
+ boolean hasChildNodes = node.getChildNodes().getLength() > 0;
+
+ String nodeName = node.getNodeName();
+ switch (type)
+ {
+ // print document
+ case Node.DOCUMENT_NODE:
+ {
+ NodeList children = node.getChildNodes();
+ for (int iChild = 0; iChild < children.getLength(); iChild++)
+ {
+ printInternal(children.item(iChild), false);
+ }
+ out.flush();
+ break;
+ }
+
+ // print element with attributes
+ case Node.ELEMENT_NODE:
+ {
+ Element element = (Element)node;
+ if (prettyprint)
+ {
+ for (int i = 0; i < prettyIndent; i++)
+ {
+ out.print(' ');
+ }
+ prettyIndent++;
+ }
+
+ out.print('<');
+ out.print(nodeName);
+
+ Map nsMap = new HashMap();
+ String elPrefix = node.getPrefix();
+ String elNamespaceURI = node.getNamespaceURI();
+ if (elPrefix != null)
+ {
+ String nsURI = getNamespaceURI(elPrefix, element, rootNode);
+ nsMap.put(elPrefix, nsURI);
+ }
+
+ Attr attrs[] = sortAttributes(node.getAttributes());
+ for (int i = 0; i < attrs.length; i++)
+ {
+ Attr attr = attrs[i];
+ String atPrefix = attr.getPrefix();
+ String atName = attr.getNodeName();
+ String atValue = normalize(attr.getNodeValue(), canonical);
+
+ if (atName.equals("xmlns"))
+ currentDefaultNamespace = atValue;
+
+ if (atPrefix != null && !atPrefix.equals("xmlns") && !atPrefix.equals("xml"))
+ {
+ String nsURI = getNamespaceURI(atPrefix, element, rootNode);
+ nsMap.put(atPrefix, nsURI);
+ // xsi:type='ns1:SubType', xsi:type='xsd:string'
+ if (atName.equals(atPrefix + ":type") && atValue.indexOf(":") > 0)
+ {
+ // xsi defined on the envelope
+ if (nsURI == null)
+ nsURI = getNamespaceURI(atPrefix, element, null);
+
+ if ("http://www.w3.org/2001/XMLSchema-instance".equals(nsURI))
+ {
+ String typePrefix = atValue.substring(0, atValue.indexOf(":"));
+ String typeURI = getNamespaceURI(typePrefix, element, rootNode);
+ nsMap.put(typePrefix, typeURI);
+ }
+ }
+ }
+
+ out.print(" " + atName + "='" + atValue + "'");
+ }
+
+ // Add namespace declaration for prefixes
+ // that are defined further up the tree
+ if (completeNamespaces)
+ {
+ Iterator itPrefix = nsMap.keySet().iterator();
+ while (itPrefix.hasNext())
+ {
+ String prefix = (String)itPrefix.next();
+ String nsURI = (String)nsMap.get(prefix);
+ if (nsURI == null)
+ {
+ nsURI = getNamespaceURI(prefix, element, null);
+ out.print(" xmlns:" + prefix + "='" + nsURI + "'");
+ }
+ }
+ }
+
+ // The SAX ContentHandler will by default not add the namespace declaration
+ // <Hello xmlns='http://somens'>World</Hello>
+ if (elPrefix == null && elNamespaceURI != null)
+ {
+ String defaultNamespace = element.getAttribute("xmlns");
+ if (defaultNamespace.length() == 0 && !elNamespaceURI.equals(currentDefaultNamespace))
+ {
+ out.print(" xmlns='" + elNamespaceURI + "'");
+ currentDefaultNamespace = elNamespaceURI;
+ }
+ }
+
+ if (hasChildNodes)
+ {
+ out.print('>');
+ }
+
+ // Find out if the end marker is indented
+ indentEndMarker = isEndMarkerIndented(node);
+
+ if (indentEndMarker)
+ {
+ out.print('\n');
+ }
+
+ NodeList childNodes = node.getChildNodes();
+ int len = childNodes.getLength();
+ for (int i = 0; i < len; i++)
+ {
+ Node childNode = childNodes.item(i);
+ printInternal(childNode, false);
+ }
+ break;
+ }
+
+ // handle entity reference nodes
+ case Node.ENTITY_REFERENCE_NODE:
+ {
+ if (canonical)
+ {
+ NodeList children = node.getChildNodes();
+ if (children != null)
+ {
+ int len = children.getLength();
+ for (int i = 0; i < len; i++)
+ {
+ printInternal(children.item(i), false);
+ }
+ }
+ }
+ else
+ {
+ out.print('&');
+ out.print(nodeName);
+ out.print(';');
+ }
+ break;
+ }
+
+ // print cdata sections
+ case Node.CDATA_SECTION_NODE:
+ {
+ if (canonical)
+ {
+ out.print(normalize(node.getNodeValue(), canonical));
+ }
+ else
+ {
+ out.print("<![CDATA[");
+ out.print(node.getNodeValue());
+ out.print("]]>");
+ }
+ break;
+ }
+
+ // print text
+ case Node.TEXT_NODE:
+ {
+ String text = normalize(node.getNodeValue(), canonical);
+ if (text.trim().length() > 0)
+ {
+ out.print(text);
+ }
+ else if (prettyprint == false && ignoreWhitespace == false)
+ {
+ out.print(text);
+ }
+ break;
+ }
+
+ // print processing instruction
+ case Node.PROCESSING_INSTRUCTION_NODE:
+ {
+ out.print("<?");
+ out.print(nodeName);
+ String data = node.getNodeValue();
+ if (data != null && data.length() > 0)
+ {
+ out.print(' ');
+ out.print(data);
+ }
+ out.print("?>");
+ break;
+ }
+
+ // print comment
+ case Node.COMMENT_NODE:
+ {
+ for (int i = 0; i < prettyIndent; i++)
+ {
+ out.print(' ');
+ }
+
+ out.print("<!--");
+ String data = node.getNodeValue();
+ if (data != null)
+ {
+ out.print(data);
+ }
+ out.print("-->");
+
+ if (prettyprint)
+ {
+ out.print('\n');
+ }
+
+ break;
+ }
+ }
+
+ if (type == Node.ELEMENT_NODE)
+ {
+ if (prettyprint)
+ prettyIndent--;
+
+ if (hasChildNodes == false)
+ {
+ out.print("/>");
+ }
+ else
+ {
+ if (indentEndMarker)
+ {
+ for (int i = 0; i < prettyIndent; i++)
+ {
+ out.print(' ');
+ }
+ }
+
+ out.print("</");
+ out.print(nodeName);
+ out.print('>');
+ }
+
+ if (prettyIndent > 0)
+ {
+ out.print('\n');
+ }
+ }
+ out.flush();
+ }
+
+ private String getNamespaceURI(String prefix, Element element, Node stopNode)
+ {
+ Node parent = element.getParentNode();
+ String nsURI = element.getAttribute("xmlns:" + prefix);
+ if (nsURI.length() == 0 && element != stopNode && parent instanceof Element)
+ return getNamespaceURI(prefix, (Element)parent, stopNode);
+
+ return (nsURI.length() > 0 ? nsURI : null);
+ }
+
+ private boolean isEndMarkerIndented(Node node)
+ {
+ if (prettyprint)
+ {
+ NodeList childNodes = node.getChildNodes();
+ int len = childNodes.getLength();
+ for (int i = 0; i < len; i++)
+ {
+ Node children = childNodes.item(i);
+ if (children.getNodeType() == Node.ELEMENT_NODE)
+ {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ /** Returns a sorted list of attributes. */
+ private Attr[] sortAttributes(NamedNodeMap attrs)
+ {
+
+ int len = (attrs != null) ? attrs.getLength() : 0;
+ Attr array[] = new Attr[len];
+ for (int i = 0; i < len; i++)
+ {
+ array[i] = (Attr)attrs.item(i);
+ }
+ for (int i = 0; i < len - 1; i++)
+ {
+ String name = array[i].getNodeName();
+ int index = i;
+ for (int j = i + 1; j < len; j++)
+ {
+ String curName = array[j].getNodeName();
+ if (curName.compareTo(name) < 0)
+ {
+ name = curName;
+ index = j;
+ }
+ }
+ if (index != i)
+ {
+ Attr temp = array[i];
+ array[i] = array[index];
+ array[index] = temp;
+ }
+ }
+ return (array);
+ }
+
+ /** Normalizes the given string. */
+ public static String normalize(String s, boolean canonical)
+ {
+ StringBuffer str = new StringBuffer();
+
+ int len = (s != null) ? s.length() : 0;
+ for (int i = 0; i < len; i++)
+ {
+ char ch = s.charAt(i);
+ switch (ch)
+ {
+ case '<':
+ {
+ str.append("<");
+ break;
+ }
+ case '>':
+ {
+ str.append(">");
+ break;
+ }
+ case '&':
+ {
+ str.append("&");
+ break;
+ }
+ case '"':
+ {
+ str.append(""");
+ break;
+ }
+ case '\'':
+ {
+ str.append("'");
+ break;
+ }
+ case '\r':
+ case '\n':
+ {
+ if (canonical)
+ {
+ str.append("&#");
+ str.append(Integer.toString(ch));
+ str.append(';');
+ break;
+ }
+ // else, default append char
+ }
+ default:
+ {
+ str.append(ch);
+ }
+ }
+ }
+ return (str.toString());
+ }
+}
\ No newline at end of file
Added: report-server/trunk/core/src/main/java/org/jboss/bpm/report/util/FileWriter.java
===================================================================
--- report-server/trunk/core/src/main/java/org/jboss/bpm/report/util/FileWriter.java (rev 0)
+++ report-server/trunk/core/src/main/java/org/jboss/bpm/report/util/FileWriter.java 2009-10-29 12:12:49 UTC (rev 866)
@@ -0,0 +1,67 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY 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 along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.report.util;
+
+import javax.ws.rs.ext.Provider;
+import javax.ws.rs.ext.MessageBodyWriter;
+import javax.ws.rs.Produces;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import java.lang.reflect.Type;
+import java.lang.annotation.Annotation;
+import java.io.OutputStream;
+import java.io.IOException;
+import java.io.FileInputStream;
+import java.io.File;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+@Provider
+@Produces({"text/html", "image/*"})
+public class FileWriter implements MessageBodyWriter
+{
+
+ public boolean isWriteable(Class aClass, Type type, Annotation[] annotations, MediaType mediaType)
+ {
+ return aClass.equals(java.io.File.class);
+ }
+
+ public long getSize(Object o, Class aClass, Type type, Annotation[] annotations, MediaType mediaType)
+ {
+ return ((File)o).length();
+ }
+
+ public void writeTo(Object o, Class aClass, Type type, Annotation[] annotations, MediaType mediaType, MultivaluedMap multivaluedMap, OutputStream outputStream) throws IOException, WebApplicationException
+ {
+ FileInputStream fin = new FileInputStream((File)o);
+ int c;
+ while ((c = fin.read()) != -1)
+ {
+ outputStream.write(c);
+ }
+
+ fin.close();
+
+ }
+}
Modified: report-server/trunk/pom.xml
===================================================================
--- report-server/trunk/pom.xml 2009-10-29 12:11:43 UTC (rev 865)
+++ report-server/trunk/pom.xml 2009-10-29 12:12:49 UTC (rev 866)
@@ -15,6 +15,7 @@
</parent>
<properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<commons.logging.version>1.1.1</commons.logging.version>
<junit.version>3.8.1</junit.version>
<resteasy.version>1.0.2.GA</resteasy.version>
Modified: report-server/trunk/server/src/main/webapp/WEB-INF/web.xml
===================================================================
--- report-server/trunk/server/src/main/webapp/WEB-INF/web.xml 2009-10-29 12:11:43 UTC (rev 865)
+++ report-server/trunk/server/src/main/webapp/WEB-INF/web.xml 2009-10-29 12:12:49 UTC (rev 866)
@@ -17,7 +17,7 @@
<context-param>
<param-name>resteasy.providers</param-name>
- <param-value>org.jboss.bpm.report.FileWriter</param-value>
+ <param-value>org.jboss.bpm.report.util.FileWriter</param-value>
</context-param>
<listener>
Modified: report-server/trunk/shared/src/main/java/org/jboss/bpm/report/model/ReportParameter.java
===================================================================
--- report-server/trunk/shared/src/main/java/org/jboss/bpm/report/model/ReportParameter.java 2009-10-29 12:11:43 UTC (rev 865)
+++ report-server/trunk/shared/src/main/java/org/jboss/bpm/report/model/ReportParameter.java 2009-10-29 12:12:49 UTC (rev 866)
@@ -31,7 +31,7 @@
private String name;
private String helptext;
- private String displayName;
+ private String promptText;
private Type type;
private DataType dataType = DataType.STRING;
@@ -62,14 +62,14 @@
this.helptext = helptext;
}
- public String getDisplayName()
+ public String getPromptText()
{
- return displayName;
+ return promptText;
}
- public void setDisplayName(String displayName)
+ public void setPromptText(String promptText)
{
- this.displayName = displayName;
+ this.promptText = promptText;
}
public DataType getDataType()
14 years, 6 months
- 1
- 0
Overlord SVN: r865 - in bpm-console/trunk: gui/war/src/main/java/org/jboss/bpm/console/client/common and 3 other directories.
by overlord-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-10-29 08:11:43 -0400 (Thu, 29 Oct 2009)
New Revision: 865
Removed:
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportGroup.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportParameter.java
Modified:
bpm-console/trunk/BPMC.iws
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/IconHeader.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/CoverPanel.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/UpdateReportConfigAction.java
bpm-console/trunk/server/war/src/main/webapp/WEB-INF/web.xml
Log:
More work on report launchpad
Modified: bpm-console/trunk/BPMC.iws
===================================================================
--- bpm-console/trunk/BPMC.iws 2009-10-28 20:37:57 UTC (rev 864)
+++ bpm-console/trunk/BPMC.iws 2009-10-29 12:11:43 UTC (rev 865)
@@ -91,6 +91,21 @@
<disable_hints />
</component>
<component name="DebuggerManager">
+ <line_breakpoints>
+ <breakpoint url="file:///Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm/report/BirtService.java" line="169" class="org.jboss.bpm.report.BirtService" package="org.jboss.bpm.report">
+ <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" />
@@ -163,74 +178,33 @@
<component name="FileColors" enabled="false" enabledForTabs="false" />
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="BPMReport.gwt.xml" pinned="false" current="false" current-in-tab="false">
- <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main/resources/org/jboss/bpm/report/BPMReport.gwt.xml">
+ <file leaf-file-name="CoverPanel.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/CoverPanel.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="1" column="21" selection-start="30" selection-end="30" vertical-scroll-proportion="0.025518341">
+ <state line="81" column="37" selection-start="3207" selection-end="3207" vertical-scroll-proportion="0.2916129">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Application.gwt.xml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml">
+ <file leaf-file-name="IconHeader.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/IconHeader.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="24" selection-start="8" selection-end="8" vertical-scroll-proportion="0.0">
+ <state line="40" column="82" selection-start="1655" selection-end="1655" vertical-scroll-proportion="0.32405064">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="UpdateReportConfigAction.java" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/UpdateReportConfigAction.java">
+ <file leaf-file-name="ReportReference.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main/java/org/jboss/bpm/report/model/ReportReference.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="69" column="28" selection-start="2435" selection-end="2435" vertical-scroll-proportion="0.7703349">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="31" column="19" selection-start="1240" selection-end="1240" vertical-scroll-proportion="0.1493671">
+ <folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="DTOParser.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="400" column="82" selection-start="13392" selection-end="13392" vertical-scroll-proportion="0.5816994">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="ReportView.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="107" column="19" selection-start="3360" selection-end="3360" vertical-scroll-proportion="0.7124183">
- <folding>
- <marker date="1256761451000" expanded="false" signature="0:1031" placeholder="/.../" />
- <marker date="1256761451000" expanded="true" signature="1821:1875" placeholder="/**...*/" />
- <marker date="1256761451000" expanded="true" signature="2144:2297" placeholder="{...}" />
- <marker date="1256761451000" expanded="true" signature="2334:2365" placeholder="{...}" />
- <marker date="1256761451000" expanded="true" signature="2396:3110" placeholder="{...}" />
- <marker date="1256761451000" expanded="true" signature="3165:3204" placeholder="{...}" />
- <marker date="1256761451000" expanded="true" signature="3265:3405" placeholder="{...}" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="CoverPanel.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/CoverPanel.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="76" column="0" selection-start="2952" selection-end="2952" vertical-scroll-proportion="0.9411765">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
</leaf>
</component>
<component name="FindManager">
@@ -539,120 +513,6 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/shared" />
- <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="report-server" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/shared" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/shared/src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main/resources" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main/resources/org" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main/resources/org/jboss" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main/resources/org/jboss/bpm" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main/resources/org/jboss/bpm/report" />
- <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="report-server" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/shared" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/shared/src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main/java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main/java/org" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/shared/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:/Users/hbraun/dev/prj/soag/report-server/trunk/shared/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:/Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main/java/org/jboss/bpm/report" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main/java/org/jboss/bpm/report/model" />
- <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="report-server" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/core" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
@@ -716,18 +576,6 @@
<option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/core/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:/Users/hbraun/dev/prj/soag/report-server/trunk/core/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:/Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm/report" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -1068,7 +916,7 @@
<showLibraryContents />
<hideEmptyPackages PackagesPane="false" ProjectPane="false" />
<abbreviatePackageNames />
- <showStructure PackagesPane="false" ProjectPane="false" Scope="false" Favorites="false" />
+ <showStructure Favorites="false" PackagesPane="false" Scope="false" ProjectPane="false" />
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
@@ -1109,31 +957,15 @@
<recent name="" />
</key>
<key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
+ <recent name="org.jboss.bpm.report.util" />
<recent name="org.jboss.bpm.report.model" />
<recent name="org.jboss.bpm.console.server" />
<recent name="org.jboss.bpm.console.client" />
<recent name="org.jboss.bpm.console.client.sam" />
- <recent name="org.jboss.bpm.console.client.util" />
</key>
</component>
<component name="RestoreUpdateTree" />
<component name="RunManager" selected="Remote.server">
- <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="AntTarget" value="false" />
- <option name="Maven.BeforeRunTask" value="false" />
- <option name="Make" value="false" />
- <option name="BuildArtifacts" value="false" />
- </method>
- </configuration>
<configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
<module name="" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -1156,6 +988,22 @@
<option name="BuildArtifacts" value="false" />
</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="AntTarget" value="false" />
+ <option name="Maven.BeforeRunTask" value="false" />
+ <option name="Make" value="false" />
+ <option name="BuildArtifacts" value="false" />
+ </method>
+ </configuration>
<configuration default="true" type="Remote" factoryName="Remote">
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
@@ -1347,16 +1195,16 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="0" y="22" width="1280" height="774" extended-state="6" />
+ <frame x="420" y="51" width="1217" height="937" 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="14" />
<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.31437856" order="0" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.38847858" order="1" />
- <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22420797" order="1" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32363012" order="0" />
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.38809523" order="1" />
+ <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2234589" order="1" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32992035" order="9" />
<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="7" />
@@ -1368,7 +1216,7 @@
<window_info id="Maven" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="12" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24818695" 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="6" />
- <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.38869664" order="4" />
+ <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.38809523" 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="13" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32873562" order="8" />
@@ -1463,153 +1311,145 @@
<option name="myLastEditedConfigurable" />
</component>
<component name="editorHistoryManager">
- <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/pom.xml">
+ <entry file="file://$PROJECT_DIR$/gui/war/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="120" column="2" selection-start="3485" selection-end="3485" vertical-scroll-proportion="0.7385621">
- <folding />
+ <state line="160" column="65" selection-start="4545" selection-end="4545" vertical-scroll-proportion="0.026143791">
+ <folding>
+ <marker date="1256760848000" expanded="true" signature="10145:16658" placeholder="..." />
+ <marker date="1256760848000" expanded="false" signature="10145:11484" placeholder="..." />
+ <marker date="1256760848000" expanded="false" signature="10145:10164" placeholder="..." />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main/java/org/jboss/bpm/report/model/ReportParameter.java">
+ <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main/resources/org/jboss/bpm/report/BPMReport.gwt.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="23" column="31" selection-start="1072" selection-end="1072" vertical-scroll-proportion="0.07655502">
+ <state line="1" column="21" selection-start="30" selection-end="30" vertical-scroll-proportion="0.020253165">
<folding />
</state>
</provider>
</entry>
- <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main/java/org/jboss/bpm/report/model/ReportReference.java">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="39" column="9" selection-start="1439" selection-end="1439" vertical-scroll-proportion="0.33333334">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="0" column="24" selection-start="8" selection-end="8" vertical-scroll-proportion="0.0">
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/task/UpdateDetailsAction.java">
+ <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm/report/JMXServerConfig.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="31" column="13" selection-start="1338" selection-end="1338" vertical-scroll-proportion="0.20414673">
+ <state line="34" column="13" selection-start="1314" selection-end="1314" vertical-scroll-proportion="0.22709678">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDetailView.java">
+ <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm/report/util/DOMWriter.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="33" column="69" selection-start="1619" selection-end="1619" vertical-scroll-proportion="0.078431375">
+ <state line="81" column="13" selection-start="3277" selection-end="3277" vertical-scroll-proportion="0.33290324">
<folding />
</state>
</provider>
</entry>
- <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/shared/pom.xml">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="6" column="78" selection-start="231" selection-end="231" vertical-scroll-proportion="0.030303031">
- <folding />
+ <state line="107" column="19" selection-start="3360" selection-end="3360" vertical-scroll-proportion="0.9380645">
+ <folding>
+ <marker date="1256761451000" expanded="false" signature="0:1031" placeholder="/.../" />
+ <marker date="1256761451000" expanded="true" signature="1821:1875" placeholder="/**...*/" />
+ <marker date="1256761451000" expanded="true" signature="2144:2297" placeholder="{...}" />
+ <marker date="1256761451000" expanded="true" signature="2334:2365" placeholder="{...}" />
+ <marker date="1256761451000" expanded="true" signature="2396:3110" placeholder="{...}" />
+ <marker date="1256761451000" expanded="true" signature="3165:3204" placeholder="{...}" />
+ <marker date="1256761451000" expanded="true" signature="3265:3405" placeholder="{...}" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm/report/BirtService.java">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/UpdateReportConfigAction.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="51" column="13" selection-start="1977" selection-end="1977" vertical-scroll-proportion="0.33333334">
- <folding>
- <marker date="1256755537000" expanded="true" signature="0:1031" placeholder="/.../" />
- <element signature="imports" expanded="true" />
- <marker date="1256755537000" expanded="true" signature="1537:1963" placeholder="/**...*/" />
- <marker date="1256755537000" expanded="true" signature="2155:2199" placeholder="{...}" />
- <marker date="1256755537000" expanded="true" signature="2493:2526" placeholder="{...}" />
- <marker date="1256755537000" expanded="true" signature="2574:3112" placeholder="{...}" />
- <marker date="1256755537000" expanded="true" signature="3149:3584" placeholder="{...}" />
- <marker date="1256755537000" expanded="true" signature="3320:3458" placeholder="{...}" />
- <marker date="1256755537000" expanded="true" signature="3387:3448" placeholder="{...}" />
- <marker date="1256755537000" expanded="true" signature="3650:6415" placeholder="{...}" />
- <marker date="1256755537000" expanded="true" signature="6492:6593" placeholder="{...}" />
- <marker date="1256755537000" expanded="true" signature="6651:6888" placeholder="{...}" />
- <marker date="1256755537000" expanded="true" signature="6711:6861" placeholder="{...}" />
- <marker date="1256755537000" expanded="true" signature="6751:6851" placeholder="{...}" />
- <marker date="1256755537000" expanded="true" signature="6914:7089" placeholder="{...}" />
- <marker date="1256755537000" expanded="true" signature="7114:7288" placeholder="{...}" />
- <marker date="1256755537000" expanded="true" signature="7316:7462" placeholder="{...}" />
- <marker date="1256755537000" expanded="true" signature="7466:7865" placeholder="/**...*/" />
- <marker date="1256755537000" expanded="false" signature="7916:10643" placeholder="{...}" />
- <marker date="1256755537000" expanded="true" signature="10732:10971" placeholder="{...}" />
- <marker date="1256755537000" expanded="true" signature="11025:11050" placeholder="{...}" />
- <marker date="1256755537000" expanded="true" signature="11114:11181" placeholder="{...}" />
- <marker date="1256755537000" expanded="true" signature="11218:11248" placeholder="{...}" />
- <marker date="1256755537000" expanded="true" signature="11305:11648" placeholder="{...}" />
- </folding>
+ <state line="73" column="51" selection-start="2476" selection-end="2476" vertical-scroll-proportion="0.87848103">
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/WidgetWindowPanel.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="40" column="13" selection-start="1675" selection-end="1675" vertical-scroll-proportion="-1.8235294">
+ <state line="41" column="9" selection-start="1625" selection-end="1625" vertical-scroll-proportion="0.18987341">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/pom.xml">
+ <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm/report/BirtService.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="160" column="65" selection-start="4545" selection-end="4545" vertical-scroll-proportion="0.026143791">
+ <state line="212" column="45" selection-start="7035" selection-end="7035" vertical-scroll-proportion="0.58064514">
<folding>
- <marker date="1256760848000" expanded="true" signature="10145:16658" placeholder="..." />
- <marker date="1256760848000" expanded="false" signature="10145:11484" placeholder="..." />
- <marker date="1256760848000" expanded="false" signature="10145:10164" placeholder="..." />
+ <marker date="1256807807000" expanded="false" signature="0:1031" placeholder="/.../" />
+ <element signature="imports" expanded="true" />
+ <marker date="1256807807000" expanded="true" signature="1537:1963" placeholder="/**...*/" />
+ <marker date="1256807807000" expanded="true" signature="2155:2199" placeholder="{...}" />
+ <marker date="1256807807000" expanded="true" signature="2493:2526" placeholder="{...}" />
+ <marker date="1256807807000" expanded="true" signature="2574:3109" placeholder="{...}" />
+ <marker date="1256807807000" expanded="true" signature="3146:3575" placeholder="{...}" />
+ <marker date="1256807807000" expanded="true" signature="3317:3455" placeholder="{...}" />
+ <marker date="1256807807000" expanded="true" signature="3384:3445" placeholder="{...}" />
+ <marker date="1256807807000" expanded="true" signature="3641:6440" placeholder="{...}" />
+ <marker date="1256807807000" expanded="true" signature="6515:6577" placeholder="{...}" />
+ <marker date="1256807807000" expanded="true" signature="6635:6872" placeholder="{...}" />
+ <marker date="1256807807000" expanded="true" signature="6695:6845" placeholder="{...}" />
+ <marker date="1256807807000" expanded="true" signature="6735:6835" placeholder="{...}" />
+ <marker date="1256807807000" expanded="true" signature="6898:7073" placeholder="{...}" />
+ <marker date="1256807807000" expanded="true" signature="7098:7272" placeholder="{...}" />
+ <marker date="1256807807000" expanded="true" signature="7300:7446" placeholder="{...}" />
+ <marker date="1256807807000" expanded="true" signature="7450:7849" placeholder="/**...*/" />
+ <marker date="1256807807000" expanded="false" signature="7900:10627" placeholder="{...}" />
+ <marker date="1256807807000" expanded="true" signature="10716:10955" placeholder="{...}" />
+ <marker date="1256807807000" expanded="true" signature="11009:11034" placeholder="{...}" />
+ <marker date="1256807807000" expanded="true" signature="11098:11165" placeholder="{...}" />
+ <marker date="1256807807000" expanded="true" signature="11202:11232" placeholder="{...}" />
+ <marker date="1256807807000" expanded="true" signature="11289:11632" placeholder="{...}" />
</folding>
</state>
</provider>
</entry>
- <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main/resources/org/jboss/bpm/report/BPMReport.gwt.xml">
+ <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm/report/util/BirtUtil.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="1" column="21" selection-start="30" selection-end="30" vertical-scroll-proportion="0.025518341">
+ <state line="106" column="30" selection-start="4345" selection-end="4356" vertical-scroll-proportion="0.6606452">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml">
+ <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main/java/org/jboss/bpm/report/model/ReportParameter.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="24" selection-start="8" selection-end="8" vertical-scroll-proportion="0.0">
+ <state line="33" column="22" selection-start="1354" selection-end="1354" vertical-scroll-proportion="-0.15443037">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java">
+ <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main/java/org/jboss/bpm/report/model/ReportReference.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="400" column="82" selection-start="13392" selection-end="13392" vertical-scroll-proportion="0.5816994">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="31" column="19" selection-start="1240" selection-end="1240" vertical-scroll-proportion="0.1493671">
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/CoverPanel.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="107" column="19" selection-start="3360" selection-end="3360" vertical-scroll-proportion="0.7124183">
- <folding>
- <marker date="1256761451000" expanded="false" signature="0:1031" placeholder="/.../" />
- <marker date="1256761451000" expanded="true" signature="1821:1875" placeholder="/**...*/" />
- <marker date="1256761451000" expanded="true" signature="2144:2297" placeholder="{...}" />
- <marker date="1256761451000" expanded="true" signature="2334:2365" placeholder="{...}" />
- <marker date="1256761451000" expanded="true" signature="2396:3110" placeholder="{...}" />
- <marker date="1256761451000" expanded="true" signature="3165:3204" placeholder="{...}" />
- <marker date="1256761451000" expanded="true" signature="3265:3405" placeholder="{...}" />
- </folding>
+ <state line="81" column="37" selection-start="3207" selection-end="3207" vertical-scroll-proportion="0.2916129">
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/CoverPanel.java">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="76" column="0" selection-start="2952" selection-end="2952" vertical-scroll-proportion="0.9411765">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="387" column="0" selection-start="12311" selection-end="12311" vertical-scroll-proportion="0.23544304">
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/UpdateReportConfigAction.java">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/IconHeader.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="69" column="28" selection-start="2435" selection-end="2435" vertical-scroll-proportion="0.7703349">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="40" column="82" selection-start="1655" selection-end="1655" vertical-scroll-proportion="0.32405064">
+ <folding />
</state>
</provider>
</entry>
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/IconHeader.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/IconHeader.java 2009-10-28 20:37:57 UTC (rev 864)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/IconHeader.java 2009-10-29 12:11:43 UTC (rev 865)
@@ -38,7 +38,7 @@
super(new BoxLayout(BoxLayout.Orientation.HORIZONTAL));
setPadding(5);
- this.add(icon.createImage());
- this.add(new HTML(title));
+ this.add(icon.createImage());
+ this.add(new HTML("<b>"+title+"</b>"));
}
}
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java 2009-10-28 20:37:57 UTC (rev 864)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java 2009-10-29 12:11:43 UTC (rev 865)
@@ -25,6 +25,7 @@
import org.jboss.bpm.console.client.util.ConsoleLog;
import org.jboss.bpm.console.client.util.JSONWalk;
import org.jboss.bpm.report.model.ReportReference;
+import org.jboss.bpm.report.model.ReportParameter;
import java.util.ArrayList;
import java.util.Date;
@@ -384,13 +385,7 @@
{
JSONValue root = JSONParser.parse(json);
List<ReportReference> results = new ArrayList<ReportReference>();
-
- //[{"title":"No title","description":"No description","reportFileName":"specific_system_overview.rptdesign",
- // "parameterMetaData":[{"name":"startDate","type":"TEXTBOX","dataType":"DATETIME"},
- // {"name":"endDate","type":"TEXTBOX","dataType":"DATETIME"},
- // {"name":"startDate","type":"TEXTBOX","dataType":"DATETIME"}]},
- // {"title":"System Overview","description":"No description","reportFileName":"overall_activity.rptdesign","parameterMetaData":[]},{"title":"No title","description":"No description","reportFileName":"overall_activity_old.rptdesign","parameterMetaData":[]},{"title":"No title","description":"No description","reportFileName":"process_summary.rptdesign","parameterMetaData":[{"name":"procId","type":"TEXTBOX","dataType":"STRING"}]}]
-
+
JSONArray jsonArray = root.isArray();
for (int i = 0; i < jsonArray.size(); i++)
{
@@ -403,6 +398,30 @@
reportRef.setTitle(title);
reportRef.setDescription(description);
+ // parameter
+ JSONArray params = JSONWalk.on(item).next("parameterMetaData").asArray();
+ for (int x=0; x < params.size(); x++)
+ {
+ JSONValue p = params.get(x);
+ String name = JSONWalk.on(p).next("name").asString();
+ String type = JSONWalk.on(p).next("type").asString();
+ String dataType = JSONWalk.on(p).next("dataType").asString();
+
+ ReportParameter pmd = new ReportParameter(name, ReportParameter.Type.valueOf(type));
+ pmd.setDataType(ReportParameter.DataType.valueOf(dataType));
+
+ // optional values
+ JSONWalk.JSONWrapper help = JSONWalk.on(p).next("helptext");
+ if(help!=null)
+ pmd.setHelptext(help.asString());
+
+ JSONWalk.JSONWrapper prompt = JSONWalk.on(p).next("promptText");
+ if(prompt!=null)
+ pmd.setPromptText(prompt.asString());
+
+ reportRef.getParameterMetaData().add(pmd);
+ }
+
results.add(reportRef);
}
return results;
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/CoverPanel.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/CoverPanel.java 2009-10-28 20:37:57 UTC (rev 864)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/CoverPanel.java 2009-10-29 12:11:43 UTC (rev 865)
@@ -75,14 +75,18 @@
//p.add(new HeaderLabel(group.name));
LayoutPanel inner = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL));
+ // a single report description
LayoutPanel row = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.HORIZONTAL));
+
+ LayoutPanel desc = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL));
IconHeader header = new IconHeader(icons.pieceIcon(), reportRef.getTitle());
header.setWidth("95%");
- row.add(
- header,
- new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)
- );
+ desc.add(header);
+ String description = reportRef.getDescription()!=null ? reportRef.getDescription() : "";
+ desc.add(new HTML(description));
+ row.add(desc,new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
+ // render button
row.add(new Button("Render",
new ClickListener()
{
@@ -90,7 +94,7 @@
{
if(hasParameters)
{
- window = new WidgetWindowPanel("Hello World", createForm(reportRef));
+ window = new WidgetWindowPanel("Report Parameter", createForm(reportRef));
}
else
{
@@ -108,7 +112,7 @@
inner.add(row, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
- this.add(inner, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH));
+ this.add(inner, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
}
@@ -134,7 +138,10 @@
final List<TextBox> inputFields = new ArrayList<TextBox>();
for(ReportParameter reportParam : reportRef.getParameterMetaData())
{
- grid.setWidget(row,0, new Label(reportParam.getDisplayName()));
+ String promptText = reportParam.getPromptText() != null ? reportParam.getPromptText() : reportParam.getName();
+ String helpText = reportParam.getHelptext() != null ? reportParam.getHelptext() : "";
+
+ grid.setWidget(row,0, new HTML("<h4>"+promptText+"</h4>"+helpText));
TextBox textBox = new TextBox();
inputFields.add(textBox);
grid.setWidget(row,1, textBox);
Deleted: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportGroup.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportGroup.java 2009-10-28 20:37:57 UTC (rev 864)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportGroup.java 2009-10-29 12:11:43 UTC (rev 865)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY 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 along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.console.client.report;
-
-import java.util.List;
-import java.util.ArrayList;
-
-/**
- * @author Heiko.Braun <heiko.braun(a)jboss.com>
- */
-class ReportGroup
-{
- String name;
- List<ReportParameter> params = new ArrayList<ReportParameter>();
- List<ReportRef> reports = new ArrayList<ReportRef>();
-}
Deleted: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportParameter.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportParameter.java 2009-10-28 20:37:57 UTC (rev 864)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportParameter.java 2009-10-29 12:11:43 UTC (rev 865)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY 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 along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.console.client.report;
-
-/**
- * @author Heiko.Braun <heiko.braun(a)jboss.com>
- */
-public final class ReportParameter
-{
- String name;
- String desc;
-
-
- public ReportParameter(String name, String desc)
- {
- this.name = name;
- this.desc = desc;
- }
-}
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/UpdateReportConfigAction.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/UpdateReportConfigAction.java 2009-10-28 20:37:57 UTC (rev 864)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/UpdateReportConfigAction.java 2009-10-29 12:11:43 UTC (rev 865)
@@ -65,6 +65,7 @@
final Controller controller, final Object event, Response response)
{
String json = response.getText();
+ System.out.println(json);
List<ReportReference> reports = DTOParser.parseReportConfig(json);
ReportView view = (ReportView)controller.getView(ReportView.ID);
view.configure(reports);
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-10-28 20:37:57 UTC (rev 864)
+++ bpm-console/trunk/server/war/src/main/webapp/WEB-INF/web.xml 2009-10-29 12:11:43 UTC (rev 865)
@@ -17,7 +17,7 @@
<context-param>
<param-name>resteasy.providers</param-name>
- <param-value>org.jboss.bpm.report.FileWriter</param-value>
+ <param-value>org.jboss.bpm.report.util.FileWriter</param-value>
</context-param>
<filter>
14 years, 6 months
- 1
- 0
Overlord SVN: r864 - in bpm-console/trunk: gui/war/src/main/java/org/jboss/bpm/console/client/model and 2 other directories.
by overlord-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-10-28 16:37:57 -0400 (Wed, 28 Oct 2009)
New Revision: 864
Modified:
bpm-console/trunk/BPMC.iws
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/CoverPanel.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/UpdateReportConfigAction.java
bpm-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml
Log:
Depend on BPM report model to initialize report editor
Modified: bpm-console/trunk/BPMC.iws
===================================================================
--- bpm-console/trunk/BPMC.iws 2009-10-28 20:36:52 UTC (rev 863)
+++ bpm-console/trunk/BPMC.iws 2009-10-28 20:37:57 UTC (rev 864)
@@ -163,10 +163,28 @@
<component name="FileColors" enabled="false" enabledForTabs="false" />
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="UpdateReportConfigAction.java" pinned="false" current="false" current-in-tab="false">
+ <file leaf-file-name="BPMReport.gwt.xml" pinned="false" current="false" current-in-tab="false">
+ <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main/resources/org/jboss/bpm/report/BPMReport.gwt.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="1" column="21" selection-start="30" selection-end="30" vertical-scroll-proportion="0.025518341">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="Application.gwt.xml" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="0" column="24" selection-start="8" selection-end="8" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="UpdateReportConfigAction.java" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/UpdateReportConfigAction.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="67" column="6" selection-start="2321" selection-end="2321" vertical-scroll-proportion="1.7097288">
+ <state line="69" column="28" selection-start="2435" selection-end="2435" vertical-scroll-proportion="0.7703349">
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -174,10 +192,10 @@
</provider>
</entry>
</file>
- <file leaf-file-name="DTOParser.java" pinned="false" current="true" current-in-tab="true">
+ <file leaf-file-name="DTOParser.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="407" column="5" selection-start="13551" selection-end="13551" vertical-scroll-proportion="10.117647">
+ <state line="400" column="82" selection-start="13392" selection-end="13392" vertical-scroll-proportion="0.5816994">
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -185,6 +203,34 @@
</provider>
</entry>
</file>
+ <file leaf-file-name="ReportView.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="107" column="19" selection-start="3360" selection-end="3360" vertical-scroll-proportion="0.7124183">
+ <folding>
+ <marker date="1256761451000" expanded="false" signature="0:1031" placeholder="/.../" />
+ <marker date="1256761451000" expanded="true" signature="1821:1875" placeholder="/**...*/" />
+ <marker date="1256761451000" expanded="true" signature="2144:2297" placeholder="{...}" />
+ <marker date="1256761451000" expanded="true" signature="2334:2365" placeholder="{...}" />
+ <marker date="1256761451000" expanded="true" signature="2396:3110" placeholder="{...}" />
+ <marker date="1256761451000" expanded="true" signature="3165:3204" placeholder="{...}" />
+ <marker date="1256761451000" expanded="true" signature="3265:3405" placeholder="{...}" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="CoverPanel.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/CoverPanel.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="76" column="0" selection-start="2952" selection-end="2952" vertical-scroll-proportion="0.9411765">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
</leaf>
</component>
<component name="FindManager">
@@ -523,6 +569,52 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main/resources" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main/resources/org" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main/resources/org/jboss" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main/resources/org/jboss/bpm" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main/resources/org/jboss/bpm/report" />
+ <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="report-server" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/shared" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/shared/src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main/java" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
@@ -723,6 +815,74 @@
<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/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/resources/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/resources/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/resources/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>
@@ -756,7 +916,145 @@
<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/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_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client" />
+ <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_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client" />
+ <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/client/report" />
+ <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>
</subPane>
</component>
<component name="ProjectReloadState">
@@ -1165,55 +1463,6 @@
<option name="myLastEditedConfigurable" />
</component>
<component name="editorHistoryManager">
- <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm/report/BirtEngineFactory.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="34" column="13" selection-start="1507" selection-end="1507" vertical-scroll-proportion="0.26143792">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm/report/ReportFacade.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="219" column="56" selection-start="6879" selection-end="6879" vertical-scroll-proportion="0.6862745">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm/report/util/BirtUtil.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="97" column="37" selection-start="3832" selection-end="3832" vertical-scroll-proportion="0.59477127">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="147" column="46" selection-start="4740" selection-end="4740" vertical-scroll-proportion="0.65849674">
- <folding>
- <marker date="1256756994000" expanded="false" signature="0:1031" placeholder="/.../" />
- <marker date="1256756994000" expanded="true" signature="1770:1824" placeholder="/**...*/" />
- <marker date="1256756994000" expanded="true" signature="2093:2246" placeholder="{...}" />
- <marker date="1256756994000" expanded="true" signature="2283:2314" placeholder="{...}" />
- <marker date="1256756994000" expanded="true" signature="2345:3059" placeholder="{...}" />
- <marker date="1256756994000" expanded="true" signature="3114:3153" placeholder="{...}" />
- <marker date="1256756994000" expanded="true" signature="3203:4830" placeholder="{...}" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/core/pom.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state line="25" column="24" selection-start="809" selection-end="809" vertical-scroll-proportion="0.52287585">
- <folding>
- <element signature="tag#parent#0;tag#project#0" expanded="false" />
- </folding>
- </state>
- </provider>
- </entry>
<entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/pom.xml">
<provider selected="true" editor-type-id="text-editor">
<state line="120" column="2" selection-start="3485" selection-end="3485" vertical-scroll-proportion="0.7385621">
@@ -1251,15 +1500,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/pom.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state line="58" column="56" selection-start="1688" selection-end="1688" vertical-scroll-proportion="0.8169935">
- <folding>
- <marker date="1256759001000" expanded="true" signature="1688:1705" placeholder="..." />
- </folding>
- </state>
- </provider>
- </entry>
<entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/shared/pom.xml">
<provider selected="true" editor-type-id="text-editor">
<state line="6" column="78" selection-start="231" selection-end="231" vertical-scroll-proportion="0.030303031">
@@ -1299,24 +1539,80 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/UpdateReportConfigAction.java">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="67" column="6" selection-start="2321" selection-end="2321" vertical-scroll-proportion="1.7097288">
+ <state line="40" column="13" selection-start="1675" selection-end="1675" vertical-scroll-proportion="-1.8235294">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/gui/war/pom.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="160" column="65" selection-start="4545" selection-end="4545" vertical-scroll-proportion="0.026143791">
<folding>
- <element signature="imports" expanded="true" />
+ <marker date="1256760848000" expanded="true" signature="10145:16658" placeholder="..." />
+ <marker date="1256760848000" expanded="false" signature="10145:11484" placeholder="..." />
+ <marker date="1256760848000" expanded="false" signature="10145:10164" placeholder="..." />
</folding>
</state>
</provider>
</entry>
+ <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main/resources/org/jboss/bpm/report/BPMReport.gwt.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="1" column="21" selection-start="30" selection-end="30" vertical-scroll-proportion="0.025518341">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="0" column="24" selection-start="8" selection-end="8" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="407" column="5" selection-start="13551" selection-end="13551" vertical-scroll-proportion="10.117647">
+ <state line="400" column="82" selection-start="13392" selection-end="13392" vertical-scroll-proportion="0.5816994">
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="107" column="19" selection-start="3360" selection-end="3360" vertical-scroll-proportion="0.7124183">
+ <folding>
+ <marker date="1256761451000" expanded="false" signature="0:1031" placeholder="/.../" />
+ <marker date="1256761451000" expanded="true" signature="1821:1875" placeholder="/**...*/" />
+ <marker date="1256761451000" expanded="true" signature="2144:2297" placeholder="{...}" />
+ <marker date="1256761451000" expanded="true" signature="2334:2365" placeholder="{...}" />
+ <marker date="1256761451000" expanded="true" signature="2396:3110" placeholder="{...}" />
+ <marker date="1256761451000" expanded="true" signature="3165:3204" placeholder="{...}" />
+ <marker date="1256761451000" expanded="true" signature="3265:3405" placeholder="{...}" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/CoverPanel.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="76" column="0" selection-start="2952" selection-end="2952" vertical-scroll-proportion="0.9411765">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/UpdateReportConfigAction.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="69" column="28" selection-start="2435" selection-end="2435" vertical-scroll-proportion="0.7703349">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
</component>
</project>
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java 2009-10-28 20:36:52 UTC (rev 863)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java 2009-10-28 20:37:57 UTC (rev 864)
@@ -24,6 +24,7 @@
import com.google.gwt.json.client.*;
import org.jboss.bpm.console.client.util.ConsoleLog;
import org.jboss.bpm.console.client.util.JSONWalk;
+import org.jboss.bpm.report.model.ReportReference;
import java.util.ArrayList;
import java.util.Date;
@@ -379,7 +380,7 @@
return result;
}
- /* public static List<ReportReference> parseReportConfig(String json)
+ public static List<ReportReference> parseReportConfig(String json)
{
JSONValue root = JSONParser.parse(json);
List<ReportReference> results = new ArrayList<ReportReference>();
@@ -405,5 +406,5 @@
results.add(reportRef);
}
return results;
- }*/
+ }
}
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/CoverPanel.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/CoverPanel.java 2009-10-28 20:36:52 UTC (rev 863)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/CoverPanel.java 2009-10-28 20:37:57 UTC (rev 864)
@@ -23,24 +23,24 @@
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.ui.*;
-import com.google.gwt.gen2.event.dom.client.ClickEvent;
import com.mvc4g.client.Controller;
import com.mvc4g.client.Event;
import com.mvc4g.client.ViewInterface;
-import org.gwt.mosaic.ui.client.CaptionLayoutPanel;
import org.gwt.mosaic.ui.client.layout.BoxLayout;
import org.gwt.mosaic.ui.client.layout.BoxLayoutData;
import org.gwt.mosaic.ui.client.layout.LayoutPanel;
import org.jboss.bpm.console.client.ApplicationContext;
import org.jboss.bpm.console.client.Registry;
import org.jboss.bpm.console.client.URLBuilder;
+import org.jboss.bpm.console.client.common.HeaderLabel;
import org.jboss.bpm.console.client.common.IconHeader;
import org.jboss.bpm.console.client.common.WidgetWindowPanel;
-import org.jboss.bpm.console.client.common.HeaderLabel;
import org.jboss.bpm.console.client.icons.ConsoleIconBundle;
+import org.jboss.bpm.report.model.ReportReference;
+import org.jboss.bpm.report.model.ReportParameter;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
/**
* @author Heiko.Braun <heiko.braun(a)jboss.com>
@@ -64,56 +64,52 @@
this.appContext = Registry.get(ApplicationContext.class);
}
- public void update(List<ReportGroup> groups)
+ public void update(List<ReportReference> reports)
{
ConsoleIconBundle icons = GWT.create(ConsoleIconBundle.class);
- for(final ReportGroup group : groups)
+ for(final ReportReference reportRef : reports)
{
- CaptionLayoutPanel p = new CaptionLayoutPanel(group.name);
- final boolean hasParameters = group.params.size()>0;
+ final boolean hasParameters = reportRef.getParameterMetaData().size()>0;
//p.add(new HeaderLabel(group.name));
LayoutPanel inner = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL));
- for(final ReportRef reportRef : group.reports)
- {
- LayoutPanel row = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.HORIZONTAL));
- IconHeader header = new IconHeader(icons.pieceIcon(), reportRef.name);
- header.setWidth("95%");
- row.add(
- header,
- new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)
- );
+ LayoutPanel row = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.HORIZONTAL));
+ IconHeader header = new IconHeader(icons.pieceIcon(), reportRef.getTitle());
+ header.setWidth("95%");
+ row.add(
+ header,
+ new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)
+ );
- row.add(new Button("Render",
- new ClickListener()
+ row.add(new Button("Render",
+ new ClickListener()
+ {
+ public void onClick(Widget widget)
{
- public void onClick(Widget widget)
+ if(hasParameters)
{
- if(hasParameters)
- {
- window = new WidgetWindowPanel("Hello World", createForm(reportRef, group));
- }
- else
- {
- String url = URLBuilder.getInstance().getGeneralReportUrl(reportRef.template);
- controller.handleEvent(
- new Event(RenderReportAction.ID,
- new RenderDispatchEvent(reportRef.name, url)
- )
- );
- }
+ window = new WidgetWindowPanel("Hello World", createForm(reportRef));
}
- })
- );
+ else
+ {
+ String url = URLBuilder.getInstance().getGeneralReportUrl(reportRef.getReportFileName());
+ controller.handleEvent(
+ new Event(RenderReportAction.ID,
+ new RenderDispatchEvent(reportRef.getTitle(), url)
+ )
+ );
+ }
+ }
+ })
+ );
- inner.add(row, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
- }
+ inner.add(row, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
- p.add(inner);
- this.add(p, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH));
+ this.add(inner, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH));
+
}
@@ -126,21 +122,19 @@
this.controller = controller;
}
- private Widget createForm(
- final ReportRef reportRef,
- final ReportGroup reportGroup)
+ private Widget createForm(final ReportReference reportRef)
{
LayoutPanel p = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL));
HeaderLabel label = new HeaderLabel("Report Parameters", true);
p.add(label, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
- Grid grid = new Grid(reportGroup.params.size(),2);
+ Grid grid = new Grid(reportRef.getParameterMetaData().size(),2);
int row = 0;
final List<TextBox> inputFields = new ArrayList<TextBox>();
- for(ReportParameter reportParam : reportGroup.params)
+ for(ReportParameter reportParam : reportRef.getParameterMetaData())
{
- grid.setWidget(row,0, new Label(reportParam.name));
+ grid.setWidget(row,0, new Label(reportParam.getDisplayName()));
TextBox textBox = new TextBox();
inputFields.add(textBox);
grid.setWidget(row,1, textBox);
@@ -154,11 +148,11 @@
public void onClick(Widget widget)
{
String url = URLBuilder.getInstance().getProcessSummaryReportUrl(
- reportRef.template, inputFields.get(0).getText()); // TODO: match params
+ reportRef.getReportFileName(), inputFields.get(0).getText()); // TODO: match params
controller.handleEvent(
new Event(RenderReportAction.ID,
- new RenderDispatchEvent(reportRef.name, url))
+ new RenderDispatchEvent(reportRef.getTitle(), url))
);
window.close();
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java 2009-10-28 20:36:52 UTC (rev 863)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java 2009-10-28 20:37:57 UTC (rev 864)
@@ -34,6 +34,7 @@
import org.jboss.bpm.console.client.search.UpdateSearchDefinitionsAction;
import org.jboss.bpm.console.client.util.ConsoleLog;
import org.jboss.bpm.console.client.util.DOMUtil;
+import org.jboss.bpm.report.model.ReportReference;
import java.util.ArrayList;
import java.util.List;
@@ -99,56 +100,12 @@
this.controller = controller;
}
- public void configure(Document configDOM)
+ public void configure(List<ReportReference> reports)
{
- ConsoleLog.debug("Report Config: "+configDOM);
+ ConsoleLog.debug("Report Config: "+reports);
- Node reportsNode = configDOM.getElementsByTagName("reports").item(0);
- List<Node> groups = DOMUtil.getChildElements(reportsNode.getChildNodes());
- List<ReportGroup> results = new ArrayList<ReportGroup>();
-
- for(Node groupNode : groups)
- {
- ReportGroup reportGroup = new ReportGroup();
- reportGroup.name = groupNode.getAttributes().getNamedItem("name").getNodeValue();
-
- List<Node> groupChildren = DOMUtil.getChildElements(groupNode.getChildNodes());
- for(Node childNode : groupChildren)
- {
- String name = childNode.getNodeName();
- NamedNodeMap atts = childNode.getAttributes();
-
- if(name.equals("report"))
- {
- reportGroup.reports.add(
- new ReportRef(
- atts.getNamedItem("name").getNodeValue(),
- atts.getNamedItem("template").getNodeValue()
- )
- );
- }
- else if(name.equals("init-params"))
- {
- List<Node> params = DOMUtil.getChildElements(childNode.getChildNodes());
- for(Node paramNode: params)
- {
- NamedNodeMap paramAtts = paramNode.getAttributes();
- reportGroup.params.add(
- new ReportParameter(
- paramAtts.getNamedItem("name").getNodeValue(),
- paramAtts.getNamedItem("desc").getNodeValue()
- )
- );
- }
- }
- }
-
- results.add(reportGroup);
- }
-
-
// update coverview
- coverpanel.update(results);
+ coverpanel.update(reports);
deck.showWidget(1);
}
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/UpdateReportConfigAction.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/UpdateReportConfigAction.java 2009-10-28 20:36:52 UTC (rev 863)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/UpdateReportConfigAction.java 2009-10-28 20:37:57 UTC (rev 864)
@@ -26,8 +26,12 @@
import com.mvc4g.client.Controller;
import org.jboss.bpm.console.client.ApplicationContext;
import org.jboss.bpm.console.client.Registry;
+import org.jboss.bpm.console.client.model.DTOParser;
import org.jboss.bpm.console.client.common.AbstractRESTAction;
+import org.jboss.bpm.report.model.ReportReference;
+import java.util.List;
+
/**
* @author Heiko.Braun <heiko.braun(a)jboss.com>
*/
@@ -61,10 +65,8 @@
final Controller controller, final Object event, Response response)
{
String json = response.getText();
- //List<ReportReference> reports = DTOParser.parseReportConfig(json);
+ List<ReportReference> reports = DTOParser.parseReportConfig(json);
ReportView view = (ReportView)controller.getView(ReportView.ID);
-
- //view.configure(configDOM);
- //System.out.println(reports);
+ view.configure(reports);
}
}
Modified: bpm-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml
===================================================================
--- bpm-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml 2009-10-28 20:36:52 UTC (rev 863)
+++ bpm-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml 2009-10-28 20:37:57 UTC (rev 864)
@@ -14,6 +14,8 @@
<inherits name='org.gwt.mosaic.Mosaic' />
<inherits name='org.gwt.mosaic.forms.Forms' />
+ <inherits name='org.jboss.bpm.report.BPMReport' />
+
<!-- Includes the public resources used by the GWT Mosaic -->
<!-- themes. Those files do not inject a style sheet into the -->
<!-- application. -->
14 years, 6 months
- 1
- 0
Overlord SVN: r863 - in report-server/trunk/shared/src/main: resources and 4 other directories.
by overlord-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-10-28 16:36:52 -0400 (Wed, 28 Oct 2009)
New Revision: 863
Added:
report-server/trunk/shared/src/main/resources/
report-server/trunk/shared/src/main/resources/org/
report-server/trunk/shared/src/main/resources/org/jboss/
report-server/trunk/shared/src/main/resources/org/jboss/bpm/
report-server/trunk/shared/src/main/resources/org/jboss/bpm/report/
report-server/trunk/shared/src/main/resources/org/jboss/bpm/report/BPMReport.gwt.xml
Log:
Added gwt.xml to shared model library
Added: report-server/trunk/shared/src/main/resources/org/jboss/bpm/report/BPMReport.gwt.xml
===================================================================
--- report-server/trunk/shared/src/main/resources/org/jboss/bpm/report/BPMReport.gwt.xml (rev 0)
+++ report-server/trunk/shared/src/main/resources/org/jboss/bpm/report/BPMReport.gwt.xml 2009-10-28 20:36:52 UTC (rev 863)
@@ -0,0 +1,3 @@
+<module>
+ <source path="model"/>
+</module>
\ No newline at end of file
14 years, 6 months
- 1
- 0
Overlord SVN: r862 - in bpm-console/trunk: gui/war and 2 other directories.
by overlord-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-10-28 15:51:01 -0400 (Wed, 28 Oct 2009)
New Revision: 862
Modified:
bpm-console/trunk/BPMC.ipr
bpm-console/trunk/BPMC.iws
bpm-console/trunk/bpmc-toplevel.iml
bpm-console/trunk/gui/war/gui-war.iml
bpm-console/trunk/gui/war/pom.xml
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/UpdateReportConfigAction.java
bpm-console/trunk/pom.xml
Log:
tmp disable report config parsing
Modified: bpm-console/trunk/BPMC.ipr
===================================================================
--- bpm-console/trunk/BPMC.ipr 2009-10-28 19:49:38 UTC (rev 861)
+++ bpm-console/trunk/BPMC.ipr 2009-10-28 19:51:01 UTC (rev 862)
@@ -136,7 +136,7 @@
<component name="Maven Reloaded">
<option name="config">
<value>
- <option name="pluginEnabled" value="true" />
+ <option name="pluginEnabled" value="false" />
<option name="offlineModeEnabled" value="false" />
<option name="updateClasspathsEnabled" value="true" />
<option name="sortDependenciesEnabled" value="false" />
@@ -207,6 +207,7 @@
<value>
<collection type="java.util.TreeSet">
<entry type="java.lang.String" value="gui-profiles" />
+ <entry type="java.lang.String" value="report-server" />
<entry type="java.lang.String" value="shared-rpc" />
<entry type="java.lang.String" value="workspace-api" />
</collection>
Modified: bpm-console/trunk/BPMC.iws
===================================================================
--- bpm-console/trunk/BPMC.iws 2009-10-28 19:49:38 UTC (rev 861)
+++ bpm-console/trunk/BPMC.iws 2009-10-28 19:51:01 UTC (rev 862)
@@ -91,21 +91,6 @@
<disable_hints />
</component>
<component name="DebuggerManager">
- <line_breakpoints>
- <breakpoint url="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportEditor.java" line="158" class="org.jboss.bpm.console.client.report.ReportEditor" package="org.jboss.bpm.console.client.report">
- <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" />
@@ -177,7 +162,30 @@
</component>
<component name="FileColors" enabled="false" enabledForTabs="false" />
<component name="FileEditorManager">
- <leaf />
+ <leaf>
+ <file leaf-file-name="UpdateReportConfigAction.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/UpdateReportConfigAction.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="67" column="6" selection-start="2321" selection-end="2321" vertical-scroll-proportion="1.7097288">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="DTOParser.java" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="407" column="5" selection-start="13551" selection-end="13551" vertical-scroll-proportion="10.117647">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ </leaf>
</component>
<component name="FindManager">
<FindUsagesManager>
@@ -258,188 +266,6 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="gui-war" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="BPMC.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="gui-war" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="org" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="BPMC.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="gui-war" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="org" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="jboss" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="bpm" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="console" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="BPMC.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="gui-war" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="org" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="jboss" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="bpm" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="console" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="client" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="BPMC.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="gui-war" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="org" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="jboss" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="bpm" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="console" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="client" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="report" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="BPMC.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="gui-war" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="org" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="jboss" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="bpm" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="console" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="client" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="process" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="BPMC.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="gui-war" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="org" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="jboss" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="bpm" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="console" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="client" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="common" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="BPMC.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
<option name="myItemId" value="bpmc-toplevel" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT>
@@ -611,6 +437,30 @@
<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="report-server" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
@@ -643,6 +493,74 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/shared" />
+ <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="report-server" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/shared" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/shared/src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main/java" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main/java/org" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/shared/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:/Users/hbraun/dev/prj/soag/report-server/trunk/shared/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:/Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main/java/org/jboss/bpm/report" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main/java/org/jboss/bpm/report/model" />
+ <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="report-server" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/core" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
@@ -845,7 +763,7 @@
<option name="STATE" value="0" />
</component>
<component name="ProjectView">
- <navigator currentView="PackagesPane" proportions="0.11111111" version="1" splitterProportion="0.5">
+ <navigator currentView="ProjectPane" proportions="0.11111111" version="1" splitterProportion="0.5">
<flattenPackages PackagesPane="false" />
<showMembers />
<showModules />
@@ -893,11 +811,11 @@
<recent name="" />
</key>
<key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
+ <recent name="org.jboss.bpm.report.model" />
<recent name="org.jboss.bpm.console.server" />
<recent name="org.jboss.bpm.console.client" />
<recent name="org.jboss.bpm.console.client.sam" />
<recent name="org.jboss.bpm.console.client.util" />
- <recent name="org.jboss.bpm.console.client.model" />
</key>
</component>
<component name="RestoreUpdateTree" />
@@ -1131,16 +1049,16 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="379" y="44" width="1271" height="965" extended-state="0" />
+ <frame x="0" y="22" width="1280" height="774" extended-state="6" />
<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="14" />
<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.30523732" order="0" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3906071" order="1" />
- <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2249191" order="1" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.31437856" order="0" />
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.38847858" order="1" />
+ <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22420797" order="1" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32992035" order="9" />
<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="7" />
@@ -1152,7 +1070,7 @@
<window_info id="Maven" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="12" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24818695" 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="6" />
- <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.38946164" order="4" />
+ <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.38869664" 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="13" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32873562" order="8" />
@@ -1239,128 +1157,163 @@
<component name="com.intellij.ide.util.scopeChooser.ScopeChooserConfigurable" proportions="" version="1">
<option name="myLastEditedConfigurable" />
</component>
- <component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.3805061" version="1">
+ <component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.3805061,0.5" version="1">
<option name="myPlainMode" value="false" />
- <option name="myLastEditedConfigurable" value="report-server" />
+ <option name="myLastEditedConfigurable" value="gui-war" />
</component>
<component name="com.intellij.profile.ui.ErrorOptionsConfigurable" proportions="" version="1">
<option name="myLastEditedConfigurable" />
</component>
<component name="editorHistoryManager">
- <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm/report/ReportFacade.java">
+ <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm/report/BirtEngineFactory.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="191" column="58" selection-start="5926" selection-end="5926" vertical-scroll-proportion="0.7830803">
+ <state line="34" column="13" selection-start="1507" selection-end="1507" vertical-scroll-proportion="0.26143792">
<folding />
</state>
</provider>
</entry>
- <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm/report/BirtService.java">
+ <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm/report/ReportFacade.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="115" column="26" selection-start="3886" selection-end="3886" vertical-scroll-proportion="0.45173267">
- <folding />
+ <state line="219" column="56" selection-start="6879" selection-end="6879" vertical-scroll-proportion="0.6862745">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java">
+ <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm/report/util/BirtUtil.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="145" column="53" selection-start="4720" selection-end="4720" vertical-scroll-proportion="2.2970297">
- <folding />
+ <state line="97" column="37" selection-start="3832" selection-end="3832" vertical-scroll-proportion="0.59477127">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceDetailView.java">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="211" column="47" selection-start="6993" selection-end="6993" vertical-scroll-proportion="0.49257424">
- <folding />
+ <state line="147" column="46" selection-start="4740" selection-end="4740" vertical-scroll-proportion="0.65849674">
+ <folding>
+ <marker date="1256756994000" expanded="false" signature="0:1031" placeholder="/.../" />
+ <marker date="1256756994000" expanded="true" signature="1770:1824" placeholder="/**...*/" />
+ <marker date="1256756994000" expanded="true" signature="2093:2246" placeholder="{...}" />
+ <marker date="1256756994000" expanded="true" signature="2283:2314" placeholder="{...}" />
+ <marker date="1256756994000" expanded="true" signature="2345:3059" placeholder="{...}" />
+ <marker date="1256756994000" expanded="true" signature="3114:3153" placeholder="{...}" />
+ <marker date="1256756994000" expanded="true" signature="3203:4830" placeholder="{...}" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceDataView.java">
+ <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/core/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="53" column="16" selection-start="1988" selection-end="1988" vertical-scroll-proportion="-0.8274605">
+ <state line="25" column="24" selection-start="809" selection-end="809" vertical-scroll-proportion="0.52287585">
<folding>
- <element signature="method#parseMessage#0;class#InstanceDataView#0" expanded="false" />
+ <element signature="tag#parent#0;tag#project#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportGroup.java">
+ <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="21" column="39" selection-start="1071" selection-end="1071" vertical-scroll-proportion="0.01944107">
+ <state line="120" column="2" selection-start="3485" selection-end="3485" vertical-scroll-proportion="0.7385621">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportParameter.java">
+ <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main/java/org/jboss/bpm/report/model/ReportParameter.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="33" column="3" selection-start="1256" selection-end="1256" vertical-scroll-proportion="0.2527339">
+ <state line="23" column="31" selection-start="1072" selection-end="1072" vertical-scroll-proportion="0.07655502">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportEditor.java">
+ <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/shared/src/main/java/org/jboss/bpm/report/model/ReportReference.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="61" column="26" selection-start="2323" selection-end="2323" vertical-scroll-proportion="0.22982885">
+ <state line="39" column="9" selection-start="1439" selection-end="1439" vertical-scroll-proportion="0.33333334">
<folding>
- <element signature="class#2478:3422" expanded="false" />
+ <element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDetailView.java">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/task/UpdateDetailsAction.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="114" column="33" selection-start="3835" selection-end="3835" vertical-scroll-proportion="0.622665">
+ <state line="31" column="13" selection-start="1338" selection-end="1338" vertical-scroll-proportion="0.20414673">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDetailView.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="40" column="13" selection-start="1701" selection-end="1701" vertical-scroll-proportion="-0.75247526">
+ <state line="33" column="69" selection-start="1619" selection-end="1619" vertical-scroll-proportion="0.078431375">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java">
+ <entry file="file://$PROJECT_DIR$/gui/war/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="90" column="56" selection-start="3028" selection-end="3028" vertical-scroll-proportion="0.54296386">
+ <state line="58" column="56" selection-start="1688" selection-end="1688" vertical-scroll-proportion="0.8169935">
<folding>
- <element signature="method#configure#0;class#ReportView#0" expanded="false" />
+ <marker date="1256759001000" expanded="true" signature="1688:1705" placeholder="..." />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/CoverPanel.java">
+ <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/shared/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="87" column="27" selection-start="3368" selection-end="3368" vertical-scroll-proportion="0.26276463">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="6" column="78" selection-start="231" selection-end="231" vertical-scroll-proportion="0.030303031">
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/WidgetWindowPanel.java">
+ <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm/report/BirtService.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="85" column="19" selection-start="2594" selection-end="2594" vertical-scroll-proportion="0.9413203">
+ <state line="51" column="13" selection-start="1977" selection-end="1977" vertical-scroll-proportion="0.33333334">
<folding>
+ <marker date="1256755537000" expanded="true" signature="0:1031" placeholder="/.../" />
<element signature="imports" expanded="true" />
+ <marker date="1256755537000" expanded="true" signature="1537:1963" placeholder="/**...*/" />
+ <marker date="1256755537000" expanded="true" signature="2155:2199" placeholder="{...}" />
+ <marker date="1256755537000" expanded="true" signature="2493:2526" placeholder="{...}" />
+ <marker date="1256755537000" expanded="true" signature="2574:3112" placeholder="{...}" />
+ <marker date="1256755537000" expanded="true" signature="3149:3584" placeholder="{...}" />
+ <marker date="1256755537000" expanded="true" signature="3320:3458" placeholder="{...}" />
+ <marker date="1256755537000" expanded="true" signature="3387:3448" placeholder="{...}" />
+ <marker date="1256755537000" expanded="true" signature="3650:6415" placeholder="{...}" />
+ <marker date="1256755537000" expanded="true" signature="6492:6593" placeholder="{...}" />
+ <marker date="1256755537000" expanded="true" signature="6651:6888" placeholder="{...}" />
+ <marker date="1256755537000" expanded="true" signature="6711:6861" placeholder="{...}" />
+ <marker date="1256755537000" expanded="true" signature="6751:6851" placeholder="{...}" />
+ <marker date="1256755537000" expanded="true" signature="6914:7089" placeholder="{...}" />
+ <marker date="1256755537000" expanded="true" signature="7114:7288" placeholder="{...}" />
+ <marker date="1256755537000" expanded="true" signature="7316:7462" placeholder="{...}" />
+ <marker date="1256755537000" expanded="true" signature="7466:7865" placeholder="/**...*/" />
+ <marker date="1256755537000" expanded="false" signature="7916:10643" placeholder="{...}" />
+ <marker date="1256755537000" expanded="true" signature="10732:10971" placeholder="{...}" />
+ <marker date="1256755537000" expanded="true" signature="11025:11050" placeholder="{...}" />
+ <marker date="1256755537000" expanded="true" signature="11114:11181" placeholder="{...}" />
+ <marker date="1256755537000" expanded="true" signature="11218:11248" placeholder="{...}" />
+ <marker date="1256755537000" expanded="true" signature="11305:11648" placeholder="{...}" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportFrame.java">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/UpdateReportConfigAction.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="51" column="0" selection-start="1721" selection-end="1721" vertical-scroll-proportion="0.606357">
+ <state line="67" column="6" selection-start="2321" selection-end="2321" vertical-scroll-proportion="1.7097288">
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="202" column="42" selection-start="6449" selection-end="6449" vertical-scroll-proportion="0.61145705">
- <folding />
+ <state line="407" column="5" selection-start="13551" selection-end="13551" vertical-scroll-proportion="10.117647">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
Modified: bpm-console/trunk/bpmc-toplevel.iml
===================================================================
--- bpm-console/trunk/bpmc-toplevel.iml 2009-10-28 19:49:38 UTC (rev 861)
+++ bpm-console/trunk/bpmc-toplevel.iml 2009-10-28 19:51:01 UTC (rev 862)
@@ -39,33 +39,6 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.google.gwt:gwt-dev:jar:mac:1.5.3:provided">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/com/google/gwt/gwt-dev/1.5.3/gwt-dev-1.5.3-mac.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-dnd:jar:0.1.10:provided">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-dnd/0.1.10/gwt-mosaic-dnd-0.1.10.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-gwtx:jar:0.1.10:provided">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-gwtx/0.1.10/gwt-mosaic-gwtx-0.1.10.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
<library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:provided">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" />
@@ -102,15 +75,6 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-incubator:jar:0.1.10:provided">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-incubator/0.1.10/gwt-mosaic-incubator-0.1.10.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
<library name="M2 Dep: net.sf.ezmorph:ezmorph:jar:1.0.6:test">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../.m2/repository/net/sf/ezmorph/ezmorph/1.0.6/ezmorph-1.0.6.jar!/" />
@@ -120,15 +84,6 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: commons-collections:commons-collections:jar:3.2.1:provided">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.slf4j:slf4j-api:jar:1.5.2:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar!/" />
@@ -138,15 +93,6 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.google.gwt:gwt-servlet:jar:1.5.3:provided">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/com/google/gwt/gwt-servlet/1.5.3/gwt-servlet-1.5.3.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
<library name="M2 Dep: javassist:javassist:jar:3.6.0.GA:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javassist/javassist/3.6.0.GA/javassist-3.6.0.GA.jar!/" />
@@ -212,15 +158,6 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.googlecode.mvc4g:mvc4g:jar:1.0.0-jboss:provided">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/com/googlecode/mvc4g/mvc4g/1.0.0-jboss/mvc4g-1.0.0-jboss.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
<library name="M2 Dep: javax.xml:jaxb-impl:jar:2.1:provided">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/xml/jaxb-impl/2.1/jaxb-impl-2.1.jar!/" />
@@ -230,17 +167,6 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: commons-beanutils:commons-beanutils:jar:1.7.0:provided">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar!/" />
- </SOURCES>
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
<library name="M2 Dep: commons-fileupload:commons-fileupload:jar:1.2.1:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-fileupload/commons-fileupload/1.2.1/commons-fileupload-1.2.1.jar!/" />
@@ -268,15 +194,6 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.google.code.gwt-log:gwt-log:jar:2.5.2:provided">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/com/google/code/gwt-log/gwt-log/2.5.2/gwt-log-2.5.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
<library name="M2 Dep: javax.activation:activation:jar:1.1:provided">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1.jar!/" />
@@ -288,24 +205,6 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic:jar:0.1.10:provided">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic/0.1.10/gwt-mosaic-0.1.10.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: commons-lang:commons-lang:jar:2.4:provided">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
<library name="M2 Dep: javax.ejb:ejb-api:jar:3.0:provided">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/ejb/ejb-api/3.0/ejb-api-3.0.jar!/" />
@@ -315,24 +214,6 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: commons-digester:commons-digester:jar:1.8:provided">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-digester/commons-digester/1.8/commons-digester-1.8.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: commons-configuration:commons-configuration:jar:1.6:provided">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-configuration/commons-configuration/1.6/commons-configuration-1.6.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
<library name="M2 Dep: commons-collections:commons-collections:jar:3.2:test">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-collections/commons-collections/3.2/commons-collections-3.2.jar!/" />
@@ -342,24 +223,6 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.google.code.gson:gson:jar:1.2.2:provided">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/com/google/code/gson/gson/1.2.2/gson-1.2.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: commons-beanutils:commons-beanutils-core:jar:1.8.0:provided">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-beanutils/commons-beanutils-core/1.8.0/commons-beanutils-core-1.8.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.scannotation:scannotation:jar:1.0.2:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/scannotation/scannotation/1.0.2/scannotation-1.0.2.jar!/" />
@@ -543,6 +406,143 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: com.google.gwt:gwt-dev:jar:mac:1.5.3:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/com/google/gwt/gwt-dev/1.5.3/gwt-dev-1.5.3-mac.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-dnd:jar:0.1.10:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-dnd/0.1.10/gwt-mosaic-dnd-0.1.10.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-gwtx:jar:0.1.10:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-gwtx/0.1.10/gwt-mosaic-gwtx-0.1.10.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-incubator:jar:0.1.10:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-incubator/0.1.10/gwt-mosaic-incubator-0.1.10.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: commons-collections:commons-collections:jar:3.2.1:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: com.google.gwt:gwt-servlet:jar:1.5.3:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/com/google/gwt/gwt-servlet/1.5.3/gwt-servlet-1.5.3.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: com.googlecode.mvc4g:mvc4g:jar:1.0.0-jboss:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/com/googlecode/mvc4g/mvc4g/1.0.0-jboss/mvc4g-1.0.0-jboss.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: commons-beanutils:commons-beanutils:jar:1.7.0:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: com.google.code.gwt-log:gwt-log:jar:2.5.2:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/com/google/code/gwt-log/gwt-log/2.5.2/gwt-log-2.5.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic:jar:0.1.10:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic/0.1.10/gwt-mosaic-0.1.10.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: commons-lang:commons-lang:jar:2.4:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: commons-digester:commons-digester:jar:1.8:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-digester/commons-digester/1.8/commons-digester-1.8.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: commons-configuration:commons-configuration:jar:1.6:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-configuration/commons-configuration/1.6/commons-configuration-1.6.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: com.google.code.gson:gson:jar:1.2.2:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/com/google/code/gson/gson/1.2.2/gson-1.2.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: commons-beanutils:commons-beanutils-core:jar:1.8.0:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-beanutils/commons-beanutils-core/1.8.0/commons-beanutils-core-1.8.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
</module>
Modified: bpm-console/trunk/gui/war/gui-war.iml
===================================================================
--- bpm-console/trunk/gui/war/gui-war.iml 2009-10-28 19:49:38 UTC (rev 861)
+++ bpm-console/trunk/gui/war/gui-war.iml 2009-10-28 19:51:01 UTC (rev 862)
@@ -11,6 +11,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="report-server" />
<orderEntry type="module" module-name="gui-profiles" />
<orderEntry type="module" module-name="workspace-api" />
<orderEntry type="module" module-name="shared-rpc" />
@@ -21,7 +22,6 @@
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1-sources.jar!/" />
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1-sources.jar!/" />
</SOURCES>
</library>
@@ -150,7 +150,6 @@
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar!/" />
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar!/" />
</SOURCES>
</library>
@@ -207,7 +206,6 @@
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/javax/activation/activation/1.1/activation-1.1-sources.jar!/" />
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1-sources.jar!/" />
</SOURCES>
</library>
Modified: bpm-console/trunk/gui/war/pom.xml
===================================================================
--- bpm-console/trunk/gui/war/pom.xml 2009-10-28 19:49:38 UTC (rev 861)
+++ bpm-console/trunk/gui/war/pom.xml 2009-10-28 19:51:01 UTC (rev 862)
@@ -49,6 +49,16 @@
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.bpm</groupId>
+ <artifactId>report-shared</artifactId>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.bpm</groupId>
+ <artifactId>report-shared</artifactId>
+ </dependency>
+
<!-- GWT -->
<dependency>
<groupId>com.google.gwt</groupId>
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java 2009-10-28 19:49:38 UTC (rev 861)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java 2009-10-28 19:51:01 UTC (rev 862)
@@ -378,4 +378,32 @@
return result;
}
+
+ /* public static List<ReportReference> parseReportConfig(String json)
+ {
+ JSONValue root = JSONParser.parse(json);
+ List<ReportReference> results = new ArrayList<ReportReference>();
+
+ //[{"title":"No title","description":"No description","reportFileName":"specific_system_overview.rptdesign",
+ // "parameterMetaData":[{"name":"startDate","type":"TEXTBOX","dataType":"DATETIME"},
+ // {"name":"endDate","type":"TEXTBOX","dataType":"DATETIME"},
+ // {"name":"startDate","type":"TEXTBOX","dataType":"DATETIME"}]},
+ // {"title":"System Overview","description":"No description","reportFileName":"overall_activity.rptdesign","parameterMetaData":[]},{"title":"No title","description":"No description","reportFileName":"overall_activity_old.rptdesign","parameterMetaData":[]},{"title":"No title","description":"No description","reportFileName":"process_summary.rptdesign","parameterMetaData":[{"name":"procId","type":"TEXTBOX","dataType":"STRING"}]}]
+
+ JSONArray jsonArray = root.isArray();
+ for (int i = 0; i < jsonArray.size(); i++)
+ {
+ JSONValue item = jsonArray.get(i);
+ String title = JSONWalk.on(item).next("title").asString();
+ String description = JSONWalk.on(item).next("description").asString();
+ String reportFile = JSONWalk.on(item).next("reportFileName").asString();
+
+ ReportReference reportRef = new ReportReference(reportFile);
+ reportRef.setTitle(title);
+ reportRef.setDescription(description);
+
+ results.add(reportRef);
+ }
+ return results;
+ }*/
}
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java 2009-10-28 19:49:38 UTC (rev 861)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java 2009-10-28 19:51:01 UTC (rev 862)
@@ -22,19 +22,15 @@
package org.jboss.bpm.console.client.report;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.user.client.Timer;
import com.google.gwt.xml.client.Document;
import com.google.gwt.xml.client.NamedNodeMap;
import com.google.gwt.xml.client.Node;
import com.mvc4g.client.Controller;
-import com.mvc4g.client.Event;
import org.gwt.mosaic.ui.client.DeckLayoutPanel;
import org.gwt.mosaic.ui.client.Label;
import org.gwt.mosaic.ui.client.layout.LayoutPanel;
-import org.jboss.bpm.console.client.ApplicationContext;
import org.jboss.bpm.console.client.common.AbstractView;
import org.jboss.bpm.console.client.icons.ConsoleIconBundle;
-import org.jboss.bpm.console.client.search.SearchDefinitionView;
import org.jboss.bpm.console.client.search.UpdateSearchDefinitionsAction;
import org.jboss.bpm.console.client.util.ConsoleLog;
import org.jboss.bpm.console.client.util.DOMUtil;
@@ -51,7 +47,6 @@
private Controller controller;
private boolean isInitialized;
- private LayoutPanel loadingPanel;
private DeckLayoutPanel deck;
private CoverPanel coverpanel;
@@ -76,7 +71,7 @@
deck = new DeckLayoutPanel();
// loading
- loadingPanel = new LayoutPanel();
+ LayoutPanel loadingPanel = new LayoutPanel();
loadingPanel.add(new Label("Loading..."));
loadingPanel.setVisible(false);
deck.add(loadingPanel);
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/UpdateReportConfigAction.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/UpdateReportConfigAction.java 2009-10-28 19:49:38 UTC (rev 861)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/UpdateReportConfigAction.java 2009-10-28 19:51:01 UTC (rev 862)
@@ -21,14 +21,12 @@
*/
package org.jboss.bpm.console.client.report;
-import org.jboss.bpm.console.client.common.AbstractRESTAction;
-import org.jboss.bpm.console.client.ApplicationContext;
-import org.jboss.bpm.console.client.Registry;
import com.google.gwt.http.client.RequestBuilder;
import com.google.gwt.http.client.Response;
-import com.google.gwt.xml.client.Document;
-import com.google.gwt.xml.client.XMLParser;
import com.mvc4g.client.Controller;
+import org.jboss.bpm.console.client.ApplicationContext;
+import org.jboss.bpm.console.client.Registry;
+import org.jboss.bpm.console.client.common.AbstractRESTAction;
/**
* @author Heiko.Braun <heiko.braun(a)jboss.com>
@@ -62,9 +60,11 @@
public void handleSuccessfulResponse(
final Controller controller, final Object event, Response response)
{
- String xml = response.getText();
- Document configDOM = XMLParser.parse(xml);
+ String json = response.getText();
+ //List<ReportReference> reports = DTOParser.parseReportConfig(json);
ReportView view = (ReportView)controller.getView(ReportView.ID);
- view.configure(configDOM);
+
+ //view.configure(configDOM);
+ //System.out.println(reports);
}
}
Modified: bpm-console/trunk/pom.xml
===================================================================
--- bpm-console/trunk/pom.xml 2009-10-28 19:49:38 UTC (rev 861)
+++ bpm-console/trunk/pom.xml 2009-10-28 19:51:01 UTC (rev 862)
@@ -202,6 +202,18 @@
<artifactId>report-core</artifactId>
<version>${report.server.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.bpm</groupId>
+ <artifactId>report-shared</artifactId>
+ <classifier>sources</classifier>
+ <version>${report.server.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.bpm</groupId>
+ <artifactId>report-shared</artifactId>
+ <version>${report.server.version}</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
14 years, 6 months
- 1
- 0
Overlord SVN: r861 - in report-server/trunk: core and 11 other directories.
by overlord-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-10-28 15:49:38 -0400 (Wed, 28 Oct 2009)
New Revision: 861
Added:
report-server/trunk/README_BIRT.txt
report-server/trunk/core/src/main/java/org/jboss/bpm/report/DOMWriter.java
report-server/trunk/core/src/main/java/org/jboss/bpm/report/util/
report-server/trunk/core/src/main/java/org/jboss/bpm/report/util/BirtUtil.java
report-server/trunk/shared/
report-server/trunk/shared/pom.xml
report-server/trunk/shared/src/
report-server/trunk/shared/src/main/
report-server/trunk/shared/src/main/java/
report-server/trunk/shared/src/main/java/org/
report-server/trunk/shared/src/main/java/org/jboss/
report-server/trunk/shared/src/main/java/org/jboss/bpm/
report-server/trunk/shared/src/main/java/org/jboss/bpm/report/
report-server/trunk/shared/src/main/java/org/jboss/bpm/report/model/
report-server/trunk/shared/src/main/java/org/jboss/bpm/report/model/ReportParameter.java
report-server/trunk/shared/src/main/java/org/jboss/bpm/report/model/ReportReference.java
Modified:
report-server/trunk/core/pom.xml
report-server/trunk/core/src/main/java/org/jboss/bpm/report/BirtService.java
report-server/trunk/core/src/main/java/org/jboss/bpm/report/ReportFacade.java
report-server/trunk/pom.xml
report-server/trunk/report-server.iml
Log:
Parse .rptdesign files directly to access report properties, including parameter meta data
Added: report-server/trunk/README_BIRT.txt
===================================================================
--- report-server/trunk/README_BIRT.txt (rev 0)
+++ report-server/trunk/README_BIRT.txt 2009-10-28 19:49:38 UTC (rev 861)
@@ -0,0 +1,9 @@
+Getting BIRT
+------------
+
+You need to have the proper BIRT version installed.
+It can be downloaded here:
+http://archive.eclipse.org/birt/downloads/build_list.php
+
+
+
Modified: report-server/trunk/core/pom.xml
===================================================================
--- report-server/trunk/core/pom.xml 2009-10-28 08:53:41 UTC (rev 860)
+++ report-server/trunk/core/pom.xml 2009-10-28 19:49:38 UTC (rev 861)
@@ -19,6 +19,12 @@
</properties>
<dependencies>
+
+ <dependency>
+ <groupId>org.jboss.bpm</groupId>
+ <artifactId>report-shared</artifactId>
+ <version>${version}</version>
+ </dependency>
<!-- Other -->
<dependency>
<groupId>commons-logging</groupId>
@@ -181,6 +187,11 @@
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ </dependency>
+
</dependencies>
Modified: report-server/trunk/core/src/main/java/org/jboss/bpm/report/BirtService.java
===================================================================
--- report-server/trunk/core/src/main/java/org/jboss/bpm/report/BirtService.java 2009-10-28 08:53:41 UTC (rev 860)
+++ report-server/trunk/core/src/main/java/org/jboss/bpm/report/BirtService.java 2009-10-28 19:49:38 UTC (rev 861)
@@ -25,18 +25,15 @@
import org.apache.commons.logging.LogFactory;
import org.eclipse.birt.core.framework.Platform;
import org.eclipse.birt.report.engine.api.*;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
+import org.jboss.bpm.report.model.ReportReference;
+import org.jboss.bpm.report.model.ReportParameter;
+import org.jboss.bpm.report.util.BirtUtil;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
import java.io.File;
-import java.io.ByteArrayOutputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.io.FilenameFilter;
+import java.io.Serializable;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
/**
* Core BIRT service component. Requires to step through the lifecycle
@@ -62,12 +59,10 @@
private enum State {NONE, CREATED, STARTED, STOPPED, DESTROYED};
private State currentState = State.NONE;
- private Map<String, IReportRunnable> cache = new HashMap<String, IReportRunnable>();
+ private Map<String, IReportRunnable> cache = new ConcurrentHashMap<String, IReportRunnable>();
- private List<String> templateNames = new ArrayList<String>();
+ private Map<String, ReportReference> reports = new ConcurrentHashMap<String, ReportReference>();
- private Document reportConfig;
-
public BirtService(IntegrationConfig iConfig)
{
this.iConfig = iConfig;
@@ -82,16 +77,11 @@
File workDir = new File(iConfig.getReportDir());
if(!workDir.exists())
throw new IllegalStateException("Working directory "+iConfig.getReportDir()+" cannot be found!");
-
- File config = new File(workDir, "reports.xml");
- if(!config.exists())
- throw new IllegalStateException("Template config (reports.xml) not found: "+iConfig.getReportDir());
-
+
try
{
- DocumentBuilder docBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
- reportConfig = docBuilder.parse(config);
- parseReportNames(reportConfig);
+ loadReportNames();
+ extractParameterNames();
}
catch (Exception e)
{
@@ -102,23 +92,104 @@
currentState = State.CREATED;
}
- private void parseReportNames(Document reportConfig)
+ private void loadReportNames()
{
- Element root = reportConfig.getDocumentElement();
-
- NodeList groups = root.getElementsByTagName("group");
- for(int i=0; i<groups.getLength(); i++)
+ File workDir = new File(iConfig.getReportDir());
+ assert workDir.isDirectory();
+
+ File[] reportFiles = workDir.listFiles(
+ new FilenameFilter()
+ {
+ public boolean accept(File dir, String name)
+ {
+ return name.endsWith(".rptdesign");
+ }
+ }
+ );
+
+ for(File f : reportFiles)
+ {
+ reports.put(f.getName(), new ReportReference(f.getName()));
+ }
+ }
+
+ private void extractParameterNames() throws EngineException
+ {
+ Iterator<String> templateNames = reports.keySet().iterator();
+ while(templateNames.hasNext())
{
- Element group = (Element)groups.item(i);
- NodeList reports = group.getElementsByTagName("report");
- for(int x=0; x<reports.getLength(); x++)
+ String templateName = templateNames.next();
+ IReportRunnable template = openCached(templateName);
+
+ // Update report reference details
+ String title = prop(template, IReportRunnable.TITLE, "No title");
+ String description = prop(template, IReportRunnable.DESCRIPTION, "No description");
+ ReportReference reportRef = reports.get(templateName);
+ reportRef.setTitle(title);
+ reportRef.setDescription(description);
+
+ Map<String, Map<String,Serializable>> paramDetails =
+ new HashMap<String, Map<String, Serializable>>();
+
+ //Create Parameter Definition Task and retrieve parameter definitions
+ IGetParameterDefinitionTask task = engine.createGetParameterDefinitionTask( template );
+ Collection params = task.getParameterDefns( true );
+
+ //Iterate over each parameter
+ Iterator iter = params.iterator( );
+ while ( iter.hasNext( ) )
{
- Element report = (Element)reports.item(x);
- templateNames.add(report.getAttribute("template"));
+ IParameterDefnBase param = (IParameterDefnBase) iter.next( );
+
+ if ( param instanceof IParameterGroupDefn )
+ {
+ IParameterGroupDefn group = (IParameterGroupDefn) param;
+
+ // Do something with the parameter group.
+ // Iterate over group contents.
+ Iterator i2 = group.getContents( ).iterator( );
+ while ( i2.hasNext( ) )
+ {
+ IScalarParameterDefn scalar = (IScalarParameterDefn) i2.next( );
+ //Get details on the parameter
+ paramDetails.put( scalar.getName(), BirtUtil.loadParameterDetails( task, scalar, template, group));
+ }
+
+ }
+ else
+ {
+ IScalarParameterDefn scalar = (IScalarParameterDefn) param;
+ //System.out.println(param.getName());
+ //get details on the parameter
+ paramDetails.put( scalar.getName(), BirtUtil.loadParameterDetails( task, scalar, template, null));
+ }
+
+ // update ReportReference.parameters
+ ReportReference ref = reports.get(templateName);
+ Iterator<String> paramNames = paramDetails.keySet().iterator();
+ while(paramNames.hasNext())
+ {
+ Map<String, Serializable> map = paramDetails.get(paramNames.next());
+ ReportParameter paramRef = new ReportParameter(
+ (String)map.get("Name"), ReportParameter.Type.valueOf((String)map.get("Type"))
+ );
+ paramRef.setDataType(ReportParameter.DataType.valueOf((String)map.get("DataType")));
+ paramRef.setHelptext((String)map.get("Help Text"));
+ paramRef.setDisplayName((String)map.get("Display Name"));
+ ref.getParameterMetaData().add(paramRef);
+ }
}
}
+
+
}
+ private String prop(IReportRunnable report, String name, String value)
+ {
+ return report.getProperty(name) != null ?
+ (String)report.getProperty(name) : value;
+ }
+
/* non blocking init */
public void createAsync()
{
@@ -177,9 +248,9 @@
if( (currentState==State.CREATED || currentState==State.STARTED) == false)
throw new IllegalStateException("Cannot render in state " + currentState);
- if(!templateNames.contains(metaData.getReportName()))
+ if(!reports.keySet().contains(metaData.getReportName()))
throw new IllegalArgumentException("No such report template: "+metaData.getReportName());
-
+
String outputFileName = null;
log.debug("Render " + metaData);
@@ -187,14 +258,7 @@
try
{
//Open a (cached) report design
- IReportRunnable design = cache.get(metaData.getReportName());
- if(null==design)
- {
- design = engine.openReportDesign(
- iConfig.getReportDir()+metaData.getReportName()
- );
- cache.put(metaData.getReportName(), design);
- }
+ IReportRunnable design = openCached(metaData.getReportName());
//Create runRenderTask to run and render the report,
IRunAndRenderTask runRenderTask = engine.createRunAndRenderTask(design);
@@ -255,6 +319,20 @@
return outputFileName;
}
+ private IReportRunnable openCached(String reportName)
+ throws EngineException
+ {
+ IReportRunnable design = cache.get(reportName);
+ if(null==design)
+ {
+ design = engine.openReportDesign(
+ iConfig.getReportDir()+reportName
+ );
+ cache.put(reportName, design);
+ }
+ return design;
+ }
+
public IntegrationConfig getIntegrationConfig()
{
return iConfig;
@@ -270,10 +348,14 @@
return currentState;
}
- public String getTemplateConfig()
+ public List<ReportReference> getReportReferences()
{
- ByteArrayOutputStream bout = new ByteArrayOutputStream();
- new DOMWriter(bout).print(reportConfig.getDocumentElement());
- return new String(bout.toByteArray());
+ if( (currentState==State.CREATED || currentState==State.STARTED) == false)
+ throw new IllegalStateException("Cannot acccess report references in state " + currentState);
+
+ ArrayList<ReportReference> list = new ArrayList<ReportReference>();
+ for(String s : reports.keySet())
+ list.add(reports.get(s));
+ return list;
}
}
Added: report-server/trunk/core/src/main/java/org/jboss/bpm/report/DOMWriter.java
===================================================================
--- report-server/trunk/core/src/main/java/org/jboss/bpm/report/DOMWriter.java (rev 0)
+++ report-server/trunk/core/src/main/java/org/jboss/bpm/report/DOMWriter.java 2009-10-28 19:49:38 UTC (rev 861)
@@ -0,0 +1,634 @@
+package org.jboss.bpm.report;
+
+/*
+ * ====================================================================
+ *
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ * any, must include the following acknowlegement:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowlegement may appear in the software itself,
+ * if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * Foundation" must not be used to endorse or promote products derived
+ * from this software without prior written permission. For written
+ * permission, please contact apache(a)apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ * nor may "Apache" appear in their names without prior written
+ * permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.io.UnsupportedEncodingException;
+import java.io.Writer;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.w3c.dom.Attr;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+/**
+ * Traverse a DOM tree in order to print a document that is parsed.
+ *
+ * @author Andy Clark, IBM
+ * @author Thomas.Diesler(a)jboss.org
+ */
+@SuppressWarnings("unchecked")
+public class DOMWriter
+{
+ // Print writer
+ private PrintWriter out;
+ // True, if canonical output
+ private boolean canonical;
+ // True, if pretty printing should be used
+ private boolean prettyprint;
+ // True, if the XML declaration should be written
+ private boolean writeXMLDeclaration;
+ // True, if whitespace should be ignored
+ private boolean ignoreWhitespace;
+ // Explicit character set encoding
+ private String charsetName;
+ // indent for the pretty printer
+ private int prettyIndent;
+ // True, if the XML declaration has been written
+ private boolean wroteXMLDeclaration;
+ // The node that started the write
+ private Node rootNode;
+ // True if we want namespace completion
+ private boolean completeNamespaces = true;
+ // The current default namespace
+ private String currentDefaultNamespace;
+
+ public DOMWriter(Writer w)
+ {
+ this.out = new PrintWriter(w);
+ }
+
+ public DOMWriter(Writer w, String charsetName)
+ {
+ this.out = new PrintWriter(w);
+ this.charsetName = charsetName;
+ this.writeXMLDeclaration = true;
+ }
+
+ public DOMWriter(OutputStream stream)
+ {
+ try
+ {
+ this.out = new PrintWriter(new OutputStreamWriter(stream, "UTF-8"));
+ }
+ catch (UnsupportedEncodingException e)
+ {
+ // ignore, UTF-8 should be available
+ }
+ }
+
+ public DOMWriter(OutputStream stream, String charsetName)
+ {
+ try
+ {
+ this.out = new PrintWriter(new OutputStreamWriter(stream, charsetName));
+ this.charsetName = charsetName;
+ this.writeXMLDeclaration = true;
+ }
+ catch (UnsupportedEncodingException e)
+ {
+ throw new IllegalArgumentException("Unsupported encoding: " + charsetName);
+ }
+ }
+
+ /**
+ * Print a node with explicit prettyprinting.
+ * The defaults for all other DOMWriter properties apply.
+ *
+ */
+ public static String printNode(Node node, boolean prettyprint)
+ {
+ StringWriter strw = new StringWriter();
+ new DOMWriter(strw).setPrettyprint(prettyprint).print(node);
+ return strw.toString();
+ }
+
+ public boolean isCanonical()
+ {
+ return canonical;
+ }
+
+ /**
+ * Set wheter entities should appear in their canonical form.
+ * The default is false.
+ */
+ public DOMWriter setCanonical(boolean canonical)
+ {
+ this.canonical = canonical;
+ return this;
+ }
+
+ public boolean isIgnoreWhitespace()
+ {
+ return ignoreWhitespace;
+ }
+
+ /**
+ * Set whether whitespace should be ignored.
+ * The default is false.
+ */
+ public DOMWriter setIgnoreWhitespace(boolean ignoreWhitespace)
+ {
+ this.ignoreWhitespace = ignoreWhitespace;
+ return this;
+ }
+
+ /**
+ * Set wheter subelements should have their namespaces completed.
+ * Setting this to false may lead to invalid XML fragments.
+ * The default is true.
+ */
+ public DOMWriter setCompleteNamespaces(boolean complete)
+ {
+ this.completeNamespaces = complete;
+ return this;
+ }
+
+ public boolean isPrettyprint()
+ {
+ return prettyprint;
+ }
+
+ /**
+ * Set wheter element should be indented.
+ * The default is false.
+ */
+ public DOMWriter setPrettyprint(boolean prettyprint)
+ {
+ this.prettyprint = prettyprint;
+ return this;
+ }
+
+ public boolean isWriteXMLDeclaration()
+ {
+ return writeXMLDeclaration;
+ }
+
+ /**
+ * Set wheter the XML declaration should be written.
+ * The default is false.
+ */
+ public DOMWriter setWriteXMLDeclaration(boolean flag)
+ {
+ this.writeXMLDeclaration = flag;
+ return this;
+ }
+
+ public void print(Node node)
+ {
+ if (prettyprint && ignoreWhitespace)
+ throw new IllegalStateException("Cannot pretty print and ignore whitespace");
+
+ rootNode = node;
+ printInternal(node, false);
+ }
+
+ private void printInternal(Node node, boolean indentEndMarker)
+ {
+ // is there anything to do?
+ if (node == null)
+ {
+ return;
+ }
+
+ // JBAS-2117 - Don't skip the DOCUMENT_NODE
+ // if (node instanceof Document) node = ((Document)node).getDocumentElement();
+
+ if (wroteXMLDeclaration == false && writeXMLDeclaration == true && canonical == false)
+ {
+ out.print("<?xml version='1.0'");
+ if (charsetName != null)
+ out.print(" encoding='" + charsetName + "'");
+
+ out.print("?>");
+ if (prettyprint)
+ out.println();
+
+ wroteXMLDeclaration = true;
+ }
+
+ int type = node.getNodeType();
+ boolean hasChildNodes = node.getChildNodes().getLength() > 0;
+
+ String nodeName = node.getNodeName();
+ switch (type)
+ {
+ // print document
+ case Node.DOCUMENT_NODE:
+ {
+ NodeList children = node.getChildNodes();
+ for (int iChild = 0; iChild < children.getLength(); iChild++)
+ {
+ printInternal(children.item(iChild), false);
+ }
+ out.flush();
+ break;
+ }
+
+ // print element with attributes
+ case Node.ELEMENT_NODE:
+ {
+ Element element = (Element)node;
+ if (prettyprint)
+ {
+ for (int i = 0; i < prettyIndent; i++)
+ {
+ out.print(' ');
+ }
+ prettyIndent++;
+ }
+
+ out.print('<');
+ out.print(nodeName);
+
+ Map nsMap = new HashMap();
+ String elPrefix = node.getPrefix();
+ String elNamespaceURI = node.getNamespaceURI();
+ if (elPrefix != null)
+ {
+ String nsURI = getNamespaceURI(elPrefix, element, rootNode);
+ nsMap.put(elPrefix, nsURI);
+ }
+
+ Attr attrs[] = sortAttributes(node.getAttributes());
+ for (int i = 0; i < attrs.length; i++)
+ {
+ Attr attr = attrs[i];
+ String atPrefix = attr.getPrefix();
+ String atName = attr.getNodeName();
+ String atValue = normalize(attr.getNodeValue(), canonical);
+
+ if (atName.equals("xmlns"))
+ currentDefaultNamespace = atValue;
+
+ if (atPrefix != null && !atPrefix.equals("xmlns") && !atPrefix.equals("xml"))
+ {
+ String nsURI = getNamespaceURI(atPrefix, element, rootNode);
+ nsMap.put(atPrefix, nsURI);
+ // xsi:type='ns1:SubType', xsi:type='xsd:string'
+ if (atName.equals(atPrefix + ":type") && atValue.indexOf(":") > 0)
+ {
+ // xsi defined on the envelope
+ if (nsURI == null)
+ nsURI = getNamespaceURI(atPrefix, element, null);
+
+ if ("http://www.w3.org/2001/XMLSchema-instance".equals(nsURI))
+ {
+ String typePrefix = atValue.substring(0, atValue.indexOf(":"));
+ String typeURI = getNamespaceURI(typePrefix, element, rootNode);
+ nsMap.put(typePrefix, typeURI);
+ }
+ }
+ }
+
+ out.print(" " + atName + "='" + atValue + "'");
+ }
+
+ // Add namespace declaration for prefixes
+ // that are defined further up the tree
+ if (completeNamespaces)
+ {
+ Iterator itPrefix = nsMap.keySet().iterator();
+ while (itPrefix.hasNext())
+ {
+ String prefix = (String)itPrefix.next();
+ String nsURI = (String)nsMap.get(prefix);
+ if (nsURI == null)
+ {
+ nsURI = getNamespaceURI(prefix, element, null);
+ out.print(" xmlns:" + prefix + "='" + nsURI + "'");
+ }
+ }
+ }
+
+ // The SAX ContentHandler will by default not add the namespace declaration
+ // <Hello xmlns='http://somens'>World</Hello>
+ if (elPrefix == null && elNamespaceURI != null)
+ {
+ String defaultNamespace = element.getAttribute("xmlns");
+ if (defaultNamespace.length() == 0 && !elNamespaceURI.equals(currentDefaultNamespace))
+ {
+ out.print(" xmlns='" + elNamespaceURI + "'");
+ currentDefaultNamespace = elNamespaceURI;
+ }
+ }
+
+ if (hasChildNodes)
+ {
+ out.print('>');
+ }
+
+ // Find out if the end marker is indented
+ indentEndMarker = isEndMarkerIndented(node);
+
+ if (indentEndMarker)
+ {
+ out.print('\n');
+ }
+
+ NodeList childNodes = node.getChildNodes();
+ int len = childNodes.getLength();
+ for (int i = 0; i < len; i++)
+ {
+ Node childNode = childNodes.item(i);
+ printInternal(childNode, false);
+ }
+ break;
+ }
+
+ // handle entity reference nodes
+ case Node.ENTITY_REFERENCE_NODE:
+ {
+ if (canonical)
+ {
+ NodeList children = node.getChildNodes();
+ if (children != null)
+ {
+ int len = children.getLength();
+ for (int i = 0; i < len; i++)
+ {
+ printInternal(children.item(i), false);
+ }
+ }
+ }
+ else
+ {
+ out.print('&');
+ out.print(nodeName);
+ out.print(';');
+ }
+ break;
+ }
+
+ // print cdata sections
+ case Node.CDATA_SECTION_NODE:
+ {
+ if (canonical)
+ {
+ out.print(normalize(node.getNodeValue(), canonical));
+ }
+ else
+ {
+ out.print("<![CDATA[");
+ out.print(node.getNodeValue());
+ out.print("]]>");
+ }
+ break;
+ }
+
+ // print text
+ case Node.TEXT_NODE:
+ {
+ String text = normalize(node.getNodeValue(), canonical);
+ if (text.trim().length() > 0)
+ {
+ out.print(text);
+ }
+ else if (prettyprint == false && ignoreWhitespace == false)
+ {
+ out.print(text);
+ }
+ break;
+ }
+
+ // print processing instruction
+ case Node.PROCESSING_INSTRUCTION_NODE:
+ {
+ out.print("<?");
+ out.print(nodeName);
+ String data = node.getNodeValue();
+ if (data != null && data.length() > 0)
+ {
+ out.print(' ');
+ out.print(data);
+ }
+ out.print("?>");
+ break;
+ }
+
+ // print comment
+ case Node.COMMENT_NODE:
+ {
+ for (int i = 0; i < prettyIndent; i++)
+ {
+ out.print(' ');
+ }
+
+ out.print("<!--");
+ String data = node.getNodeValue();
+ if (data != null)
+ {
+ out.print(data);
+ }
+ out.print("-->");
+
+ if (prettyprint)
+ {
+ out.print('\n');
+ }
+
+ break;
+ }
+ }
+
+ if (type == Node.ELEMENT_NODE)
+ {
+ if (prettyprint)
+ prettyIndent--;
+
+ if (hasChildNodes == false)
+ {
+ out.print("/>");
+ }
+ else
+ {
+ if (indentEndMarker)
+ {
+ for (int i = 0; i < prettyIndent; i++)
+ {
+ out.print(' ');
+ }
+ }
+
+ out.print("</");
+ out.print(nodeName);
+ out.print('>');
+ }
+
+ if (prettyIndent > 0)
+ {
+ out.print('\n');
+ }
+ }
+ out.flush();
+ }
+
+ private String getNamespaceURI(String prefix, Element element, Node stopNode)
+ {
+ Node parent = element.getParentNode();
+ String nsURI = element.getAttribute("xmlns:" + prefix);
+ if (nsURI.length() == 0 && element != stopNode && parent instanceof Element)
+ return getNamespaceURI(prefix, (Element)parent, stopNode);
+
+ return (nsURI.length() > 0 ? nsURI : null);
+ }
+
+ private boolean isEndMarkerIndented(Node node)
+ {
+ if (prettyprint)
+ {
+ NodeList childNodes = node.getChildNodes();
+ int len = childNodes.getLength();
+ for (int i = 0; i < len; i++)
+ {
+ Node children = childNodes.item(i);
+ if (children.getNodeType() == Node.ELEMENT_NODE)
+ {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ /** Returns a sorted list of attributes. */
+ private Attr[] sortAttributes(NamedNodeMap attrs)
+ {
+
+ int len = (attrs != null) ? attrs.getLength() : 0;
+ Attr array[] = new Attr[len];
+ for (int i = 0; i < len; i++)
+ {
+ array[i] = (Attr)attrs.item(i);
+ }
+ for (int i = 0; i < len - 1; i++)
+ {
+ String name = array[i].getNodeName();
+ int index = i;
+ for (int j = i + 1; j < len; j++)
+ {
+ String curName = array[j].getNodeName();
+ if (curName.compareTo(name) < 0)
+ {
+ name = curName;
+ index = j;
+ }
+ }
+ if (index != i)
+ {
+ Attr temp = array[i];
+ array[i] = array[index];
+ array[index] = temp;
+ }
+ }
+ return (array);
+ }
+
+ /** Normalizes the given string. */
+ public static String normalize(String s, boolean canonical)
+ {
+ StringBuffer str = new StringBuffer();
+
+ int len = (s != null) ? s.length() : 0;
+ for (int i = 0; i < len; i++)
+ {
+ char ch = s.charAt(i);
+ switch (ch)
+ {
+ case '<':
+ {
+ str.append("<");
+ break;
+ }
+ case '>':
+ {
+ str.append(">");
+ break;
+ }
+ case '&':
+ {
+ str.append("&");
+ break;
+ }
+ case '"':
+ {
+ str.append(""");
+ break;
+ }
+ case '\'':
+ {
+ str.append("'");
+ break;
+ }
+ case '\r':
+ case '\n':
+ {
+ if (canonical)
+ {
+ str.append("&#");
+ str.append(Integer.toString(ch));
+ str.append(';');
+ break;
+ }
+ // else, default append char
+ }
+ default:
+ {
+ str.append(ch);
+ }
+ }
+ }
+ return (str.toString());
+ }
+}
\ No newline at end of file
Modified: report-server/trunk/core/src/main/java/org/jboss/bpm/report/ReportFacade.java
===================================================================
--- report-server/trunk/core/src/main/java/org/jboss/bpm/report/ReportFacade.java 2009-10-28 08:53:41 UTC (rev 860)
+++ report-server/trunk/core/src/main/java/org/jboss/bpm/report/ReportFacade.java 2009-10-28 19:49:38 UTC (rev 861)
@@ -23,6 +23,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jboss.bpm.report.model.ReportReference;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.GET;
@@ -35,7 +36,10 @@
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
+import java.util.List;
+import com.google.gson.GsonBuilder;
+
/**
* BIRT integration facade.<p>
*
@@ -188,8 +192,10 @@
log.error(e);
StringBuffer sb = new StringBuffer();
- sb.append("Unable to process report:").append("<br/>");
+ sb.append("<div style='font-family:sans-serif; padding:10px;'>");
+ sb.append("<h3>Unable to process report").append("</h3>");
sb.append(e.getMessage());
+ sb.append("</div>");
return Response.ok(sb.toString()).build();
}
@@ -207,10 +213,12 @@
@GET
@Path("config")
- @Produces("text/xml")
+ @Produces("application/json")
public Response getReportConfig()
{
- return Response.ok(birtService.getTemplateConfig()).build();
+ List<ReportReference> refs = birtService.getReportReferences();
+ String json = new GsonBuilder().create().toJson(refs);
+ return Response.ok(json).build();
}
public class BirtInitException extends Exception
Added: report-server/trunk/core/src/main/java/org/jboss/bpm/report/util/BirtUtil.java
===================================================================
--- report-server/trunk/core/src/main/java/org/jboss/bpm/report/util/BirtUtil.java (rev 0)
+++ report-server/trunk/core/src/main/java/org/jboss/bpm/report/util/BirtUtil.java 2009-10-28 19:49:38 UTC (rev 861)
@@ -0,0 +1,193 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY 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 along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.report.util;
+
+import org.eclipse.birt.report.engine.api.*;
+import org.eclipse.birt.report.model.api.ReportDesignHandle;
+import org.eclipse.birt.report.model.api.ScalarParameterHandle;
+import org.eclipse.birt.report.model.api.CascadingParameterGroupHandle;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Collections;
+import java.util.Collection;
+import java.util.Iterator;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class BirtUtil
+{
+ //Function to load parameter details in a map.
+ public static HashMap<String, Serializable> loadParameterDetails(
+ IGetParameterDefinitionTask task,
+ IScalarParameterDefn scalar,
+ IReportRunnable report,
+ IParameterGroupDefn group
+ )
+ {
+ HashMap<String, Serializable> parameter = new HashMap<String, Serializable>();
+
+ if( group == null){
+ parameter.put("Parameter Group", "Default");
+ }else{
+ parameter.put("Parameter Group", group.getName());
+ }
+ parameter.put("Name", scalar.getName());
+ parameter.put("Help Text", scalar.getHelpText());
+ parameter.put("Display Name", scalar.getDisplayName());
+ //this is a format code such as > for UPPERCASE
+ parameter.put("Display Format", scalar.getDisplayFormat());
+
+ if( scalar.isHidden() ){
+ parameter.put("Hidden", "Yes");
+ }else{
+ parameter.put("Hidden", "No");
+ }
+ if( scalar.allowBlank() ){
+ parameter.put("Allow Blank", "Yes");
+ }else{
+ parameter.put("Allow Blank", "No");
+ }
+ if( scalar.allowNull() ){
+ parameter.put("Allow Null", "Yes");
+ }else{
+ parameter.put("Allow Null", "No");
+ }
+ if( scalar.isValueConcealed() ){
+ parameter.put("Conceal Entry", "Yes"); //ie passwords etc
+ }else{
+ parameter.put("Conceal Entry", "No");
+ }
+
+
+ switch (scalar.getControlType()) {
+ case IScalarParameterDefn.TEXT_BOX: parameter.put("Type", "TEXTBOX"); break;
+ case IScalarParameterDefn.LIST_BOX: parameter.put("Type", "LISTBOX"); break;
+ case IScalarParameterDefn.RADIO_BUTTON: parameter.put("Type", "RADIO_BUTTON"); break;
+ case IScalarParameterDefn.CHECK_BOX: parameter.put("Type", "CHECKBOX"); break;
+ default: parameter.put("Type", "TEXTBOX");break;
+ }
+
+
+ switch (scalar.getDataType()) {
+ case IScalarParameterDefn.TYPE_STRING: parameter.put("DataType", "STRING"); break;
+ case IScalarParameterDefn.TYPE_FLOAT: parameter.put("DataType", "NUMBER"); break;
+ case IScalarParameterDefn.TYPE_DECIMAL: parameter.put("DataType", "NUMBER"); break;
+ case IScalarParameterDefn.TYPE_DATE_TIME: parameter.put("DataType", "DATETIME"); break;
+ case IScalarParameterDefn.TYPE_BOOLEAN: parameter.put("DataType", "BOOLEAN"); break;
+ case IScalarParameterDefn.TYPE_DATE: parameter.put("DataType", "DATETIME"); break;
+ default: parameter.put("DataType", "ANY"); break;
+ }
+
+
+ //Get report design and find default value, prompt text and data set expression using the DE API
+ ReportDesignHandle reportHandle = ( ReportDesignHandle ) report.getDesignHandle( );
+ ScalarParameterHandle parameterHandle = (ScalarParameterHandle) reportHandle.findParameter( scalar.getName() );
+ parameter.put("Default Value", parameterHandle.getDefaultValue());
+ parameter.put("Prompt Text", parameterHandle.getPromptText());
+ parameter.put("Data Set Expression", parameterHandle.getValueExpr());
+
+ if(scalar.getControlType() != IScalarParameterDefn.TEXT_BOX)
+ {
+ //retrieve selection list for cascaded parameter
+ if ( parameterHandle.getContainer( ) instanceof CascadingParameterGroupHandle){
+ Collection sList = Collections.EMPTY_LIST;
+ if ( parameterHandle.getContainer( ) instanceof CascadingParameterGroupHandle )
+ {
+ int index = parameterHandle.getContainerSlotHandle( )
+ .findPosn( parameterHandle );
+ Object[] keyValue = new Object[index];
+ for ( int i = 0; i < index; i++ )
+ {
+ ScalarParameterHandle handle = (ScalarParameterHandle) ( (CascadingParameterGroupHandle) parameterHandle.getContainer( ) ).getParameters( )
+ .get( i );
+ //Use parameter default values
+ keyValue[i] = handle.getDefaultValue();
+ }
+ String groupName = parameterHandle.getContainer( ).getName( );
+ task.evaluateQuery( groupName );
+
+ sList = task.getSelectionListForCascadingGroup( groupName, keyValue );
+ HashMap<Object, String> dynamicList = new HashMap<Object, String>();
+
+
+ for ( Iterator sl = sList.iterator( ); sl.hasNext( ); )
+ {
+ IParameterSelectionChoice sI = (IParameterSelectionChoice) sl.next( );
+
+
+ Object value = sI.getValue( );
+ Object label = sI.getLabel( );
+ System.out.println( label + "--" + value);
+ dynamicList.put(value,(String) label);
+
+ }
+ parameter.put("Selection List", dynamicList);
+
+
+ }
+ }else{
+ //retrieve selection list
+ Collection selectionList = task.getSelectionList( scalar.getName() );
+
+ if ( selectionList != null )
+ {
+ HashMap<Object, String> dynamicList = new HashMap<Object, String>();
+
+ for ( Iterator sliter = selectionList.iterator( ); sliter.hasNext( ); )
+ {
+ IParameterSelectionChoice selectionItem = (IParameterSelectionChoice) sliter.next( );
+
+ Object value = selectionItem.getValue( );
+ String label = selectionItem.getLabel( );
+ //System.out.println( label + "--" + value);
+ dynamicList.put(value,label);
+
+ }
+ parameter.put("Selection List", dynamicList);
+ }
+ }
+
+ }
+
+
+ //Print out results
+ Iterator iter = parameter.keySet().iterator();
+ System.out.println("======================Parameter =" + scalar.getName());
+ while (iter.hasNext()) {
+ String name = (String) iter.next();
+ if( name.equals("Selection List")){
+ HashMap selList = (HashMap)parameter.get(name);
+ Iterator selIter = selList.keySet().iterator();
+ while (selIter.hasNext()) {
+ Object lbl = selIter.next();
+ System.out.println( "Selection List Entry ===== Key = " + lbl + " Value = " + selList.get(lbl));
+ }
+
+ }else{
+ System.out.println( name + " = " + parameter.get(name));
+ }
+ }
+ return parameter;
+ }
+}
Modified: report-server/trunk/pom.xml
===================================================================
--- report-server/trunk/pom.xml 2009-10-28 08:53:41 UTC (rev 860)
+++ report-server/trunk/pom.xml 2009-10-28 19:49:38 UTC (rev 861)
@@ -19,9 +19,11 @@
<junit.version>3.8.1</junit.version>
<resteasy.version>1.0.2.GA</resteasy.version>
<servlet.version>2.4</servlet.version>
+ <gson.version>1.2.2</gson.version>
</properties>
<modules>
+ <module>shared</module>
<module>core</module>
<module>server</module>
</modules>
@@ -87,12 +89,36 @@
<groupId>javax.xml.stream</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
- </exclusions>
+ </exclusions>
</dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>${gson.version}</version>
+ </dependency>
+
+
</dependencies>
</dependencyManagement>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+
<!-- Repositories -->
<repositories>
<repository>
Modified: report-server/trunk/report-server.iml
===================================================================
--- report-server/trunk/report-server.iml 2009-10-28 08:53:41 UTC (rev 860)
+++ report-server/trunk/report-server.iml 2009-10-28 19:49:38 UTC (rev 861)
@@ -8,19 +8,11 @@
<sourceFolder url="file://$MODULE_DIR$/core/src/main/resources" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/server/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/server/src/main/resources" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/shared/src/main/java" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: junit:junit:jar:3.8.1:test">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
<library name="M2 Dep: commons-logging:commons-logging:jar:1.1.1:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" />
@@ -203,10 +195,10 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
- <library>
+ <orderEntry type="module-library" exported="">
+ <library name="M2 Dep: com.google.code.gson:gson:jar:1.2.2:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/code/gson/gson/1.2.2/gson-1.2.2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/com/google/code/gson/gson/1.2.2/gson-1.2.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -222,6 +214,15 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
+ <library name="M2 Dep: junit:junit:jar:3.8.1:test">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.jboss.resteasy:resteasy-jaxrs:jar:1.0.2.GA:provided">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/jboss/resteasy/resteasy-jaxrs/1.0.2.GA/resteasy-jaxrs-1.0.2.GA.jar!/" />
Added: report-server/trunk/shared/pom.xml
===================================================================
--- report-server/trunk/shared/pom.xml (rev 0)
+++ report-server/trunk/shared/pom.xml 2009-10-28 19:49:38 UTC (rev 861)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <name>JBoss BPM - Report Shared</name>
+ <groupId>org.jboss.bpm</groupId>
+ <artifactId>report-shared</artifactId>
+ <packaging>jar</packaging>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.bpm</groupId>
+ <artifactId>report-parent</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+
+ <!-- Dependencies -->
+ <dependencies>
+
+ </dependencies>
+
+ <!-- Plugins -->
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ <finalName>report-shared</finalName>
+ </build>
+</project>
Added: report-server/trunk/shared/src/main/java/org/jboss/bpm/report/model/ReportParameter.java
===================================================================
--- report-server/trunk/shared/src/main/java/org/jboss/bpm/report/model/ReportParameter.java (rev 0)
+++ report-server/trunk/shared/src/main/java/org/jboss/bpm/report/model/ReportParameter.java 2009-10-28 19:49:38 UTC (rev 861)
@@ -0,0 +1,84 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY 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 along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.report.model;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class ReportParameter
+{
+ public enum Type {LISTBOX, TEXTBOX, CHECKBOX, RADIO_BUTTON}
+ public enum DataType {STRING, NUMBER, DATETIME, BOOLEAN, ANY}
+
+ private String name;
+ private String helptext;
+ private String displayName;
+
+ private Type type;
+ private DataType dataType = DataType.STRING;
+
+ public ReportParameter(String name, Type type)
+ {
+ this.name = name;
+ this.type = type;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public Type getType()
+ {
+ return type;
+ }
+
+ public String getHelptext()
+ {
+ return helptext;
+ }
+
+ public void setHelptext(String helptext)
+ {
+ this.helptext = helptext;
+ }
+
+ public String getDisplayName()
+ {
+ return displayName;
+ }
+
+ public void setDisplayName(String displayName)
+ {
+ this.displayName = displayName;
+ }
+
+ public DataType getDataType()
+ {
+ return dataType;
+ }
+
+ public void setDataType(DataType dataType)
+ {
+ this.dataType = dataType;
+ }
+}
Added: report-server/trunk/shared/src/main/java/org/jboss/bpm/report/model/ReportReference.java
===================================================================
--- report-server/trunk/shared/src/main/java/org/jboss/bpm/report/model/ReportReference.java (rev 0)
+++ report-server/trunk/shared/src/main/java/org/jboss/bpm/report/model/ReportReference.java 2009-10-28 19:49:38 UTC (rev 861)
@@ -0,0 +1,74 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY 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 along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.report.model;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Set;
+import java.util.HashSet;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public final class ReportReference
+{
+ private String title;
+ private String description;
+ private String reportFileName;
+ private Set<ReportParameter> parameterMetaData = new HashSet<ReportParameter>();
+
+
+ public ReportReference(String reportFileName)
+ {
+ this.reportFileName = reportFileName;
+ }
+
+ public void setTitle(String title)
+ {
+ this.title = title;
+ }
+
+ public void setDescription(String description)
+ {
+ this.description = description;
+ }
+
+ public String getTitle()
+ {
+ return title;
+ }
+
+ public String getDescription()
+ {
+ return description;
+ }
+
+ public String getReportFileName()
+ {
+ return reportFileName;
+ }
+
+ public Set<ReportParameter> getParameterMetaData()
+ {
+ return parameterMetaData;
+ }
+}
14 years, 6 months
- 1
- 0
Overlord SVN: r860 - in bpm-console/trunk: gui/war and 8 other directories.
by overlord-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-10-28 04:53:41 -0400 (Wed, 28 Oct 2009)
New Revision: 860
Added:
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/IconHeader.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/WidgetWindowPanel.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/piece.png
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/CoverPanel.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportFrame.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportGroup.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportParameter.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportRef.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/UpdateReportConfigAction.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/util/DOMUtil.java
Modified:
bpm-console/trunk/BPMC.ipr
bpm-console/trunk/BPMC.iws
bpm-console/trunk/bpmc-toplevel.iml
bpm-console/trunk/gui/war/gui-war.iml
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/icons/ConsoleIconBundle.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceDataView.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateInstanceDataAction.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderDispatchEvent.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportEditor.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java
bpm-console/trunk/pom.xml
bpm-console/trunk/server/integration/server-integration.iml
bpm-console/trunk/server/war/pom.xml
bpm-console/trunk/server/war/server-war.iml
Log:
Revamp reporting editor
Modified: bpm-console/trunk/BPMC.ipr
===================================================================
--- bpm-console/trunk/BPMC.ipr 2009-10-27 13:05:02 UTC (rev 859)
+++ bpm-console/trunk/BPMC.ipr 2009-10-28 08:53:41 UTC (rev 860)
@@ -186,6 +186,10 @@
<value>
<collection type="java.util.TreeSet">
<entry type="java.lang.String" value="gui-profiles" />
+ <entry type="java.lang.String" value="report-server" />
+ <entry type="java.lang.String" value="server-integration" />
+ <entry type="java.lang.String" value="shared-rpc" />
+ <entry type="java.lang.String" value="workspace-api" />
</collection>
</value>
<key type="java.lang.String" value="bpmc-toplevel" />
@@ -202,8 +206,9 @@
<entry>
<value>
<collection type="java.util.TreeSet">
- <entry type="java.lang.String" value="bpmc-toplevel" />
<entry type="java.lang.String" value="gui-profiles" />
+ <entry type="java.lang.String" value="shared-rpc" />
+ <entry type="java.lang.String" value="workspace-api" />
</collection>
</value>
<key type="java.lang.String" value="gui-war" />
@@ -219,7 +224,7 @@
<entry>
<value>
<collection type="java.util.TreeSet">
- <entry type="java.lang.String" value="bpmc-toplevel" />
+ <entry type="java.lang.String" value="shared-rpc" />
</collection>
</value>
<key type="java.lang.String" value="server-integration" />
@@ -227,7 +232,9 @@
<entry>
<value>
<collection type="java.util.TreeSet">
- <entry type="java.lang.String" value="bpmc-toplevel" />
+ <entry type="java.lang.String" value="report-server" />
+ <entry type="java.lang.String" value="server-integration" />
+ <entry type="java.lang.String" value="shared-rpc" />
</collection>
</value>
<key type="java.lang.String" value="server-war" />
@@ -393,6 +400,7 @@
<module fileurl="file://$PROJECT_DIR$/doc/doc.iml" filepath="$PROJECT_DIR$/doc/doc.iml" />
<module fileurl="file://$PROJECT_DIR$/gui/profiles/gui-profiles.iml" filepath="$PROJECT_DIR$/gui/profiles/gui-profiles.iml" />
<module fileurl="file://$PROJECT_DIR$/gui/war/gui-war.iml" filepath="$PROJECT_DIR$/gui/war/gui-war.iml" />
+ <module fileurl="file:///Users/hbraun/dev/prj/soag/report-server/trunk/report-server.iml" filepath="/Users/hbraun/dev/prj/soag/report-server/trunk/report-server.iml" />
<module fileurl="file://$PROJECT_DIR$/server/integration/server-integration.iml" filepath="$PROJECT_DIR$/server/integration/server-integration.iml" />
<module fileurl="file://$PROJECT_DIR$/server/war/server-war.iml" filepath="$PROJECT_DIR$/server/war/server-war.iml" />
<module fileurl="file://$PROJECT_DIR$/shared/rpc/shared-rpc.iml" filepath="$PROJECT_DIR$/shared/rpc/shared-rpc.iml" />
Modified: bpm-console/trunk/BPMC.iws
===================================================================
--- bpm-console/trunk/BPMC.iws 2009-10-27 13:05:02 UTC (rev 859)
+++ bpm-console/trunk/BPMC.iws 2009-10-28 08:53:41 UTC (rev 860)
@@ -92,7 +92,7 @@
</component>
<component name="DebuggerManager">
<line_breakpoints>
- <breakpoint url="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/IFrameWindowPanel.java" line="159" class="org.jboss.bpm.console.client.common.IFrameWindowPanel" package="org.jboss.bpm.console.client.common">
+ <breakpoint url="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportEditor.java" line="158" class="org.jboss.bpm.console.client.report.ReportEditor" package="org.jboss.bpm.console.client.report">
<option name="ENABLED" value="true" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
@@ -105,45 +105,6 @@
<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/process/DefinitionListView.java" line="264" class="org.jboss.bpm.console.client.process.DefinitionListView" package="org.jboss.bpm.console.client.process">
- <option name="ENABLED" value="true" />
- <option name="SUSPEND_POLICY" value="SuspendAll" />
- <option name="LOG_ENABLED" value="false" />
- <option name="LOG_EXPRESSION_ENABLED" value="false" />
- <option name="COUNT_FILTER_ENABLED" value="false" />
- <option name="COUNT_FILTER" value="0" />
- <option name="CONDITION_ENABLED" value="false" />
- <option name="CLASS_FILTERS_ENABLED" value="false" />
- <option name="INSTANCE_FILTERS_ENABLED" value="false" />
- <option name="CONDITION" value="" />
- <option name="LOG_MESSAGE" value="" />
- </breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/ConsoleConfig.java" line="92" class="org.jboss.bpm.console.client.ConsoleConfig" package="org.jboss.bpm.console.client">
- <option name="ENABLED" value="true" />
- <option name="SUSPEND_POLICY" value="SuspendAll" />
- <option name="LOG_ENABLED" value="false" />
- <option name="LOG_EXPRESSION_ENABLED" value="false" />
- <option name="COUNT_FILTER_ENABLED" value="false" />
- <option name="COUNT_FILTER" value="0" />
- <option name="CONDITION_ENABLED" value="false" />
- <option name="CLASS_FILTERS_ENABLED" value="false" />
- <option name="INSTANCE_FILTERS_ENABLED" value="false" />
- <option name="CONDITION" value="" />
- <option name="LOG_MESSAGE" value="" />
- </breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java" line="177" class="Class at InstanceListView.java:177" package="org.jboss.bpm.console.client.process">
- <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>
@@ -216,46 +177,7 @@
</component>
<component name="FileColors" enabled="false" enabledForTabs="false" />
<component name="FileEditorManager">
- <leaf>
- <file leaf-file-name="SettingsEditor.java" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditor.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="123" column="30" selection-start="3747" selection-end="3747" vertical-scroll-proportion="0.48899755">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="console.css" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css">
- <provider selected="true" editor-type-id="text-editor">
- <state line="337" column="35" selection-start="5200" selection-end="5200" vertical-scroll-proportion="0.6926771">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="ProcessEditor.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="100" column="60" selection-start="3634" selection-end="3669" vertical-scroll-proportion="0.52100843">
- <folding>
- <element signature="class#2386:3598" expanded="false" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="PreferencesView.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/PreferencesView.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="40" column="13" selection-start="1690" selection-end="1690" vertical-scroll-proportion="0.15647922">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- </leaf>
+ <leaf />
</component>
<component name="FindManager">
<FindUsagesManager>
@@ -294,378 +216,418 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</PATH_ELEMENT>
</PATH>
- </subPane>
- </component>
- <component name="PerforceChangeBrowserSettings">
- <option name="USE_CLIENT_FILTER" value="true" />
- <option name="CLIENT" value="" />
- </component>
- <component name="PerforceDirect.Settings">
- <option name="useP4CONFIG" value="true" />
- <option name="port" value="<perforce_server>:1666" />
- <option name="client" value="" />
- <option name="user" value="" />
- <option name="passwd" value="" />
- <option name="showCmds" value="false" />
- <option name="useNativeApi" value="false" />
- <option name="pathToExec" value="p4" />
- <option name="useCustomPathToExec" value="false" />
- <option name="SYNC_FORCE" value="false" />
- <option name="SYNC_RUN_RESOLVE" value="true" />
- <option name="REVERT_UNCHANGED_FILES" value="true" />
- <option name="CHARSET" value="none" />
- <option name="SHOW_BRANCHES_HISTORY" value="true" />
- <option name="ENABLED" value="true" />
- <option name="USE_LOGIN" value="false" />
- <option name="LOGIN_SILENTLY" value="false" />
- <option name="INTEGRATE_RUN_RESOLVE" value="true" />
- <option name="INTEGRATE_REVERT_UNCHANGED" value="true" />
- <option name="SERVER_TIMEOUT" value="20000" />
- </component>
- <component name="ProjectInspectionProfilesVisibleTreeState">
- <entry key="Project Default">
- <profile-state />
- </entry>
- </component>
- <component name="ProjectLevelVcsManager">
- <OptionsSetting value="true" id="Add" />
- <OptionsSetting value="true" id="Remove" />
- <OptionsSetting value="true" id="Checkin" />
- <OptionsSetting value="true" id="Checkout" />
- <OptionsSetting value="true" id="Update" />
- <OptionsSetting value="true" id="Status" />
- <OptionsSetting value="true" id="Edit" />
- <OptionsSetting value="true" id="Undo Check Out" />
- <OptionsSetting value="true" id="Compare with SourceSafe Version" />
- <OptionsSetting value="true" id="Get Latest Version" />
- <ConfirmationsSetting value="0" id="Add" />
- <ConfirmationsSetting value="0" id="Remove" />
- </component>
- <component name="ProjectPane">
- <subPane>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="BPMC.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="report-server" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="BPMC.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="server-war" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ <option name="myItemId" value="report-server" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT>
- </PATH>
- <PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="BPMC.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ <option name="myItemId" value="org" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="server-war" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ <option name="myItemId" value="jboss" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/server/war" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <option name="myItemId" value="bpm" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="report" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="BPMC.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="server-war" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ <option name="myItemId" value="gui-war" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT>
+ </PATH>
+ <PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/server/war" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <option name="myItemId" value="BPMC.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</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" />
+ <option name="myItemId" value="gui-war" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="org" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="BPMC.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="server-war" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ <option name="myItemId" value="gui-war" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/server/war" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <option name="myItemId" value="org" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</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" />
+ <option name="myItemId" value="jboss" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</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" />
+ <option name="myItemId" value="bpm" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="console" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="BPMC.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="server-war" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ <option name="myItemId" value="gui-war" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/server/war" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <option name="myItemId" value="org" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</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" />
+ <option name="myItemId" value="jboss" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</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" />
+ <option name="myItemId" value="bpm" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</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" />
+ <option name="myItemId" value="console" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</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" />
+ <option name="myItemId" value="client" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
+ </PATH>
+ <PATH>
<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" />
+ <option name="myItemId" value="BPMC.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</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" />
+ <option name="myItemId" value="gui-war" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</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" />
+ <option name="myItemId" value="org" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</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" />
+ <option name="myItemId" value="jboss" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
- </PATH>
- <PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="BPMC.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ <option name="myItemId" value="bpm" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="gui-war" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ <option name="myItemId" value="console" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="client" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="report" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="BPMC.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="gui-war" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <option name="myItemId" value="org" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
- </PATH>
- <PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="BPMC.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ <option name="myItemId" value="jboss" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="gui-war" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ <option name="myItemId" value="bpm" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <option name="myItemId" value="console" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</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" />
+ <option name="myItemId" value="client" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="process" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="BPMC.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="gui-war" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <option name="myItemId" value="org" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</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" />
+ <option name="myItemId" value="jboss" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</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" />
+ <option name="myItemId" value="bpm" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
- </PATH>
- <PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="BPMC.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ <option name="myItemId" value="console" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="gui-war" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ <option name="myItemId" value="client" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <option name="myItemId" value="common" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
+ </PATH>
+ <PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <option name="myItemId" value="BPMC.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</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" />
+ <option name="myItemId" value="bpmc-toplevel" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</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" />
+ <option name="myItemId" value="Libraries" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewLibrariesNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="BPMC.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="gui-war" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ <option name="myItemId" value="bpmc-toplevel" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <option name="myItemId" value="Libraries" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewLibrariesNode" />
</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" />
+ <option name="myItemId" value="javax" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</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" />
+ <option name="myItemId" value="xml" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
+ </PATH>
+ <PATH>
<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" />
+ <option name="myItemId" value="BPMC.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/resources/org" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <option name="myItemId" value="bpmc-toplevel" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/resources/org/jboss" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <option name="myItemId" value="Libraries" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewLibrariesNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/resources/org/jboss/bpm" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <option name="myItemId" value="javax" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/resources/org/jboss/bpm/console" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <option name="myItemId" value="xml" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="stream" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="BPMC.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="gui-war" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ <option name="myItemId" value="bpmc-toplevel" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <option name="myItemId" value="Libraries" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewLibrariesNode" />
</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" />
+ <option name="myItemId" value="javax" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</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" />
+ <option name="myItemId" value="xml" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</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" />
+ <option name="myItemId" value="parsers" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
+ </PATH>
+ <PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/resources/org" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <option name="myItemId" value="BPMC.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/resources/org/jboss" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <option name="myItemId" value="bpmc-toplevel" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/resources/org/jboss/bpm" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <option name="myItemId" value="Libraries" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewLibrariesNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/resources/org/jboss/bpm/console" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <option name="myItemId" value="javax" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
+ </PATH>
+ <PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/resources/org/jboss/bpm/console/public" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <option name="myItemId" value="BPMC.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="bpmc-toplevel" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+ </PATH_ELEMENT>
</PATH>
+ </subPane>
+ </component>
+ <component name="PerforceChangeBrowserSettings">
+ <option name="USE_CLIENT_FILTER" value="true" />
+ <option name="CLIENT" value="" />
+ </component>
+ <component name="PerforceDirect.Settings">
+ <option name="useP4CONFIG" value="true" />
+ <option name="port" value="<perforce_server>:1666" />
+ <option name="client" value="" />
+ <option name="user" value="" />
+ <option name="passwd" value="" />
+ <option name="showCmds" value="false" />
+ <option name="useNativeApi" value="false" />
+ <option name="pathToExec" value="p4" />
+ <option name="useCustomPathToExec" value="false" />
+ <option name="SYNC_FORCE" value="false" />
+ <option name="SYNC_RUN_RESOLVE" value="true" />
+ <option name="REVERT_UNCHANGED_FILES" value="true" />
+ <option name="CHARSET" value="none" />
+ <option name="SHOW_BRANCHES_HISTORY" value="true" />
+ <option name="ENABLED" value="true" />
+ <option name="USE_LOGIN" value="false" />
+ <option name="LOGIN_SILENTLY" value="false" />
+ <option name="INTEGRATE_RUN_RESOLVE" value="true" />
+ <option name="INTEGRATE_REVERT_UNCHANGED" value="true" />
+ <option name="SERVER_TIMEOUT" value="20000" />
+ </component>
+ <component name="ProjectInspectionProfilesVisibleTreeState">
+ <entry key="Project Default">
+ <profile-state />
+ </entry>
+ </component>
+ <component name="ProjectLevelVcsManager">
+ <OptionsSetting value="true" id="Add" />
+ <OptionsSetting value="true" id="Remove" />
+ <OptionsSetting value="true" id="Checkin" />
+ <OptionsSetting value="true" id="Checkout" />
+ <OptionsSetting value="true" id="Update" />
+ <OptionsSetting value="true" id="Status" />
+ <OptionsSetting value="true" id="Edit" />
+ <OptionsSetting value="true" id="Undo Check Out" />
+ <OptionsSetting value="true" id="Compare with SourceSafe Version" />
+ <OptionsSetting value="true" id="Get Latest Version" />
+ <ConfirmationsSetting value="0" id="Add" />
+ <ConfirmationsSetting value="0" id="Remove" />
+ </component>
+ <component name="ProjectPane">
+ <subPane>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="BPMC.ipr" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
+ </PATH>
+ <PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="gui-war" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ <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="PsiDirectory:$PROJECT_DIR$/gui/war" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <option name="myItemId" value="report-server" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
+ </PATH>
+ <PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <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="PsiDirectory:$PROJECT_DIR$/gui/war/src/main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <option name="myItemId" value="report-server" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java" />
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk" />
<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>
@@ -673,39 +635,41 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="gui-war" />
+ <option name="myItemId" value="report-server" />
<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="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk" />
<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="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/core" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ </PATH>
+ <PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <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="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <option name="myItemId" value="report-server" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org" />
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk" />
<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="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/core" />
<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="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/core/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/java/org/jboss/bpm/console" />
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -715,43 +679,43 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="gui-war" />
+ <option name="myItemId" value="report-server" />
<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="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk" />
<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="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/core" />
<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="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/core/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/java" />
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/core/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/org" />
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/core/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/jboss" />
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/core/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/bpm" />
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/core/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/console" />
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/core/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/client" />
+ <option name="myItemId" value="PsiDirectory:/Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm/report" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -764,46 +728,38 @@
<option name="myItemId" value="gui-war" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
+ </PATH>
+ <PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <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="PsiDirectory:$PROJECT_DIR$/gui/war/src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <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/src/main" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ </PATH>
+ <PATH>
<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" />
+ <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="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <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/src/main/java/org/jboss" />
+ <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/main/java/org/jboss/bpm" />
+ <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/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$/gui/war/src/main/java/org/jboss/bpm/console/client" />
- <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/client/process" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -826,32 +782,34 @@
<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>
+ <PATH>
<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" />
+ <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="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <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/src/main/java/org/jboss" />
+ <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/main/java/org/jboss/bpm" />
+ <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/java/org/jboss/bpm/console" />
+ <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/org/jboss/bpm/console/client" />
+ <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/jboss/bpm/console/client/engine" />
+ <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>
@@ -887,14 +845,14 @@
<option name="STATE" value="0" />
</component>
<component name="ProjectView">
- <navigator currentView="ProjectPane" proportions="0.11111111" version="1" splitterProportion="0.5">
+ <navigator currentView="PackagesPane" proportions="0.11111111" version="1" splitterProportion="0.5">
<flattenPackages PackagesPane="false" />
<showMembers />
<showModules />
<showLibraryContents />
<hideEmptyPackages PackagesPane="false" ProjectPane="false" />
<abbreviatePackageNames />
- <showStructure Favorites="false" PackagesPane="false" Scope="false" ProjectPane="false" />
+ <showStructure PackagesPane="false" ProjectPane="false" Scope="false" Favorites="false" />
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
@@ -935,6 +893,7 @@
<recent name="" />
</key>
<key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
+ <recent name="org.jboss.bpm.console.server" />
<recent name="org.jboss.bpm.console.client" />
<recent name="org.jboss.bpm.console.client.sam" />
<recent name="org.jboss.bpm.console.client.util" />
@@ -942,7 +901,7 @@
</key>
</component>
<component name="RestoreUpdateTree" />
- <component name="RunManager" selected="Remote.GWT">
+ <component name="RunManager" selected="Remote.server">
<configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
<option name="MAIN_CLASS_NAME" />
<option name="VM_PARAMETERS" />
@@ -1172,33 +1131,33 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="328" y="52" width="1278" height="980" extended-state="0" />
+ <frame x="379" y="44" width="1271" height="965" 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="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="14" />
<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.3213995" order="0" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39290988" order="1" />
- <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.27420667" 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="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.30523732" order="0" />
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3906071" order="1" />
+ <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2249191" order="1" />
+ <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32992035" order="9" />
<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" />
- <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
- <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
+ <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="7" />
+ <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="10" />
+ <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="4" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="1" />
- <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
+ <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="11" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="2" />
- <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="Maven" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="12" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24818695" 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.39184597" order="4" />
+ <window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="6" />
+ <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.38946164" 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="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="13" />
<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="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
+ <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="5" />
<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" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="5" />
@@ -1280,123 +1239,127 @@
<component name="com.intellij.ide.util.scopeChooser.ScopeChooserConfigurable" proportions="" version="1">
<option name="myLastEditedConfigurable" />
</component>
- <component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.11111111,0.5" version="1">
+ <component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.3805061" version="1">
<option name="myPlainMode" value="false" />
- <option name="myLastEditedConfigurable" value="bpmc-toplevel" />
+ <option name="myLastEditedConfigurable" value="report-server" />
</component>
<component name="com.intellij.profile.ui.ErrorOptionsConfigurable" proportions="" version="1">
<option name="myLastEditedConfigurable" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java">
+ <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm/report/ReportFacade.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="125" column="61" selection-start="3887" selection-end="3887" vertical-scroll-proportion="0.9779951">
+ <state line="191" column="58" selection-start="5926" selection-end="5926" vertical-scroll-proportion="0.7830803">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java">
+ <entry file="file:///Users/hbraun/dev/prj/soag/report-server/trunk/core/src/main/java/org/jboss/bpm/report/BirtService.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="271" column="38" selection-start="8886" selection-end="8886" vertical-scroll-proportion="0.6393643">
+ <state line="115" column="26" selection-start="3886" selection-end="3886" vertical-scroll-proportion="0.45173267">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/engine/DeploymentListView.java">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="231" column="50" selection-start="7357" selection-end="7357" vertical-scroll-proportion="0.6845966">
+ <state line="145" column="53" selection-start="4720" selection-end="4720" vertical-scroll-proportion="2.2970297">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/PagingPanel.java">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceDetailView.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="121" column="52" selection-start="3130" selection-end="3130" vertical-scroll-proportion="0.62064826">
- <folding>
- <element signature="imports" expanded="true" />
- <element signature="class#2047:2242" expanded="false" />
- <element signature="class#2363:2547" expanded="false" />
- </folding>
+ <state line="211" column="47" selection-start="6993" selection-end="6993" vertical-scroll-proportion="0.49257424">
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/task/AbstractTaskList.java">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceDataView.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="36" column="22" selection-start="1449" selection-end="1449" vertical-scroll-proportion="0.19207683">
- <folding />
+ <state line="53" column="16" selection-start="1988" selection-end="1988" vertical-scroll-proportion="-0.8274605">
+ <folding>
+ <element signature="method#parseMessage#0;class#InstanceDataView#0" expanded="false" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportGroup.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="209" column="31" selection-start="6845" selection-end="6865" vertical-scroll-proportion="0.41075796">
+ <state line="21" column="39" selection-start="1071" selection-end="1071" vertical-scroll-proportion="0.01944107">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportParameter.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="78" column="51" selection-start="3017" selection-end="3017" vertical-scroll-proportion="-2.190709">
+ <state line="33" column="3" selection-start="1256" selection-end="1256" vertical-scroll-proportion="0.2527339">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/task/TaskDetailView.java">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportEditor.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="111" column="54" selection-start="3501" selection-end="3501" vertical-scroll-proportion="0.6845966">
- <folding />
+ <state line="61" column="26" selection-start="2323" selection-end="2323" vertical-scroll-proportion="0.22982885">
+ <folding>
+ <element signature="class#2478:3422" expanded="false" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/engine/JobListView.java">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDetailView.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="127" column="49" selection-start="4184" selection-end="4184" vertical-scroll-proportion="0.7432763">
+ <state line="114" column="33" selection-start="3835" selection-end="3835" vertical-scroll-proportion="0.622665">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="46" column="6" selection-start="1992" selection-end="1992" vertical-scroll-proportion="-1.4083129">
+ <state line="40" column="13" selection-start="1701" selection-end="1701" vertical-scroll-proportion="-0.75247526">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="163" column="30" selection-start="5079" selection-end="5354" vertical-scroll-proportion="0.9608802">
+ <state line="90" column="56" selection-start="3028" selection-end="3028" vertical-scroll-proportion="0.54296386">
<folding>
- <element signature="method#onChange#0;class#4249:4777" expanded="false" />
+ <element signature="method#configure#0;class#ReportView#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/CoverPanel.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="100" column="60" selection-start="3634" selection-end="3669" vertical-scroll-proportion="0.52100843">
+ <state line="87" column="27" selection-start="3368" selection-end="3368" vertical-scroll-proportion="0.26276463">
<folding>
- <element signature="class#2386:3598" expanded="false" />
+ <element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/PreferencesView.java">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/WidgetWindowPanel.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="40" column="13" selection-start="1690" selection-end="1690" vertical-scroll-proportion="0.15647922">
- <folding />
+ <state line="85" column="19" selection-start="2594" selection-end="2594" vertical-scroll-proportion="0.9413203">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportFrame.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="337" column="35" selection-start="5200" selection-end="5200" vertical-scroll-proportion="0.6926771">
- <folding />
+ <state line="51" column="0" selection-start="1721" selection-end="1721" vertical-scroll-proportion="0.606357">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditor.java">
+ <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="123" column="30" selection-start="3747" selection-end="3747" vertical-scroll-proportion="0.48899755">
+ <state line="202" column="42" selection-start="6449" selection-end="6449" vertical-scroll-proportion="0.61145705">
<folding />
</state>
</provider>
Modified: bpm-console/trunk/bpmc-toplevel.iml
===================================================================
--- bpm-console/trunk/bpmc-toplevel.iml 2009-10-27 13:05:02 UTC (rev 859)
+++ bpm-console/trunk/bpmc-toplevel.iml 2009-10-28 08:53:41 UTC (rev 860)
@@ -24,7 +24,11 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="gui-profiles" exported="" />
+ <orderEntry type="module" module-name="report-server" />
+ <orderEntry type="module" module-name="gui-profiles" />
+ <orderEntry type="module" module-name="server-integration" />
+ <orderEntry type="module" module-name="workspace-api" />
+ <orderEntry type="module" module-name="shared-rpc" />
<orderEntry type="module-library" exported="">
<library name="M2 Dep: org.slf4j:slf4j-simple:jar:1.5.2:compile">
<CLASSES>
@@ -89,463 +93,454 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.eclipse.birt:chartengineapi:jar:2.3.2:compile">
+ <library name="M2 Dep: org.jboss.resteasy:resteasy-multipart-provider:jar:1.0.2.GA:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/eclipse/birt/chartengineapi/2.3.2/chartengineapi-2.3.2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/jboss/resteasy/resteasy-multipart-provider/1.0.2.GA/resteasy-multipart-provider-1.0.2.GA.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.eclipse.emf:common:jar:2.4.0:compile">
+ <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-incubator:jar:0.1.10:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/eclipse/emf/common/2.4.0/common-2.4.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-incubator/0.1.10/gwt-mosaic-incubator-0.1.10.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.jboss.resteasy:resteasy-multipart-provider:jar:1.0.2.GA:compile">
+ <library name="M2 Dep: net.sf.ezmorph:ezmorph:jar:1.0.6:test">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/jboss/resteasy/resteasy-multipart-provider/1.0.2.GA/resteasy-multipart-provider-1.0.2.GA.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/net/sf/ezmorph/ezmorph/1.0.6/ezmorph-1.0.6.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-incubator:jar:0.1.10:provided">
+ <library name="M2 Dep: commons-collections:commons-collections:jar:3.2.1:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-incubator/0.1.10/gwt-mosaic-incubator-0.1.10.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.eclipse.birt:scriptapi:jar:2.3.2:compile">
+ <library name="M2 Dep: org.slf4j:slf4j-api:jar:1.5.2:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/eclipse/birt/scriptapi/2.3.2/scriptapi-2.3.2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.eclipse.birt:engineapi:jar:2.3.2:compile">
+ <library name="M2 Dep: com.google.gwt:gwt-servlet:jar:1.5.3:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/eclipse/birt/engineapi/2.3.2/engineapi-2.3.2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/com/google/gwt/gwt-servlet/1.5.3/gwt-servlet-1.5.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: net.sf.ezmorph:ezmorph:jar:1.0.6:test">
+ <library name="M2 Dep: javassist:javassist:jar:3.6.0.GA:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/net/sf/ezmorph/ezmorph/1.0.6/ezmorph-1.0.6.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javassist/javassist/3.6.0.GA/javassist-3.6.0.GA.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: commons-collections:commons-collections:jar:3.2.1:provided">
+ <library name="M2 Dep: org.jboss.resteasy:jaxrs-api:jar:1.0.2.GA:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/jboss/resteasy/jaxrs-api/1.0.2.GA/jaxrs-api-1.0.2.GA.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: commons-codec:commons-codec:jar:1.3:compile">
+ <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3-sources.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1-sources.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.slf4j:slf4j-api:jar:1.5.2:compile">
+ <library name="M2 Dep: commons-logging:commons-logging:jar:1.1.1:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.google.gwt:gwt-servlet:jar:1.5.3:provided">
+ <library name="M2 Dep: junit:junit:jar:3.8.1:test">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/com/google/gwt/gwt-servlet/1.5.3/gwt-servlet-1.5.3.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.eclipse.birt:coreapi:jar:2.3.2:compile">
+ <library name="M2 Dep: net.sf.json-lib:json-lib:jar:2.2.3:test">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/eclipse/birt/coreapi/2.3.2/coreapi-2.3.2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/net/sf/json-lib/json-lib/2.2.3/json-lib-2.2.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: rhino:js:jar:1.6R2:compile">
+ <library name="M2 Dep: org.slf4j:slf4j-log4j12:jar:1.5.2:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/rhino/js/1.6R2/js-1.6R2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/slf4j/slf4j-log4j12/1.5.2/slf4j-log4j12-1.5.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: javassist:javassist:jar:3.6.0.GA:compile">
+ <library name="M2 Dep: com.googlecode.mvc4g:mvc4g:jar:1.0.0-jboss:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javassist/javassist/3.6.0.GA/javassist-3.6.0.GA.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/com/googlecode/mvc4g/mvc4g/1.0.0-jboss/mvc4g-1.0.0-jboss.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.jboss.bpm:report-core:jar:1.0.0-SNAPSHOT:compile">
+ <library name="M2 Dep: javax.xml:jaxb-impl:jar:2.1:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/jboss/bpm/report-core/1.0.0-SNAPSHOT/report-core-1.0.0-SNAPSHOT.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/xml/jaxb-impl/2.1/jaxb-impl-2.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.eclipse.emf:ecore:jar:2.4.2:compile">
+ <library name="M2 Dep: commons-beanutils:commons-beanutils:jar:1.7.0:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/eclipse/emf/ecore/2.4.2/ecore-2.4.2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar!/" />
+ </SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.w3c:flute:jar:1.2:compile">
+ <library name="M2 Dep: commons-fileupload:commons-fileupload:jar:1.2.1:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/w3c/flute/1.2/flute-1.2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-fileupload/commons-fileupload/1.2.1/commons-fileupload-1.2.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.jboss.resteasy:jaxrs-api:jar:1.0.2.GA:compile">
+ <library name="M2 Dep: commons-io:commons-io:jar:1.3.2:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/jboss/resteasy/jaxrs-api/1.0.2.GA/jaxrs-api-1.0.2.GA.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-io/commons-io/1.3.2/commons-io-1.3.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.ibm.icu:icu4j:jar:3.8.1:compile">
+ <library name="M2 Dep: javax.annotation:jsr250-api:jar:1.0:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/com/ibm/icu/icu4j/3.8.1/icu4j-3.8.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:provided">
+ <library name="M2 Dep: com.google.code.gwt-log:gwt-log:jar:2.5.2:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/com/google/code/gwt-log/gwt-log/2.5.2/gwt-log-2.5.2.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1-sources.jar!/" />
- </SOURCES>
+ <SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: commons-logging:commons-logging:jar:1.1.1:provided">
+ <library name="M2 Dep: javax.activation:activation:jar:1.1:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1-sources.jar!/" />
+ </SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: junit:junit:jar:3.8.1:test">
+ <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic:jar:0.1.10:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic/0.1.10/gwt-mosaic-0.1.10.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: net.sf.json-lib:json-lib:jar:2.2.3:test">
+ <library name="M2 Dep: commons-lang:commons-lang:jar:2.4:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/net/sf/json-lib/json-lib/2.2.3/json-lib-2.2.3.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.slf4j:slf4j-log4j12:jar:1.5.2:compile">
+ <library name="M2 Dep: javax.ejb:ejb-api:jar:3.0:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/slf4j/slf4j-log4j12/1.5.2/slf4j-log4j12-1.5.2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/ejb/ejb-api/3.0/ejb-api-3.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.googlecode.mvc4g:mvc4g:jar:1.0.0-jboss:provided">
+ <library name="M2 Dep: commons-digester:commons-digester:jar:1.8:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/com/googlecode/mvc4g/mvc4g/1.0.0-jboss/mvc4g-1.0.0-jboss.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-digester/commons-digester/1.8/commons-digester-1.8.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.eclipse.birt:modelapi:jar:2.3.2:compile">
+ <library name="M2 Dep: commons-configuration:commons-configuration:jar:1.6:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/eclipse/birt/modelapi/2.3.2/modelapi-2.3.2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-configuration/commons-configuration/1.6/commons-configuration-1.6.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: commons-discovery:commons-discovery:jar:0.2:compile">
+ <library name="M2 Dep: commons-collections:commons-collections:jar:3.2:test">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-discovery/commons-discovery/0.2/commons-discovery-0.2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-collections/commons-collections/3.2/commons-collections-3.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: javax.xml:jaxb-impl:jar:2.1:provided">
+ <library name="M2 Dep: com.google.code.gson:gson:jar:1.2.2:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/xml/jaxb-impl/2.1/jaxb-impl-2.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/com/google/code/gson/gson/1.2.2/gson-1.2.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.eclipse.birt:dataadapterapi:jar:2.3.2:compile">
+ <library name="M2 Dep: commons-beanutils:commons-beanutils-core:jar:1.8.0:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/eclipse/birt/dataadapterapi/2.3.2/dataadapterapi-2.3.2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-beanutils/commons-beanutils-core/1.8.0/commons-beanutils-core-1.8.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: commons-beanutils:commons-beanutils:jar:1.7.0:provided">
+ <library name="M2 Dep: org.scannotation:scannotation:jar:1.0.2:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/scannotation/scannotation/1.0.2/scannotation-1.0.2.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar!/" />
- </SOURCES>
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: commons-fileupload:commons-fileupload:jar:1.2.1:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-fileupload/commons-fileupload/1.2.1/commons-fileupload-1.2.1.jar!/" />
- </CLASSES>
- <JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: commons-io:commons-io:jar:1.3.2:compile">
+ <library name="M2 Dep: org.jboss.javaee:jboss-javaee:jar:5.0.0.GA:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-io/commons-io/1.3.2/commons-io-1.3.2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/jboss/javaee/jboss-javaee/5.0.0.GA/jboss-javaee-5.0.0.GA.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/jboss/javaee/jboss-javaee/5.0.0.GA/jboss-javaee-5.0.0.GA-sources.jar!/" />
+ </SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: javax.annotation:jsr250-api:jar:1.0:compile">
+ <library name="M2 Dep: org.eclipse.birt:chartengineapi:jar:2.3.2:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/eclipse/birt/chartengineapi/2.3.2/chartengineapi-2.3.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.eclipse.emf:ecore-xmi:jar:2.4.1:compile">
+ <library name="M2 Dep: org.eclipse.emf:common:jar:2.4.0:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/eclipse/emf/ecore-xmi/2.4.1/ecore-xmi-2.4.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/eclipse/emf/common/2.4.0/common-2.4.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: commons-cli:commons-cli:jar:1.0:compile">
+ <library name="M2 Dep: org.eclipse.birt:scriptapi:jar:2.3.2:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-cli/commons-cli/1.0/commons-cli-1.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/eclipse/birt/scriptapi/2.3.2/scriptapi-2.3.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.google.code.gwt-log:gwt-log:jar:2.5.2:provided">
+ <library name="M2 Dep: org.eclipse.birt:engineapi:jar:2.3.2:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/com/google/code/gwt-log/gwt-log/2.5.2/gwt-log-2.5.2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/eclipse/birt/engineapi/2.3.2/engineapi-2.3.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: javax.activation:activation:jar:1.1:provided">
+ <library name="M2 Dep: commons-codec:commons-codec:jar:1.3:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1-sources.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3-sources.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.eclipse.birt:dteapi:jar:2.3.2:compile">
+ <library name="M2 Dep: org.eclipse.birt:coreapi:jar:2.3.2:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/eclipse/birt/dteapi/2.3.2/dteapi-2.3.2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/eclipse/birt/coreapi/2.3.2/coreapi-2.3.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic:jar:0.1.10:provided">
+ <library name="M2 Dep: rhino:js:jar:1.6R2:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic/0.1.10/gwt-mosaic-0.1.10.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/rhino/js/1.6R2/js-1.6R2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: commons-lang:commons-lang:jar:2.4:provided">
+ <library name="M2 Dep: org.eclipse.emf:ecore:jar:2.4.2:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/eclipse/emf/ecore/2.4.2/ecore-2.4.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.w3c:sac:jar:1.3:compile">
+ <library name="M2 Dep: org.w3c:flute:jar:1.2:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/w3c/sac/1.3/sac-1.3.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/w3c/flute/1.2/flute-1.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: javax.ejb:ejb-api:jar:3.0:provided">
+ <library name="M2 Dep: com.ibm.icu:icu4j:jar:3.8.1:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/ejb/ejb-api/3.0/ejb-api-3.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/com/ibm/icu/icu4j/3.8.1/icu4j-3.8.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: commons-digester:commons-digester:jar:1.8:provided">
+ <library name="M2 Dep: org.eclipse.birt:modelapi:jar:2.3.2:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-digester/commons-digester/1.8/commons-digester-1.8.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/eclipse/birt/modelapi/2.3.2/modelapi-2.3.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.lowagie:itext:jar:1.3:compile">
+ <library name="M2 Dep: commons-discovery:commons-discovery:jar:0.2:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/com/lowagie/itext/1.3/itext-1.3.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-discovery/commons-discovery/0.2/commons-discovery-0.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: commons-configuration:commons-configuration:jar:1.6:provided">
+ <library name="M2 Dep: org.eclipse.birt:dataadapterapi:jar:2.3.2:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-configuration/commons-configuration/1.6/commons-configuration-1.6.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/eclipse/birt/dataadapterapi/2.3.2/dataadapterapi-2.3.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: commons-collections:commons-collections:jar:3.2:test">
+ <library name="M2 Dep: org.eclipse.emf:ecore-xmi:jar:2.4.1:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-collections/commons-collections/3.2/commons-collections-3.2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/eclipse/emf/ecore-xmi/2.4.1/ecore-xmi-2.4.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.google.code.gson:gson:jar:1.2.2:provided">
+ <library name="M2 Dep: commons-cli:commons-cli:jar:1.0:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/com/google/code/gson/gson/1.2.2/gson-1.2.2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-cli/commons-cli/1.0/commons-cli-1.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: commons-beanutils:commons-beanutils-core:jar:1.8.0:provided">
+ <library name="M2 Dep: org.eclipse.birt:dteapi:jar:2.3.2:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-beanutils/commons-beanutils-core/1.8.0/commons-beanutils-core-1.8.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/eclipse/birt/dteapi/2.3.2/dteapi-2.3.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.scannotation:scannotation:jar:1.0.2:compile">
+ <library name="M2 Dep: org.w3c:sac:jar:1.3:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/scannotation/scannotation/1.0.2/scannotation-1.0.2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/w3c/sac/1.3/sac-1.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.jboss.javaee:jboss-javaee:jar:5.0.0.GA:provided">
+ <library name="M2 Dep: com.lowagie:itext:jar:1.3:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/jboss/javaee/jboss-javaee/5.0.0.GA/jboss-javaee-5.0.0.GA.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/com/lowagie/itext/1.3/itext-1.3.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/jboss/javaee/jboss-javaee/5.0.0.GA/jboss-javaee-5.0.0.GA-sources.jar!/" />
- </SOURCES>
+ <SOURCES />
</library>
</orderEntry>
<orderEntryProperties />
Modified: bpm-console/trunk/gui/war/gui-war.iml
===================================================================
--- bpm-console/trunk/gui/war/gui-war.iml 2009-10-27 13:05:02 UTC (rev 859)
+++ bpm-console/trunk/gui/war/gui-war.iml 2009-10-28 08:53:41 UTC (rev 860)
@@ -11,8 +11,9 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="bpmc-toplevel" />
<orderEntry type="module" module-name="gui-profiles" />
+ <orderEntry type="module" module-name="workspace-api" />
+ <orderEntry type="module" module-name="shared-rpc" />
<orderEntry type="module-library">
<library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:provided">
<CLASSES>
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-10-27 13:05:02 UTC (rev 859)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java 2009-10-28 08:53:41 UTC (rev 860)
@@ -181,19 +181,19 @@
return config.getConsoleServerUrl() + "/rs/test/undeploy/harness";
}
- public String getOverallReportUrl()
+ public String getGeneralReportUrl(String templateName)
{
- String name = URL.encode(config.getOverallReportFile());
- String url = config.getConsoleServerUrl() + "/rs/report/view/" + name;
+ String reportFileName = URL.encode(templateName);
+ String url = config.getConsoleServerUrl() + "/rs/report/view/" + reportFileName;
if (!GWT.isScript())
url += "?id=birt";
return url;
}
- public String getProcessSummaryReportUrl(String defintionId)
+ public String getProcessSummaryReportUrl(String templateName, String definitionId)
{
- String encId = URL.encode(defintionId);
- String reportFileName = URL.encode(config.getProcessSummaryReportFile());
+ String encId = URL.encode(definitionId);
+ String reportFileName = URL.encode(templateName);
String url = config.getConsoleServerUrl() + "/rs/report/view/" + reportFileName + "?procId=" + encId;
if (!GWT.isScript())
url += "&id=birt";
Added: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/IconHeader.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/IconHeader.java (rev 0)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/IconHeader.java 2009-10-28 08:53:41 UTC (rev 860)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY 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 along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.console.client.common;
+
+import org.gwt.mosaic.ui.client.layout.LayoutPanel;
+import org.gwt.mosaic.ui.client.layout.BoxLayout;
+import org.gwt.mosaic.ui.client.Label;
+import com.google.gwt.user.client.ui.AbstractImagePrototype;
+import com.google.gwt.user.client.ui.HTML;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class IconHeader extends LayoutPanel
+{
+
+ public IconHeader(AbstractImagePrototype icon, String title)
+ {
+ super(new BoxLayout(BoxLayout.Orientation.HORIZONTAL));
+ setPadding(5);
+
+ this.add(icon.createImage());
+ this.add(new HTML(title));
+ }
+}
Added: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/WidgetWindowPanel.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/WidgetWindowPanel.java (rev 0)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/WidgetWindowPanel.java 2009-10-28 08:53:41 UTC (rev 860)
@@ -0,0 +1,88 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY 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 along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.console.client.common;
+
+import org.gwt.mosaic.ui.client.WindowPanel;
+import org.gwt.mosaic.ui.client.Caption;
+import org.gwt.mosaic.core.client.Dimension;
+import org.jboss.bpm.console.client.util.WindowUtil;
+import com.google.gwt.user.client.WindowCloseListener;
+import com.google.gwt.user.client.WindowResizeListener;
+import com.google.gwt.user.client.Window;
+import com.google.gwt.user.client.ui.Widget;
+
+/**
+ * General purpose window panel
+ *
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class WidgetWindowPanel
+{
+ private WindowPanel window;
+
+ public WidgetWindowPanel(String title, final Widget widget)
+ {
+ window = new WindowPanel(title);
+ window.setAnimationEnabled(true);
+ //instanceDataWindowPanel.setSize("320px", "240px");
+
+ window.addWindowCloseListener(new WindowCloseListener() {
+ public void onWindowClosed() {
+
+ }
+
+ public String onWindowClosing() {
+ return null;
+ }
+ });
+
+ window.addWindowResizeListener(
+ new WindowResizeListener() {
+
+ public void onWindowResized(int i, int i1)
+ {
+
+ }
+ }
+ );
+
+ window.setWidget(widget);
+
+ WindowUtil.addMaximizeButton(window, Caption.CaptionRegion.RIGHT);
+ WindowUtil.addMinimizeButton(window, Caption.CaptionRegion.RIGHT);
+
+
+ final int width = Window.getClientWidth()-200;
+ final int height = Window.getClientHeight()-100;
+
+ window.setContentSize(
+ new Dimension(width,height)
+ );
+
+ window.center();
+ }
+
+ public void close()
+ {
+ window.close();
+ }
+}
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/ConsoleIconBundle.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/ConsoleIconBundle.java 2009-10-27 13:05:02 UTC (rev 859)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/ConsoleIconBundle.java 2009-10-28 08:53:41 UTC (rev 860)
@@ -138,4 +138,9 @@
* @gwt.resource arrow_blue.png
*/
AbstractImagePrototype arrowIcon();
+
+ /**
+ * @gwt.resource piece.png
+ */
+ AbstractImagePrototype pieceIcon();
}
Added: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/piece.png
===================================================================
(Binary files differ)
Property changes on: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/piece.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceDataView.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceDataView.java 2009-10-27 13:05:02 UTC (rev 859)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceDataView.java 2009-10-28 08:53:41 UTC (rev 860)
@@ -24,7 +24,6 @@
import com.google.gwt.xml.client.Document;
import com.google.gwt.xml.client.NamedNodeMap;
import com.google.gwt.xml.client.Node;
-import com.google.gwt.xml.client.NodeList;
import com.mvc4g.client.Controller;
import com.mvc4g.client.ViewInterface;
import org.gwt.mosaic.ui.client.ListBox;
@@ -32,6 +31,7 @@
import org.gwt.mosaic.ui.client.list.DefaultListModel;
import org.jboss.bpm.console.client.LazyPanel;
import org.jboss.bpm.console.client.util.ConsoleLog;
+import org.jboss.bpm.console.client.util.DOMUtil;
import java.util.ArrayList;
import java.util.List;
@@ -119,7 +119,7 @@
//Document messageDom = XMLParser.parse(messageXml);
Node dataSetNode = messageDom.getElementsByTagName("dataset").item(0);
- List<Node> dataSetNodeChildren = filterChildNodes(dataSetNode.getChildNodes());
+ List<Node> dataSetNodeChildren = DOMUtil.getChildElements(dataSetNode.getChildNodes());
List<DataEntry> results = new ArrayList<DataEntry>();
for(Node dataNode : dataSetNodeChildren)
@@ -127,14 +127,14 @@
DataEntry dataEntry = new DataEntry();
NamedNodeMap dataNodeAttributes = dataNode.getAttributes();
- Node valueNode = filterChildNodes(dataNode.getChildNodes()).get(0); // expected to have just one child‚
+ Node valueNode = DOMUtil.getChildElements(dataNode.getChildNodes()).get(0); // expected to have just one child‚
NamedNodeMap valueNodeAttributes = valueNode.getAttributes();
dataEntry.key = dataNodeAttributes.getNamedItem("key").getNodeValue();
dataEntry.java = dataNodeAttributes.getNamedItem("javaType").getNodeValue();
dataEntry.xsd = valueNodeAttributes.getNamedItem("xsi:type").getNodeValue();
- List<Node> valueChildElements = filterChildNodes(valueNode.getChildNodes());
+ List<Node> valueChildElements = DOMUtil.getChildElements(valueNode.getChildNodes());
if(valueChildElements.isEmpty()
&& valueNode.hasChildNodes()
@@ -178,21 +178,6 @@
this.layout();
}
- private List<Node> filterChildNodes(NodeList childNodes)
- {
- List<Node> result = new ArrayList<Node>();
-
- for(int i=0; i<childNodes.getLength(); i++)
- {
- Node n = childNodes.item(i);
- if(n.getNodeType()!=Node.ELEMENT_NODE) // skip #text
- continue;
- else
- result.add(n);
- }
- return result;
- }
-
private class DataEntry
{
String key;
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateInstanceDataAction.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateInstanceDataAction.java 2009-10-27 13:05:02 UTC (rev 859)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateInstanceDataAction.java 2009-10-28 08:53:41 UTC (rev 860)
@@ -58,7 +58,6 @@
{
String id = (String)event;
String xml = response.getText();
- System.out.println(xml);
Document messageDom = XMLParser.parse(xml);
InstanceDataView view = (InstanceDataView)controller.getView(InstanceDataView.ID);
view.update(id, messageDom);
Added: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/CoverPanel.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/CoverPanel.java (rev 0)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/CoverPanel.java 2009-10-28 08:53:41 UTC (rev 860)
@@ -0,0 +1,171 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY 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 along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.bpm.console.client.report;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.user.client.ui.*;
+import com.google.gwt.gen2.event.dom.client.ClickEvent;
+import com.mvc4g.client.Controller;
+import com.mvc4g.client.Event;
+import com.mvc4g.client.ViewInterface;
+import org.gwt.mosaic.ui.client.CaptionLayoutPanel;
+import org.gwt.mosaic.ui.client.layout.BoxLayout;
+import org.gwt.mosaic.ui.client.layout.BoxLayoutData;
+import org.gwt.mosaic.ui.client.layout.LayoutPanel;
+import org.jboss.bpm.console.client.ApplicationContext;
+import org.jboss.bpm.console.client.Registry;
+import org.jboss.bpm.console.client.URLBuilder;
+import org.jboss.bpm.console.client.common.IconHeader;
+import org.jboss.bpm.console.client.common.WidgetWindowPanel;
+import org.jboss.bpm.console.client.common.HeaderLabel;
+import org.jboss.bpm.console.client.icons.ConsoleIconBundle;
+
+import java.util.List;
+import java.util.ArrayList;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+class CoverPanel extends LayoutPanel implements ViewInterface
+{
+ public final static String ID = CoverPanel.class.getName();
+
+ private Controller controller;
+ private ApplicationContext appContext;
+ private WidgetWindowPanel window;
+
+ public CoverPanel()
+ {
+ super(new BoxLayout(BoxLayout.Orientation.VERTICAL));
+ this.setPadding(10);
+ HTML html = new HTML("The following reports are available.<br/> " +
+ "Please note that rendering may take a while.");
+ this.add(html);
+
+ this.appContext = Registry.get(ApplicationContext.class);
+ }
+
+ public void update(List<ReportGroup> groups)
+ {
+ ConsoleIconBundle icons = GWT.create(ConsoleIconBundle.class);
+
+ for(final ReportGroup group : groups)
+ {
+ CaptionLayoutPanel p = new CaptionLayoutPanel(group.name);
+ final boolean hasParameters = group.params.size()>0;
+
+ //p.add(new HeaderLabel(group.name));
+ LayoutPanel inner = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL));
+
+ for(final ReportRef reportRef : group.reports)
+ {
+ LayoutPanel row = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.HORIZONTAL));
+ IconHeader header = new IconHeader(icons.pieceIcon(), reportRef.name);
+ header.setWidth("95%");
+ row.add(
+ header,
+ new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)
+ );
+
+ row.add(new Button("Render",
+ new ClickListener()
+ {
+ public void onClick(Widget widget)
+ {
+ if(hasParameters)
+ {
+ window = new WidgetWindowPanel("Hello World", createForm(reportRef, group));
+ }
+ else
+ {
+ String url = URLBuilder.getInstance().getGeneralReportUrl(reportRef.template);
+ controller.handleEvent(
+ new Event(RenderReportAction.ID,
+ new RenderDispatchEvent(reportRef.name, url)
+ )
+ );
+ }
+ }
+ })
+ );
+
+ inner.add(row, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
+ }
+
+ p.add(inner);
+ this.add(p, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH));
+
+ }
+
+
+ Registry.get(ApplicationContext.class).refreshView();
+ }
+
+
+ public void setController(Controller controller)
+ {
+ this.controller = controller;
+ }
+
+ private Widget createForm(
+ final ReportRef reportRef,
+ final ReportGroup reportGroup)
+ {
+ LayoutPanel p = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL));
+ HeaderLabel label = new HeaderLabel("Report Parameters", true);
+ p.add(label, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
+
+ Grid grid = new Grid(reportGroup.params.size(),2);
+
+ int row = 0;
+ final List<TextBox> inputFields = new ArrayList<TextBox>();
+ for(ReportParameter reportParam : reportGroup.params)
+ {
+ grid.setWidget(row,0, new Label(reportParam.name));
+ TextBox textBox = new TextBox();
+ inputFields.add(textBox);
+ grid.setWidget(row,1, textBox);
+ row++;
+ }
+
+ p.add(grid);
+ p.add(new Button("Submit",
+ new ClickListener()
+ {
+ public void onClick(Widget widget)
+ {
+ String url = URLBuilder.getInstance().getProcessSummaryReportUrl(
+ reportRef.template, inputFields.get(0).getText()); // TODO: match params
+
+ controller.handleEvent(
+ new Event(RenderReportAction.ID,
+ new RenderDispatchEvent(reportRef.name, url))
+ );
+
+ window.close();
+ }
+ })
+ );
+
+ return p;
+ }
+}
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderDispatchEvent.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderDispatchEvent.java 2009-10-27 13:05:02 UTC (rev 859)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderDispatchEvent.java 2009-10-28 08:53:41 UTC (rev 860)
@@ -26,18 +26,18 @@
*/
public final class RenderDispatchEvent
{
- String targetView;
- String dispatchUrl;
+ String title;
+ String dispatchUrl;
public RenderDispatchEvent(String targetView, String dispatchUrl)
{
- this.targetView = targetView;
+ this.title = targetView;
this.dispatchUrl = dispatchUrl;
}
- public String getTargetView()
+ public String getTitle()
{
- return targetView;
+ return title;
}
public String getDispatchUrl()
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java 2009-10-27 13:05:02 UTC (rev 859)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java 2009-10-28 08:53:41 UTC (rev 860)
@@ -59,13 +59,13 @@
RequestBuilder.GET, url);
ConsoleLog.debug(RequestBuilder.GET +": " + url);
- final ReportView view = (ReportView)controller.getView(event.getTargetView());
+ final ReportEditor view = (ReportEditor)controller.getView(ReportEditor.ID);
try
{
controller.handleEvent( LoadingStatusAction.ON );
- view.setLoading(true);
-
+ //view.setLoading(true);
+
final Request request = builder.sendRequest(null,
new RequestCallback()
{
@@ -86,7 +86,7 @@
{
// update view
- view.update(event.getDispatchUrl());
+ view.displayReport(event.getTitle(), event.getDispatchUrl());
}
else
{
@@ -100,7 +100,7 @@
finally
{
controller.handleEvent( LoadingStatusAction.OFF );
- view.setLoading(false);
+ //view.setLoading(false);
}
}
}
@@ -130,7 +130,7 @@
// Couldn't connect to server
handleError(url, e);
controller.handleEvent( LoadingStatusAction.OFF );
- view.setLoading(false);
+ //view.setLoading(false);
}
}
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportEditor.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportEditor.java 2009-10-27 13:05:02 UTC (rev 859)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportEditor.java 2009-10-28 08:53:41 UTC (rev 860)
@@ -22,10 +22,15 @@
package org.jboss.bpm.console.client.report;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.user.client.ui.SourcesTabEvents;
-import com.google.gwt.user.client.ui.TabListener;
+import com.google.gwt.user.client.DOM;
+import com.google.gwt.user.client.ui.*;
import com.mvc4g.client.ActionInterface;
+import com.mvc4g.client.Controller;
+import com.mvc4g.client.ViewInterface;
+import com.mvc4g.client.Event;
import org.gwt.mosaic.ui.client.DecoratedTabLayoutPanel;
+import org.gwt.mosaic.ui.client.ImageButton;
+import org.gwt.mosaic.ui.client.WindowPanel;
import org.gwt.mosaic.ui.client.layout.BorderLayout;
import org.gwt.mosaic.ui.client.layout.BorderLayoutData;
import org.jboss.bpm.console.client.ApplicationContext;
@@ -38,7 +43,7 @@
/**
* @author Heiko.Braun <heiko.braun(a)jboss.com>
*/
-public class ReportEditor extends Editor
+public class ReportEditor extends Editor implements ViewInterface
{
public final static String ID = ReportEditor.class.getName();
@@ -49,6 +54,10 @@
super(appContext);
}
+ public void setController(Controller controller)
+ {
+ }
+
public void initialize()
{
if(!isInitialized())
@@ -82,7 +91,6 @@
if(!lazyPanel.isInitialized())
{
lazyPanel.initialize();
- appContext.refreshView(); // TODO: hack around rendering problems
}
}
}
@@ -91,15 +99,21 @@
this.add(tabPanel, new BorderLayoutData(BorderLayout.Region.CENTER));
// create and register views
- registerView(ReportView.ID, new ReportView(appContext));
+ ReportView view = new ReportView();
+ registerView(ReportView.ID, view);
+ view.initialize();
+
+ controller.addView(ID, this);
// create and register actions
- //registerAction(UpdateDefinitionsAction.ID, new UpdateDefinitionsAction(appContext));
+ registerAction(UpdateReportConfigAction.ID, new UpdateReportConfigAction());
// display tab, needs to visible for correct rendering
tabPanel.selectTab(0);
- appContext.refreshView();
+ // load report config
+ controller.handleEvent(new Event(UpdateReportConfigAction.ID, null));
+
this.isInitialized = true;
}
}
@@ -138,4 +152,49 @@
new ReportEditorNavigation(appContext)
);
}
+
+ public void displayReport(String title, String dispatchUrl)
+ {
+ boolean match = false;
+ for(int i=1; i<tabPanel.getWidgetCount(); i++)
+ {
+ ReportFrame openTab = (ReportFrame)tabPanel.getWidget(i);
+ if(openTab.getUrl().equals(dispatchUrl))
+ {
+ tabPanel.selectTab(i);
+ match=true;
+ break;
+ }
+ }
+
+ if(!match)
+ {
+ ReportFrame reportFrame = new ReportFrame(dispatchUrl);
+ tabPanel.add(reportFrame, newLabel(reportFrame, title, tabPanel.getWidgetCount()));
+ tabPanel.selectTab(tabPanel.getWidgetCount()-1);
+
+ }
+ }
+
+ private Widget newLabel(final Widget widget, final String string,
+ final int index) {
+ final HorizontalPanel hPanel = new HorizontalPanel();
+ final HTML label = new HTML(string);
+ DOM.setStyleAttribute(label.getElement(), "whiteSpace", "nowrap");
+ ImageButton closeBtn = new ImageButton(
+ WindowPanel.CAPTION_IMAGES.windowClose());
+ closeBtn.addClickListener(new ClickListener() {
+ public void onClick(Widget sender) {
+ int widgetIndex = tabPanel.getWidgetIndex(widget);
+ if (widgetIndex == tabPanel.getSelectedTab()) {
+ tabPanel.selectTab(widgetIndex - 1);
+ }
+ tabPanel.remove(widgetIndex);
+ }
+ });
+ hPanel.add(label);
+ hPanel.add(new HTML("   "));
+ hPanel.add(closeBtn);
+ return hPanel;
+ }
}
Added: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportFrame.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportFrame.java (rev 0)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportFrame.java 2009-10-28 08:53:41 UTC (rev 860)
@@ -0,0 +1,83 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY 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 along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.console.client.report;
+
+import org.gwt.mosaic.ui.client.layout.LayoutPanel;
+import org.jboss.bpm.console.client.LazyPanel;
+import com.google.gwt.user.client.DOM;
+import com.google.gwt.user.client.ui.Frame;
+
+import java.util.Date;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class ReportFrame extends LayoutPanel implements LazyPanel
+{
+
+ private Frame frame;
+ private String url;
+ private boolean isInitialized;
+
+ public ReportFrame(String url)
+ {
+ super();
+ setPadding(0);
+ this.url = url;
+
+ // report frame
+ frame = new Frame();
+ DOM.setStyleAttribute(frame.getElement(), "border", "none");
+ this.add(frame);
+ }
+
+ public String getUrl()
+ {
+ return url;
+ }
+
+ public boolean isInitialized()
+ {
+ return isInitialized;
+ }
+
+ public void initialize()
+ {
+ if(!isInitialized)
+ {
+ setFrameUrl(url);
+ isInitialized = true;
+ }
+ }
+
+ private void setFrameUrl(String url)
+ {
+ // https://jira.jboss.org/jira/browse/JBPM-2244
+ frame.getElement().setId(
+ String.valueOf( new Date().getTime())
+ );
+
+ frame.setUrl(url);
+ }
+
+
+}
Added: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportGroup.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportGroup.java (rev 0)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportGroup.java 2009-10-28 08:53:41 UTC (rev 860)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY 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 along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.console.client.report;
+
+import java.util.List;
+import java.util.ArrayList;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+class ReportGroup
+{
+ String name;
+ List<ReportParameter> params = new ArrayList<ReportParameter>();
+ List<ReportRef> reports = new ArrayList<ReportRef>();
+}
Added: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportParameter.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportParameter.java (rev 0)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportParameter.java 2009-10-28 08:53:41 UTC (rev 860)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY 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 along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.console.client.report;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public final class ReportParameter
+{
+ String name;
+ String desc;
+
+
+ public ReportParameter(String name, String desc)
+ {
+ this.name = name;
+ this.desc = desc;
+ }
+}
Added: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportRef.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportRef.java (rev 0)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportRef.java 2009-10-28 08:53:41 UTC (rev 860)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY 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 along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.console.client.report;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+class ReportRef
+{
+ String name;
+ String template;
+
+ public ReportRef(String name, String template)
+ {
+ this.name = name;
+ this.template = template;
+ }
+
+}
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java 2009-10-27 13:05:02 UTC (rev 859)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java 2009-10-28 08:53:41 UTC (rev 860)
@@ -22,30 +22,25 @@
package org.jboss.bpm.console.client.report;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.user.client.Command;
-import com.google.gwt.user.client.DOM;
import com.google.gwt.user.client.Timer;
-import com.google.gwt.user.client.ui.Frame;
-import com.google.gwt.user.client.ui.Widget;
+import com.google.gwt.xml.client.Document;
+import com.google.gwt.xml.client.NamedNodeMap;
+import com.google.gwt.xml.client.Node;
import com.mvc4g.client.Controller;
import com.mvc4g.client.Event;
+import org.gwt.mosaic.ui.client.DeckLayoutPanel;
import org.gwt.mosaic.ui.client.Label;
-import org.gwt.mosaic.ui.client.PopupMenu;
-import org.gwt.mosaic.ui.client.ToolBar;
-import org.gwt.mosaic.ui.client.ToolButton;
-import org.gwt.mosaic.ui.client.layout.BoxLayout;
-import org.gwt.mosaic.ui.client.layout.BoxLayoutData;
import org.gwt.mosaic.ui.client.layout.LayoutPanel;
import org.jboss.bpm.console.client.ApplicationContext;
-import org.jboss.bpm.console.client.URLBuilder;
import org.jboss.bpm.console.client.common.AbstractView;
import org.jboss.bpm.console.client.icons.ConsoleIconBundle;
import org.jboss.bpm.console.client.search.SearchDefinitionView;
-import org.jboss.bpm.console.client.search.SearchDelegate;
-import org.jboss.bpm.console.client.search.SearchWindow;
import org.jboss.bpm.console.client.search.UpdateSearchDefinitionsAction;
+import org.jboss.bpm.console.client.util.ConsoleLog;
+import org.jboss.bpm.console.client.util.DOMUtil;
-import java.util.Date;
+import java.util.ArrayList;
+import java.util.List;
/**
* @author Heiko.Braun <heiko.braun(a)jboss.com>
@@ -56,20 +51,15 @@
private Controller controller;
private boolean isInitialized;
- private ApplicationContext appContext;
- private LayoutPanel layout;
- private Frame frame;
-
- private SearchDefinitionView search;
-
private LayoutPanel loadingPanel;
-
- public ReportView(ApplicationContext appContext)
+ private DeckLayoutPanel deck;
+ private CoverPanel coverpanel;
+
+ public ReportView()
{
super();
- this.appContext = appContext;
ConsoleIconBundle icons = GWT.create(ConsoleIconBundle.class);
- setTitle("Process Reports");
+ setTitle("Available Reports");
setIcon(icons.reportIcon());
}
@@ -82,172 +72,89 @@
{
if(!isInitialized)
{
-
// layout
- layout = new LayoutPanel( new BoxLayout(BoxLayout.Orientation.VERTICAL));
- layout.setPadding(0);
- layout.setWidgetSpacing(0);
+ deck = new DeckLayoutPanel();
- // search capabilities
- search = new SearchDefinitionView(
- appContext,
- new SearchDelegate()
- {
- public void handleResult(String procDefId)
- {
- String reportUrl = URLBuilder.getInstance().getProcessSummaryReportUrl(procDefId);
-
- // load report
- controller.handleEvent(
- new Event(RenderReportAction.ID,
- new RenderDispatchEvent(
- ReportView.ID, reportUrl
- )
- )
- );
- }
-
- public String getActionName()
- {
- return "Open report";
- }
- }
- );
-
-
- // report frame
- frame = new Frame();
- DOM.setStyleAttribute(frame.getElement(), "border", "none");
-
- // toolbar
- final LayoutPanel toolBox = new LayoutPanel();
- toolBox.setPadding(0);
- toolBox.setWidgetSpacing(5);
- //toolBox.setLayout(new BoxLayout(BoxLayout.Orientation.VERTICAL));
-
- final ToolBar toolBar = new ToolBar();
- toolBar.add(createMenuBtn());
- toolBox.add(toolBar, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
-
- // loading panel
+ // loading
loadingPanel = new LayoutPanel();
- loadingPanel.add(new Label("Loading, please wait..."));
+ loadingPanel.add(new Label("Loading..."));
loadingPanel.setVisible(false);
+ deck.add(loadingPanel);
- // assembly
- layout.add(toolBox, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
- layout.add(loadingPanel, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
- layout.add(frame, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH));
+ // cover
+ coverpanel = new CoverPanel();
+ deck.add(coverpanel);
+
+ this.add(deck);
- this.add(layout);
+ // views and actions
+ controller.addView(CoverPanel.ID, coverpanel);
- // views and actions
- controller.addView(
- "report.definition.search", search
- );
-
controller.addAction(UpdateSearchDefinitionsAction.ID, new UpdateSearchDefinitionsAction());
controller.addAction(RenderReportAction.ID, new RenderReportAction());
- // initial report
- controller.handleEvent(
- new Event(RenderReportAction.ID,
- new RenderDispatchEvent(
- ReportView.ID, URLBuilder.getInstance().getOverallReportUrl()
- )
- )
- );
+ deck.showWidget(0);
this.isInitialized = true;
}
}
-
- public void onClick(Widget widget)
- {
- System.out.println(widget);
- }
-
-
- private Widget createMenuBtn()
- {
- // Add a menu button
- ToolButton menuButton = new ToolButton("Available Reports");
- menuButton.setStyle(ToolButton.ToolButtonStyle.MENU);
-
- // Make a command that we will execute from all menu items.
- Command cmd1 = new Command() {
- public void execute() {
- setFrameUrl(URLBuilder.getInstance().getOverallReportUrl());
- }
- };
-
- Command cmd2 = new Command() {
- public void execute()
- {
- SearchWindow sw = new SearchWindow("Open process summary report", search);
- sw.center();
-
- controller.handleEvent(
- new Event(
- UpdateSearchDefinitionsAction.ID,
- "report.definition.search"
- )
- );
-
- }
- };
-
- PopupMenu menuBtnMenu = new PopupMenu();
- menuBtnMenu.addItem("Overall System Activity", cmd1);
- menuBtnMenu.addItem("Process Summary", cmd2);
-
- menuButton.setMenu(menuBtnMenu);
-
- return menuButton;
- }
-
public void setController(Controller controller)
{
this.controller = controller;
}
-
- private void setFrameUrl(String url)
+
+ public void configure(Document configDOM)
{
- // https://jira.jboss.org/jira/browse/JBPM-2244
- frame.getElement().setId(
- String.valueOf( new Date().getTime())
- );
+ ConsoleLog.debug("Report Config: "+configDOM);
- frame.setUrl(url);
+ Node reportsNode = configDOM.getElementsByTagName("reports").item(0);
+ List<Node> groups = DOMUtil.getChildElements(reportsNode.getChildNodes());
+ List<ReportGroup> results = new ArrayList<ReportGroup>();
- }
-
- public void update(String reportUrl)
- {
- setFrameUrl(reportUrl);
- }
-
- void setLoading(boolean b)
- {
- loadingPanel.setVisible(b);
- if(!b)
+ for(Node groupNode : groups)
{
- Timer t = new Timer()
- {
+ ReportGroup reportGroup = new ReportGroup();
+ reportGroup.name = groupNode.getAttributes().getNamedItem("name").getNodeValue();
- public void run()
+ List<Node> groupChildren = DOMUtil.getChildElements(groupNode.getChildNodes());
+ for(Node childNode : groupChildren)
+ {
+ String name = childNode.getNodeName();
+ NamedNodeMap atts = childNode.getAttributes();
+
+ if(name.equals("report"))
{
- frame.setVisible(true);
- appContext.refreshView();
+ reportGroup.reports.add(
+ new ReportRef(
+ atts.getNamedItem("name").getNodeValue(),
+ atts.getNamedItem("template").getNodeValue()
+ )
+ );
}
- };
+ else if(name.equals("init-params"))
+ {
+ List<Node> params = DOMUtil.getChildElements(childNode.getChildNodes());
+ for(Node paramNode: params)
+ {
+ NamedNodeMap paramAtts = paramNode.getAttributes();
+ reportGroup.params.add(
+ new ReportParameter(
+ paramAtts.getNamedItem("name").getNodeValue(),
+ paramAtts.getNamedItem("desc").getNodeValue()
+ )
+ );
+ }
+ }
+ }
- t.schedule(1500);
+ results.add(reportGroup);
}
- else
- {
- frame.setVisible(false);
- }
+
+
+ // update coverview
+ coverpanel.update(results);
+
+ deck.showWidget(1);
}
}
Added: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/UpdateReportConfigAction.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/UpdateReportConfigAction.java (rev 0)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/UpdateReportConfigAction.java 2009-10-28 08:53:41 UTC (rev 860)
@@ -0,0 +1,70 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY 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 along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.console.client.report;
+
+import org.jboss.bpm.console.client.common.AbstractRESTAction;
+import org.jboss.bpm.console.client.ApplicationContext;
+import org.jboss.bpm.console.client.Registry;
+import com.google.gwt.http.client.RequestBuilder;
+import com.google.gwt.http.client.Response;
+import com.google.gwt.xml.client.Document;
+import com.google.gwt.xml.client.XMLParser;
+import com.mvc4g.client.Controller;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class UpdateReportConfigAction extends AbstractRESTAction
+{
+
+ public final static String ID = UpdateReportConfigAction.class.getName();
+ private ApplicationContext appContext;
+
+ public UpdateReportConfigAction()
+ {
+ this.appContext = Registry.get(ApplicationContext.class);
+ }
+
+ public String getId()
+ {
+ return ID;
+ }
+
+ public String getUrl(Object event)
+ {
+ return appContext.getConfig().getConsoleServerUrl()+"/rs/report/config";
+ }
+
+ public RequestBuilder.Method getRequestMethod()
+ {
+ return RequestBuilder.GET;
+ }
+
+ public void handleSuccessfulResponse(
+ final Controller controller, final Object event, Response response)
+ {
+ String xml = response.getText();
+ Document configDOM = XMLParser.parse(xml);
+ ReportView view = (ReportView)controller.getView(ReportView.ID);
+ view.configure(configDOM);
+ }
+}
Added: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/util/DOMUtil.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/util/DOMUtil.java (rev 0)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/util/DOMUtil.java 2009-10-28 08:53:41 UTC (rev 860)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY 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 along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.console.client.util;
+
+import com.google.gwt.xml.client.Node;
+import com.google.gwt.xml.client.NodeList;
+
+import java.util.List;
+import java.util.ArrayList;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class DOMUtil
+{
+ public static List<Node> getChildElements(NodeList childNodes)
+ {
+ List<Node> result = new ArrayList<Node>();
+
+ for(int i=0; i<childNodes.getLength(); i++)
+ {
+ Node n = childNodes.item(i);
+ if(n.getNodeType()!=Node.ELEMENT_NODE) // skip #text
+ continue;
+ else
+ result.add(n);
+ }
+ return result;
+ }
+}
Modified: bpm-console/trunk/pom.xml
===================================================================
--- bpm-console/trunk/pom.xml 2009-10-27 13:05:02 UTC (rev 859)
+++ bpm-console/trunk/pom.xml 2009-10-28 08:53:41 UTC (rev 860)
@@ -52,7 +52,7 @@
<mvc4g.version>1.0.0-jboss</mvc4g.version>
<resteasy.version>1.0.2.GA</resteasy.version>
<stax-api.version>1.0-2</stax-api.version>
- <report.server.version>1.0.0-SNAPSHOT</report.server.version>
+ <report.server.version>1.1.0-SNAPSHOT</report.server.version>
</properties>
<modules>
Modified: bpm-console/trunk/server/integration/server-integration.iml
===================================================================
--- bpm-console/trunk/server/integration/server-integration.iml 2009-10-27 13:05:02 UTC (rev 859)
+++ bpm-console/trunk/server/integration/server-integration.iml 2009-10-28 08:53:41 UTC (rev 860)
@@ -8,7 +8,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="bpmc-toplevel" />
+ <orderEntry type="module" module-name="shared-rpc" exported="" />
<orderEntry type="module-library" exported="">
<library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:provided">
<CLASSES>
Modified: bpm-console/trunk/server/war/pom.xml
===================================================================
--- bpm-console/trunk/server/war/pom.xml 2009-10-27 13:05:02 UTC (rev 859)
+++ bpm-console/trunk/server/war/pom.xml 2009-10-28 08:53:41 UTC (rev 860)
@@ -16,7 +16,6 @@
<!-- Properties -->
<properties>
- <report.server.version>1.0.0-SNAPSHOT</report.server.version>
<json-lib.version>2.2.3</json-lib.version>
<slf4j.version>1.5.2</slf4j.version>
</properties>
@@ -195,7 +194,6 @@
<dependency>
<groupId>org.jboss.bpm</groupId>
<artifactId>report-core</artifactId>
-
</dependency>
</dependencies>
Modified: bpm-console/trunk/server/war/server-war.iml
===================================================================
--- bpm-console/trunk/server/war/server-war.iml 2009-10-27 13:05:02 UTC (rev 859)
+++ bpm-console/trunk/server/war/server-war.iml 2009-10-28 08:53:41 UTC (rev 860)
@@ -10,7 +10,9 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="bpmc-toplevel" />
+ <orderEntry type="module" module-name="report-server" />
+ <orderEntry type="module" module-name="server-integration" />
+ <orderEntry type="module" module-name="shared-rpc" />
<orderEntry type="module-library">
<library name="M2 Dep: org.slf4j:slf4j-simple:jar:1.5.2:compile">
<CLASSES>
@@ -210,15 +212,6 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: org.jboss.bpm:report-core:jar:1.0.0-SNAPSHOT:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/bpm/report-core/1.0.0-SNAPSHOT/report-core-1.0.0-SNAPSHOT.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
<library name="M2 Dep: commons-collections:commons-collections:jar:3.2:test">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/3.2/commons-collections-3.2.jar!/" />
14 years, 6 months
- 1
- 0