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&gt; @@ -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>