March 2010 - overlord-commits - Jboss List Archives

Overlord SVN: r1010 - bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine.

by overlord-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2010-03-18 09:05:40 -0400 (Thu, 18 Mar 2010) New Revision: 1010 Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/DeploymentListView.java bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/ExecuteJobAction.java bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/JobListView.java Log: Apply patches for BPMC-57 Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/DeploymentListView.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/DeploymentListView.java 2010-03-18 12:04:28 UTC (rev 1009) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/DeploymentListView.java 2010-03-18 13:05:40 UTC (rev 1010) @@ -100,8 +100,7 @@ controller.addAction(UpdateDeploymentDetailAction.ID, new UpdateDeploymentDetailAction()); controller.addAction(DeleteDeploymentAction.ID, new DeleteDeploymentAction()); controller.addAction(SuspendDeploymentAction.ID, new SuspendDeploymentAction()); - controller.addAction(ResumeDeploymentAction.ID, new ResumeDeploymentAction()); - controller.addAction(ExecuteJobAction.ID, new ExecuteJobAction()); + controller.addAction(ResumeDeploymentAction.ID, new ResumeDeploymentAction()); //controller.addAction(ViewDeploymentAction.ID, new ViewDeploymentAction()); controller.addView(DeploymentListView.ID, this); Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/ExecuteJobAction.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/ExecuteJobAction.java 2010-03-18 12:04:28 UTC (rev 1009) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/ExecuteJobAction.java 2010-03-18 13:05:40 UTC (rev 1010) @@ -27,6 +27,7 @@ import com.mvc4g.client.Event; import org.jboss.bpm.console.client.URLBuilder; import org.jboss.bpm.console.client.common.AbstractRESTAction; +import org.jboss.bpm.console.client.util.ConsoleLog; /** * @author Heiko.Braun <heiko.braun(a)jboss.com> @@ -56,6 +57,8 @@ { String id = (String)event; + ConsoleLog.debug("Executed jod with id " + id + " and response from server is " + response.getText()); + // reload job list controller.handleEvent( new Event(UpdateJobsAction.ID, null) Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/JobListView.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/JobListView.java 2010-03-18 12:04:28 UTC (rev 1009) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/JobListView.java 2010-03-18 13:05:40 UTC (rev 1010) @@ -43,8 +43,8 @@ import org.jboss.bpm.console.client.common.LoadingOverlay; import org.jboss.bpm.console.client.model.JobRef; import org.jboss.bpm.console.client.util.SimpleDateFormat; +import org.jboss.errai.workspaces.client.api.ProvisioningCallback; import org.jboss.errai.workspaces.client.api.WidgetProvider; -import org.jboss.errai.workspaces.client.api.ProvisioningCallback; import org.jboss.errai.workspaces.client.framework.Registry; import java.util.Date; @@ -97,7 +97,7 @@ panel.add(jobList); controller.addView(JobListView.ID, this); - + controller.addAction(ExecuteJobAction.ID, new ExecuteJobAction()); callback.onSuccess(panel); }

14 years, 2 months

1
0
0 / 0

Overlord SVN: r1009 - in bpm-console/trunk/server: war/src/main/java/org/jboss/bpm/console/server and 1 other directory.

by overlord-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2010-03-18 08:04:28 -0400 (Thu, 18 Mar 2010) New Revision: 1009 Modified: bpm-console/trunk/server/integration/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java bpm-console/trunk/server/war/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java Log: remove obsolete opertations on server integration interfaces Modified: bpm-console/trunk/server/integration/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java =================================================================== --- bpm-console/trunk/server/integration/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java 2010-03-18 10:32:27 UTC (rev 1008) +++ bpm-console/trunk/server/integration/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java 2010-03-18 12:04:28 UTC (rev 1009) @@ -21,14 +21,12 @@ */ package org.jboss.bpm.console.server.integration; -import java.util.List; -import java.util.Map; - -import org.jboss.bpm.console.client.model.HistoryActivityInstanceRef; -import org.jboss.bpm.console.client.model.HistoryProcessInstanceRef; import org.jboss.bpm.console.client.model.ProcessDefinitionRef; import org.jboss.bpm.console.client.model.ProcessInstanceRef; +import java.util.List; +import java.util.Map; + /** * @author Heiko.Braun <heiko.braun(a)jboss.com> * @author Thomas.Diesler(a)jboss.com @@ -61,8 +59,4 @@ void signalExecution(String executionId, String signal); - List<HistoryActivityInstanceRef> getProcessInstanceHistory(String procesInstanceId); - - List<HistoryProcessInstanceRef> getFinishedProcessInstances(String definitionId); - } Modified: bpm-console/trunk/server/war/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java =================================================================== --- bpm-console/trunk/server/war/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java 2010-03-18 10:32:27 UTC (rev 1008) +++ bpm-console/trunk/server/war/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java 2010-03-18 12:04:28 UTC (rev 1009) @@ -332,32 +332,6 @@ } @GET - @Path("instance/history/{id}") - @Produces("application/json") - public Response getInstanceHistoryJSON( - @PathParam("id") - String id) - { - List<HistoryActivityInstanceRef> historyEntries = getProcessManagement().getProcessInstanceHistory(id); - - return createJsonResponse(new HistoryActivityInstanceRefWrapper(historyEntries)); - - } - - @GET - @Path("definition/history/{id}") - @Produces("application/json") - public Response getFinishedProcessInstancesJSON( - @PathParam("id") - String id) - { - List<HistoryProcessInstanceRef> historyEntries = getProcessManagement().getFinishedProcessInstances(id); - - return createJsonResponse(new HistoryProcessInstanceRefWrapper(historyEntries)); - - } - - @GET @Path("definition/history/{id}/nodeInfo") @Produces("application/json") public Response getNodeInfoForActivities(

14 years, 2 months

1
0
0 / 0

Overlord SVN: r1008 - in bpm-console/trunk: doc and 21 other directories.

by overlord-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2010-03-18 06:32:27 -0400 (Thu, 18 Mar 2010) New Revision: 1008 Added: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionHistoryListView.java bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/HistoryInstanceListView.java bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/LoadHistoryDiagramAction.java bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/MergedProcessHistoryView.java bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessHistoryModule.java bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateHistoryDefinitionAction.java bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateHistoryDefinitionsAction.java bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateHistoryInstanceAction.java bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/events/HistoryActivityDiagramEvent.java bpm-console/trunk/gui/war/src/main/resources/jmaki/xhp/errai-proxy.json bpm-console/trunk/shared/rpc/src/main/java/org/jboss/bpm/console/client/model/HistoryActivityInstanceRef.java bpm-console/trunk/shared/rpc/src/main/java/org/jboss/bpm/console/client/model/HistoryActivityInstanceRefWrapper.java bpm-console/trunk/shared/rpc/src/main/java/org/jboss/bpm/console/client/model/HistoryProcessInstanceRef.java bpm-console/trunk/shared/rpc/src/main/java/org/jboss/bpm/console/client/model/HistoryProcessInstanceRefWrapper.java bpm-console/trunk/shared/rpc/src/main/resources/ErraiApp.properties Removed: bpm-console/trunk/BPMC.ipr bpm-console/trunk/BPMC.iws bpm-console/trunk/bpmc-toplevel.iml bpm-console/trunk/doc/doc.iml bpm-console/trunk/gui/profiles/gui-profiles.iml bpm-console/trunk/gui/war/gui-war.iml bpm-console/trunk/server/integration/server-integration.iml bpm-console/trunk/server/war/server-war.iml bpm-console/trunk/shared/rpc/shared-rpc.iml Modified: bpm-console/trunk/gui/profiles/jbpm/src/main/resources/toolset-profile.properties bpm-console/trunk/gui/war/pom.xml bpm-console/trunk/gui/war/src/main/java/jmaki/xhp/HttpClient.java bpm-console/trunk/gui/war/src/main/java/jmaki/xhp/XmlHttpProxyServlet.java bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/Application.gwt.xml 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/engine/DeploymentListView.java bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/JobListView.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/model/JSOParser.java bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ActivityDiagramView.java bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.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/InstanceListView.java bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/JSONTree.java bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/LoadActivityDiagramAction.java bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessModule.java bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java bpm-console/trunk/gui/war/war/WEB-INF/web.xml bpm-console/trunk/pom.xml bpm-console/trunk/server/integration/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java bpm-console/trunk/server/integration/src/main/java/org/jboss/bpm/console/server/plugin/GraphViewerPlugin.java bpm-console/trunk/server/war/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java bpm-console/trunk/shared/rpc/pom.xml Log: Added patches for BPMC-37 with slight modifications Deleted: bpm-console/trunk/BPMC.ipr =================================================================== --- bpm-console/trunk/BPMC.ipr 2010-03-12 15:44:56 UTC (rev 1007) +++ bpm-console/trunk/BPMC.ipr 2010-03-18 10:32:27 UTC (rev 1008) @@ -1,408 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="AntConfiguration"> - <defaultAnt bundledAnt="true" /> - </component> - <component name="BuildJarProjectSettings"> - <option name="BUILD_JARS_ON_MAKE" value="false" /> - </component> - <component name="CodeStyleProjectProfileManger"> - <option name="PROJECT_PROFILE" /> - <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" /> - </component> - <component name="CompilerConfiguration"> - <option name="DEFAULT_COMPILER" value="Javac" /> - <resourceExtensions> - <entry name=".+\.(properties|xml|html|dtd|tld)" /> - <entry name=".+\.(gif|png|jpeg|jpg)" /> - </resourceExtensions> - <wildcardResourcePatterns> - <entry name="?*.properties" /> - <entry name="?*.xml" /> - <entry name="?*.gif" /> - <entry name="?*.png" /> - <entry name="?*.jpeg" /> - <entry name="?*.jpg" /> - <entry name="?*.html" /> - <entry name="?*.dtd" /> - <entry name="?*.tld" /> - </wildcardResourcePatterns> - <annotationProcessing enabled="false" useClasspath="true" /> - </component> - <component name="CopyrightManager" default=""> - <module2copyright /> - </component> - <component name="DependenciesAnalyzeManager"> - <option name="myForwardDirection" value="false" /> - </component> - <component name="DependencyValidationManager"> - <option name="SKIP_IMPORT_STATEMENTS" value="false" /> - </component> - <component name="EclipseCompilerSettings"> - <option name="DEBUGGING_INFO" value="true" /> - <option name="GENERATE_NO_WARNINGS" value="true" /> - <option name="DEPRECATION" value="false" /> - <option name="ADDITIONAL_OPTIONS_STRING" value="" /> - <option name="MAXIMUM_HEAP_SIZE" value="128" /> - </component> - <component name="EclipseEmbeddedCompilerSettings"> - <option name="DEBUGGING_INFO" value="true" /> - <option name="GENERATE_NO_WARNINGS" value="true" /> - <option name="DEPRECATION" value="false" /> - <option name="ADDITIONAL_OPTIONS_STRING" value="" /> - <option name="MAXIMUM_HEAP_SIZE" value="128" /> - </component> - <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" /> - <component name="EntryPointsManager"> - <entry_points /> - </component> - <component name="ExportToHTMLSettings"> - <option name="PRINT_LINE_NUMBERS" value="false" /> - <option name="OPEN_IN_BROWSER" value="false" /> - <option name="OUTPUT_DIRECTORY" /> - </component> - <component name="IdProvider" IDEtalkID="1E46A79AE09FDDA36C7AA36A15233C1A" /> - <component name="JavacSettings"> - <option name="DEBUGGING_INFO" value="true" /> - <option name="GENERATE_NO_WARNINGS" value="false" /> - <option name="DEPRECATION" value="true" /> - <option name="ADDITIONAL_OPTIONS_STRING" value="" /> - <option name="MAXIMUM_HEAP_SIZE" value="128" /> - </component> - <component name="JavadocGenerationManager"> - <option name="OUTPUT_DIRECTORY" /> - <option name="OPTION_SCOPE" value="protected" /> - <option name="OPTION_HIERARCHY" value="true" /> - <option name="OPTION_NAVIGATOR" value="true" /> - <option name="OPTION_INDEX" value="true" /> - <option name="OPTION_SEPARATE_INDEX" value="true" /> - <option name="OPTION_DOCUMENT_TAG_USE" value="false" /> - <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" /> - <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" /> - <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" /> - <option name="OPTION_DEPRECATED_LIST" value="true" /> - <option name="OTHER_OPTIONS" value="" /> - <option name="HEAP_SIZE" /> - <option name="LOCALE" /> - <option name="OPEN_IN_BROWSER" value="true" /> - </component> - <component name="JikesSettings"> - <option name="JIKES_PATH" value="" /> - <option name="DEBUGGING_INFO" value="true" /> - <option name="DEPRECATION" value="true" /> - <option name="GENERATE_NO_WARNINGS" value="false" /> - <option name="IS_EMACS_ERRORS_MODE" value="true" /> - <option name="ADDITIONAL_OPTIONS_STRING" value="" /> - </component> - <component name="LogConsolePreferences"> - <option name="FILTER_ERRORS" value="false" /> - <option name="FILTER_WARNINGS" value="false" /> - <option name="FILTER_INFO" value="true" /> - <option name="CUSTOM_FILTER" /> - </component> - <component name="Maven Reloaded"> - <option name="config"> - <value> - <option name="pluginEnabled" value="false" /> - <option name="offlineModeEnabled" value="false" /> - <option name="updateClasspathsEnabled" value="true" /> - <option name="sortDependenciesEnabled" value="false" /> - <option name="removeDuplicateDependenciesEnabled" value="false" /> - <option name="respondToPomChangesEnabled" value="true" /> - <option name="manageSourceRootsEnabled" value="true" /> - <option name="manageModuleInterdependenciesEnabled" value="true" /> - <option name="downloadSourcesEnabled" value="false" /> - <option name="downloadJavadocEnabled" value="false" /> - <option name="generateSourcesEnabled" value="false" /> - <option name="settingsPath" value="$PROJECT_DIR$/../../../../../.m2/settings.xml" /> - <option name="searchFilter" value="" /> - <option name="disabledPoms"> - <value> - <collection type="java.util.TreeSet" /> - </value> - </option> - <option name="moduleInterDependencies"> - <value> - <map type="java.util.TreeMap"> - <entry> - <value> - <collection type="java.util.TreeSet"> - <entry type="java.lang.String" value="toplevel" /> - </collection> - </value> - <key type="java.lang.String" value="bpm-gui-war" /> - </entry> - <entry> - <value> - <collection type="java.util.TreeSet"> - <entry type="java.lang.String" value="bpm-rpc" /> - <entry type="java.lang.String" value="toplevel" /> - </collection> - </value> - <key type="java.lang.String" value="bpm-server-core" /> - </entry> - <entry> - <value> - <collection type="java.util.TreeSet"> - <entry type="java.lang.String" value="bpm-rpc" /> - </collection> - </value> - <key type="java.lang.String" value="bpm-server-integration" /> - </entry> - <entry> - <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" /> - </entry> - <entry> - <value> - <collection type="java.util.TreeSet"> - <entry type="java.lang.String" value="bpm-rpc" /> - <entry type="java.lang.String" value="workspace-api" /> - </collection> - </value> - <key type="java.lang.String" value="console-war" /> - </entry> - <entry> - <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> - </value> - <key type="java.lang.String" value="gui-war" /> - </entry> - <entry> - <value> - <collection type="java.util.TreeSet"> - <entry type="java.lang.String" value="workspace-api" /> - </collection> - </value> - <key type="java.lang.String" value="sam-gui" /> - </entry> - <entry> - <value> - <collection type="java.util.TreeSet"> - <entry type="java.lang.String" value="shared-rpc" /> - </collection> - </value> - <key type="java.lang.String" value="server-integration" /> - </entry> - <entry> - <value> - <collection type="java.util.TreeSet"> - <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" /> - </entry> - <entry> - <value> - <collection type="java.util.TreeSet"> - <entry type="java.lang.String" value="bpm-rpc" /> - <entry type="java.lang.String" value="console-war" /> - <entry type="java.lang.String" value="workspace-api" /> - </collection> - </value> - <key type="java.lang.String" value="toplevel" /> - </entry> - <entry> - <value> - <collection type="java.util.TreeSet"> - <entry type="java.lang.String" value="toplevel" /> - </collection> - </value> - <key type="java.lang.String" value="war" /> - </entry> - </map> - </value> - </option> - <option name="logLevel" value="1" /> - </value> - </option> - </component> - <component name="Palette2"> - <group name="Swing"> - <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false"> - <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" /> - </item> - <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false"> - <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" /> - </item> - <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false"> - <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" /> - </item> - <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true"> - <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" /> - </item> - <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false"> - <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" /> - <initial-values> - <property name="text" value="Button" /> - </initial-values> - </item> - <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false"> - <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" /> - <initial-values> - <property name="text" value="RadioButton" /> - </initial-values> - </item> - <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false"> - <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" /> - <initial-values> - <property name="text" value="CheckBox" /> - </initial-values> - </item> - <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false"> - <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" /> - <initial-values> - <property name="text" value="Label" /> - </initial-values> - </item> - <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true"> - <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> - <preferred-size width="150" height="-1" /> - </default-constraints> - </item> - <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true"> - <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> - <preferred-size width="150" height="-1" /> - </default-constraints> - </item> - <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true"> - <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> - <preferred-size width="150" height="-1" /> - </default-constraints> - </item> - <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true"> - <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> - <preferred-size width="150" height="50" /> - </default-constraints> - </item> - <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true"> - <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> - <preferred-size width="150" height="50" /> - </default-constraints> - </item> - <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true"> - <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> - <preferred-size width="150" height="50" /> - </default-constraints> - </item> - <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true"> - <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" /> - </item> - <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false"> - <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> - <preferred-size width="150" height="50" /> - </default-constraints> - </item> - <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false"> - <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3"> - <preferred-size width="150" height="50" /> - </default-constraints> - </item> - <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false"> - <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> - <preferred-size width="150" height="50" /> - </default-constraints> - </item> - <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false"> - <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3"> - <preferred-size width="200" height="200" /> - </default-constraints> - </item> - <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false"> - <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3"> - <preferred-size width="200" height="200" /> - </default-constraints> - </item> - <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true"> - <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" /> - </item> - <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false"> - <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" /> - </item> - <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false"> - <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" /> - </item> - <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false"> - <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" /> - </item> - <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false"> - <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1"> - <preferred-size width="-1" height="20" /> - </default-constraints> - </item> - <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false"> - <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" /> - </item> - <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false"> - <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" /> - </item> - </group> - </component> - <component name="ProjectDetails"> - <option name="projectName" value="BPMC" /> - </component> - <component name="ProjectDictionaryState"> - <dictionary name="hbraun" /> - </component> - <component name="ProjectKey"> - <option name="state" value="https://svn.jboss.org/repos/soag/bpm-console/trunk/BPMC.ipr" /> - </component> - <component name="ProjectModuleManager"> - <modules> - <module fileurl="file://$PROJECT_DIR$/bpmc-toplevel.iml" filepath="$PROJECT_DIR$/bpmc-toplevel.iml" /> - <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://$PROJECT_DIR$/../../report-server/trunk/report-server.iml" filepath="$PROJECT_DIR$/../../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" /> - <module fileurl="file://$PROJECT_DIR$/workspace/workspace-api/workspace-api.iml" filepath="$PROJECT_DIR$/workspace/workspace-api/workspace-api.iml" /> - </modules> - </component> - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" assert-keyword="true" jdk-15="true" project-jdk-name="1.5" project-jdk-type="JavaSDK"> - <output url="file://$PROJECT_DIR$/classes" /> - </component> - <component name="RmicSettings"> - <option name="IS_EANABLED" value="false" /> - <option name="DEBUGGING_INFO" value="true" /> - <option name="GENERATE_NO_WARNINGS" value="false" /> - <option name="GENERATE_IIOP_STUBS" value="false" /> - <option name="ADDITIONAL_OPTIONS_STRING" value="" /> - </component> - <component name="SvnBranchConfigurationManager"> - <option name="mySupportsUserInfoFilter" value="true" /> - </component> - <component name="VcsDirectoryMappings"> - <mapping directory="" vcs="svn" /> - </component> - <component name="WebServicesPlugin" addRequiredLibraries="true" /> - <component name="com.intellij.jsf.UserDefinedFacesConfigs"> - <option name="USER_DEFINED_CONFIGS"> - <value> - <list size="0" /> - </value> - </option> - </component> - <component name="uidesigner-configuration"> - <option name="INSTRUMENT_CLASSES" value="true" /> - <option name="COPY_FORMS_RUNTIME_TO_OUTPUT" value="true" /> - <option name="DEFAULT_LAYOUT_MANAGER" value="GridLayoutManager" /> - </component> -</project> - Deleted: bpm-console/trunk/BPMC.iws =================================================================== --- bpm-console/trunk/BPMC.iws 2010-03-12 15:44:56 UTC (rev 1007) +++ bpm-console/trunk/BPMC.iws 2010-03-18 10:32:27 UTC (rev 1008) @@ -1,987 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="ChangeBrowserSettings"> - <option name="MAIN_SPLITTER_PROPORTION" value="0.3" /> - <option name="MESSAGES_SPLITTER_PROPORTION" value="0.8" /> - <option name="USE_DATE_BEFORE_FILTER" value="false" /> - <option name="USE_DATE_AFTER_FILTER" value="false" /> - <option name="USE_CHANGE_BEFORE_FILTER" value="false" /> - <option name="USE_CHANGE_AFTER_FILTER" value="false" /> - <option name="DATE_BEFORE" value="" /> - <option name="DATE_AFTER" value="" /> - <option name="CHANGE_BEFORE" value="" /> - <option name="CHANGE_AFTER" value="" /> - <option name="USE_USER_FILTER" value="false" /> - <option name="USER" value="" /> - </component> - <component name="ChangeListManager" verified="true"> - <list default="true" readonly="true" id="7686990b-7e88-4602-812a-8d5ceea5da87" name="Default" comment=""> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gui/profiles/gui-profiles.iml" afterPath="$PROJECT_DIR$/gui/profiles/gui-profiles.iml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gui/war/gui-war.iml" afterPath="$PROJECT_DIR$/gui/war/gui-war.iml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/server/war/server-war.iml" afterPath="$PROJECT_DIR$/server/war/server-war.iml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/workspace/workspace-api/workspace-api.iml" afterPath="$PROJECT_DIR$/workspace/workspace-api/workspace-api.iml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/BPMC.iws" afterPath="$PROJECT_DIR$/BPMC.iws" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/bpmc-toplevel.iml" afterPath="$PROJECT_DIR$/bpmc-toplevel.iml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shared/rpc/shared-rpc.iml" afterPath="$PROJECT_DIR$/shared/rpc/shared-rpc.iml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/doc/doc.iml" afterPath="$PROJECT_DIR$/doc/doc.iml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/server/integration/server-integration.iml" afterPath="$PROJECT_DIR$/server/integration/server-integration.iml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/BPMC.ipr" afterPath="$PROJECT_DIR$/BPMC.ipr" /> - </list> - <list id="eeccd30d-ae37-4d4f-9d2f-5b9ea8d9d39e" name="Failed commit: Default" comment="remove dependency on DTOParser" /> - <option name="TRACKING_ENABLED" value="true" /> - <option name="SHOW_DIALOG" value="false" /> - <option name="HIGHLIGHT_CONFLICTS" value="true" /> - <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> - <option name="LAST_RESOLUTION" value="IGNORE" /> - </component> - <component name="ChangesViewManager" flattened_view="true" show_ignored="false" /> - <component name="Commander"> - <leftPanel /> - <rightPanel /> - <splitter proportion="0.5" /> - </component> - <component name="CompilerWorkspaceConfiguration"> - <option name="COMPILE_IN_BACKGROUND" value="false" /> - <option name="AUTO_SHOW_ERRORS_IN_EDITOR" value="true" /> - <option name="CLOSE_MESSAGE_VIEW_IF_SUCCESS" value="true" /> - <option name="COMPILE_DEPENDENT_FILES" value="false" /> - <option name="CLEAR_OUTPUT_DIRECTORY" value="false" /> - <option name="ASSERT_NOT_NULL" value="true" /> - </component> - <component name="CreatePatchCommitExecutor"> - <option name="PATCH_PATH" value="" /> - <option name="REVERSE_PATCH" value="false" /> - </component> - <component name="Cvs2Configuration"> - <option name="PRUNE_EMPTY_DIRECTORIES" value="true" /> - <option name="MERGING_MODE" value="0" /> - <option name="MERGE_WITH_BRANCH1_NAME" value="HEAD" /> - <option name="MERGE_WITH_BRANCH2_NAME" value="HEAD" /> - <option name="RESET_STICKY" value="false" /> - <option name="CREATE_NEW_DIRECTORIES" value="true" /> - <option name="DEFAULT_TEXT_FILE_SUBSTITUTION" value="kv" /> - <option name="PROCESS_UNKNOWN_FILES" value="false" /> - <option name="PROCESS_DELETED_FILES" value="false" /> - <option name="PROCESS_IGNORED_FILES" value="false" /> - <option name="RESERVED_EDIT" value="false" /> - <option name="CHECKOUT_DATE_OR_REVISION_SETTINGS"> - <value> - <option name="BRANCH" value="" /> - <option name="DATE" value="" /> - <option name="USE_BRANCH" value="false" /> - <option name="USE_DATE" value="false" /> - </value> - </option> - <option name="UPDATE_DATE_OR_REVISION_SETTINGS"> - <value> - <option name="BRANCH" value="" /> - <option name="DATE" value="" /> - <option name="USE_BRANCH" value="false" /> - <option name="USE_DATE" value="false" /> - </value> - </option> - <option name="SHOW_CHANGES_REVISION_SETTINGS"> - <value> - <option name="BRANCH" value="" /> - <option name="DATE" value="" /> - <option name="USE_BRANCH" value="false" /> - <option name="USE_DATE" value="false" /> - </value> - </option> - <option name="SHOW_OUTPUT" value="false" /> - <option name="ADD_WATCH_INDEX" value="0" /> - <option name="REMOVE_WATCH_INDEX" value="0" /> - <option name="UPDATE_KEYWORD_SUBSTITUTION" /> - <option name="MAKE_NEW_FILES_READONLY" value="false" /> - <option name="SHOW_CORRUPTED_PROJECT_FILES" value="0" /> - <option name="TAG_AFTER_PROJECT_COMMIT" value="false" /> - <option name="OVERRIDE_EXISTING_TAG_FOR_PROJECT" value="true" /> - <option name="TAG_AFTER_PROJECT_COMMIT_NAME" value="" /> - <option name="CLEAN_COPY" value="false" /> - </component> - <component name="DaemonCodeAnalyzer"> - <disable_hints /> - </component> - <component name="DebuggerManager"> - <breakpoint_any> - <breakpoint> - <option name="NOTIFY_CAUGHT" value="true" /> - <option name="NOTIFY_UNCAUGHT" value="true" /> - <option name="ENABLED" value="false" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <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> - <option name="NOTIFY_CAUGHT" value="true" /> - <option name="NOTIFY_UNCAUGHT" value="true" /> - <option name="ENABLED" value="false" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <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_any> - <breakpoint_rules /> - <ui_properties> - <property name="line_breakpoints_groupByMethods" value="false" /> - <property name="line_breakpoints_viewId" value="TABLE" /> - <property name="exception_breakpoints_flattenPackages" value="true" /> - <property name="method_breakpoints_flattenPackages" value="true" /> - <property name="field_breakpoints_flattenPackages" value="true" /> - <property name="exception_breakpoints_groupByMethods" value="false" /> - <property name="line_breakpoints_groupByClasses" value="true" /> - <property name="field_breakpoints_groupByMethods" value="false" /> - <property name="method_breakpoints_viewId" value="TABLE" /> - <property name="line_breakpoints_flattenPackages" value="true" /> - <property name="field_breakpoints_groupByClasses" value="true" /> - <property name="method_breakpoints_groupByClasses" value="true" /> - <property name="exception_breakpoints_viewId" value="TABLE" /> - <property name="exception_breakpoints_groupByClasses" value="true" /> - <property name="field_breakpoints_viewId" value="TABLE" /> - <property name="method_breakpoints_groupByMethods" value="false" /> - </ui_properties> - </component> - <component name="ErrorTreeViewConfiguration"> - <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" /> - <option name="HIDE_WARNINGS" value="false" /> - </component> - <component name="FavoritesManager"> - <favorites_list name="BPMC" /> - </component> - <component name="FavoritesProjectViewPane"> - <subPane subId="BPMC"> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" /> - <option name="myItemType" value="com.intellij.ide.favoritesTreeView.FavoritesTreeNodeDescriptor" /> - </PATH_ELEMENT> - </PATH> - </subPane> - </component> - <component name="FileColors" enabled="false" enabledForTabs="false" /> - <component name="FileEditorManager"> - <leaf /> - </component> - <component name="FindManager"> - <FindUsagesManager> - <setting name="OPEN_NEW_TAB" value="false" /> - </FindUsagesManager> - </component> - <component name="HierarchyBrowserManager"> - <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" /> - <option name="SORT_ALPHABETICALLY" value="false" /> - <option name="HIDE_CLASSES_WHERE_METHOD_NOT_IMPLEMENTED" value="false" /> - </component> - <component name="InspectionManager"> - <option name="AUTOSCROLL_TO_SOURCE" value="false" /> - <option name="SPLITTER_PROPORTION" value="0.5" /> - <option name="GROUP_BY_SEVERITY" value="false" /> - <option name="FILTER_RESOLVED_ITEMS" value="true" /> - <option name="ANALYZE_TEST_SOURCES" value="true" /> - <option name="SHOW_DIFF_WITH_PREVIOUS_RUN" value="false" /> - <option name="SCOPE_TYPE" value="1" /> - <option name="CUSTOM_SCOPE_NAME" value="" /> - <option name="SHOW_ONLY_DIFF" value="false" /> - <option name="myCurrentProfileName" value="Default" /> - </component> - <component name="ModuleEditorState"> - <option name="LAST_EDITED_MODULE_NAME" /> - <option name="LAST_EDITED_TAB_NAME" /> - </component> - <component name="PackagesPane"> - <subPane> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="BPMC.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> - </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> - <PATH_ELEMENT> - <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.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_ELEMENT> - <option name="myItemId" value="Libraries" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewLibrariesNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="javax" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <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="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_ELEMENT> - <option name="myItemId" value="Libraries" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewLibrariesNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="javax" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <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.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_ELEMENT> - <option name="myItemId" value="Libraries" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewLibrariesNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="javax" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="xml" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <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="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_ELEMENT> - <option name="myItemId" value="Libraries" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewLibrariesNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <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="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="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> - <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:/Users/hbraun/dev/prj/soag/bpm-console/trunk/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="bpmc-toplevel" /> - <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="bpmc-toplevel" /> - <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/bpm-console/trunk" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - </subPane> - </component> - <component name="ProjectReloadState"> - <option name="STATE" value="0" /> - </component> - <component name="ProjectView"> - <navigator currentView="ProjectPane" proportions="" version="1" splitterProportion="0.5"> - <flattenPackages PackagesPane="false" /> - <showMembers /> - <showModules /> - <showLibraryContents /> - <hideEmptyPackages PackagesPane="false" ProjectPane="false" /> - <abbreviatePackageNames /> - <autoscrollToSource /> - <autoscrollFromSource /> - <sortByType /> - </navigator> - <panes> - <pane id="PackagesPane" /> - <pane id="Favorites" /> - <pane id="ProjectPane"> - <subPane> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="BPMC" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="BPMC" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="trunk" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="BPMC" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="trunk" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="gui" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="BPMC" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="trunk" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="gui" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="war" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - </subPane> - </pane> - <pane id="Scope" /> - </panes> - </component> - <component name="PropertiesComponent"> - <property name="cvs_file_history_treeOrder2" value="2" /> - <property name="cvs_file_history_treeOrder1" value="1" /> - <property name="RunManagerConfig.showSettingsBeforeRunnig" value="false" /> - <property name="cvs_file_history_treeOrder3" value="3" /> - <property name="MemberChooser.sorted" value="false" /> - <property name="recentsLimit" value="5" /> - <property name="GoToClass.toSaveIncludeLibraries" value="false" /> - <property name="cvs_file_history_treeWidth0" value="287" /> - <property name="cvs_file_history_treeWidth1" value="287" /> - <property name="cvs_file_history_treeWidth2" value="287" /> - <property name="cvs_file_history_treeWidth3" value="287" /> - <property name="cvs_file_history_flatWidth2" value="291" /> - <property name="MemberChooser.showClasses" value="true" /> - <property name="cvs_file_history_flatWidth3" value="290" /> - <property name="cvs_file_history_treeOrder0" value="0" /> - <property name="cvs_file_history_flatWidth0" value="291" /> - <property name="GoToClass.includeLibraries" value="false" /> - <property name="cvs_file_history_flatWidth1" value="291" /> - <property name="GoToFile.includeJavaFiles" value="false" /> - <property name="RunManagerConfig.compileBeforeRunning" value="false" /> - <property name="cvs_file_history_flatOrder2" value="2" /> - <property name="cvs_file_history_flatOrder3" value="3" /> - <property name="cvs_file_history_flatOrder0" value="0" /> - <property name="cvs_file_history_flatOrder1" value="1" /> - <property name="MemberChooser.copyJavadoc" value="false" /> - </component> - <component name="RecentsManager"> - <key name="IntroduceConstantDialog.RECENTS_KEY"> - <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" /> - </key> - </component> - <component name="RunManager" selected="Remote.server"> - <configuration default="true" type="Remote" factoryName="Remote"> - <option name="USE_SOCKET_TRANSPORT" value="true" /> - <option name="SERVER_MODE" value="false" /> - <option name="SHMEM_ADDRESS" value="javadebug" /> - <option name="HOST" value="localhost" /> - <option name="PORT" value="5005" /> - <method> - <option name="AntTarget" enabled="false" /> - <option name="BuildArtifacts" enabled="false" /> - <option name="Maven.BeforeRunTask" enabled="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" enabled="false" /> - <option name="BuildArtifacts" enabled="false" /> - <option name="Make" enabled="false" /> - <option name="Maven.BeforeRunTask" enabled="false" /> - </method> - </configuration> - <configuration default="true" type="Application" factoryName="Application"> - <extension name="snapshooter" /> - <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" /> - <option name="ENV_VARIABLES" /> - <option name="PASS_PARENT_ENVS" value="true" /> - <module name="" /> - <envs /> - <method> - <option name="AntTarget" enabled="false" /> - <option name="BuildArtifacts" enabled="false" /> - <option name="Make" enabled="false" /> - <option name="Maven.BeforeRunTask" enabled="false" /> - </method> - </configuration> - <configuration default="true" type="JUnit" factoryName="JUnit"> - <extension name="snapshooter" /> - <module name="" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - <option name="PACKAGE_NAME" /> - <option name="MAIN_CLASS_NAME" /> - <option name="METHOD_NAME" /> - <option name="TEST_OBJECT" value="class" /> - <option name="VM_PARAMETERS" /> - <option name="PARAMETERS" /> - <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> - <option name="ENV_VARIABLES" /> - <option name="PASS_PARENT_ENVS" value="true" /> - <option name="TEST_SEARCH_SCOPE"> - <value defaultName="wholeProject" /> - </option> - <envs /> - <method> - <option name="AntTarget" enabled="false" /> - <option name="BuildArtifacts" enabled="false" /> - <option name="Make" enabled="false" /> - <option name="Maven.BeforeRunTask" enabled="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" /> - <option name="SHMEM_ADDRESS" value="javadebug" /> - <option name="HOST" value="localhost" /> - <option name="PORT" value="8000" /> - <RunnerSettings RunnerId="Debug"> - <option name="DEBUG_PORT" value="8000" /> - <option name="TRANSPORT" value="0" /> - <option name="LOCAL" value="false" /> - </RunnerSettings> - <ConfigurationWrapper RunnerId="Debug" /> - <method /> - </configuration> - <configuration default="false" name="server" type="Remote" factoryName="Remote"> - <option name="USE_SOCKET_TRANSPORT" value="true" /> - <option name="SERVER_MODE" value="false" /> - <option name="SHMEM_ADDRESS" value="javadebug" /> - <option name="HOST" value="localhost" /> - <option name="PORT" value="8787" /> - <RunnerSettings RunnerId="Debug"> - <option name="DEBUG_PORT" value="8787" /> - <option name="TRANSPORT" value="0" /> - <option name="LOCAL" value="false" /> - </RunnerSettings> - <ConfigurationWrapper RunnerId="Debug" /> - <method /> - </configuration> - <list size="2"> - <item index="0" class="java.lang.String" itemvalue="Remote.GWT" /> - <item index="1" class="java.lang.String" itemvalue="Remote.server" /> - </list> - <configuration name="<template>" type="WebApp" default="true" selected="false"> - <Host>localhost</Host> - <Port>5050</Port> - </configuration> - </component> - <component name="ScopeViewComponent"> - <subPane subId="Project"> - <PATH> - <PATH_ELEMENT USER_OBJECT="Root"> - <option name="myItemId" value="" /> - <option name="myItemType" value="" /> - </PATH_ELEMENT> - </PATH> - </subPane> - </component> - <component name="ShelveChangesManager" show_recycled="false" /> - <component name="StarteamConfiguration"> - <option name="SERVER" value="" /> - <option name="PORT" value="49201" /> - <option name="USER" value="" /> - <option name="PASSWORD" value="" /> - <option name="PROJECT" value="" /> - <option name="VIEW" value="" /> - <option name="ALTERNATIVE_WORKING_PATH" value="" /> - <option name="LOCK_ON_CHECKOUT" value="false" /> - <option name="UNLOCK_ON_CHECKIN" value="false" /> - </component> - <component name="StructureViewFactory"> - <option name="AUTOSCROLL_MODE" value="true" /> - <option name="AUTOSCROLL_FROM_SOURCE" value="false" /> - <option name="ACTIVE_ACTIONS" value="SHOW_INTERFACES,ALPHA_COMPARATOR,SHOW_FIELDS" /> - </component> - <component name="Struts Assistant"> - <option name="showInputs" value="true" /> - <option name="resources"> - <value> - <option name="strutsPath" /> - <option name="strutsHelp" /> - </value> - </option> - <option name="selectedTaglibs" /> - <option name="selectedTaglibs" /> - <option name="myStrutsValidationEnabled" value="true" /> - <option name="myTilesValidationEnabled" value="true" /> - <option name="myValidatorValidationEnabled" value="true" /> - <option name="myReportErrorsAsWarnings" value="true" /> - </component> - <component name="SvnChangesBrowserSettings"> - <option name="USE_AUTHOR_FIELD" value="true" /> - <option name="AUTHOR" value="" /> - <option name="LOCATION" value="" /> - <option name="USE_PROJECT_SETTINGS" value="true" /> - <option name="USE_ALTERNATE_LOCATION" value="false" /> - </component> - <component name="SvnConfiguration"> - <option name="USER" value="" /> - <option name="PASSWORD" value="" /> - <option name="LAST_MERGED_REVISION" /> - <option name="UPDATE_RUN_STATUS" value="false" /> - <option name="MERGE_DRY_RUN" value="false" /> - <option name="MERGE_DIFF_USE_ANCESTRY" value="true" /> - <option name="UPDATE_LOCK_ON_DEMAND" value="false" /> - <option name="IGNORE_SPACES_IN_MERGE" value="false" /> - <option name="DETECT_NESTED_COPIES" value="false" /> - <option name="IGNORE_SPACES_IN_ANNOTATE" value="true" /> - <option name="SHOW_MERGE_SOURCES_IN_ANNOTATE" value="true" /> - <configuration useDefault="true">$PROJECT_DIR$/../../../../../.subversion</configuration> - <myIsUseDefaultProxy>false</myIsUseDefaultProxy> - <supportedVersion>125</supportedVersion> - </component> - <component name="SvnFileUrlMappingImpl"> - <option name="myMappingRoots"> - <list> - <SvnCopyRootSimple> - <option name="myVcsRoot" value="$PROJECT_DIR$" /> - <option name="myCopyRoot" value="$PROJECT_DIR$" /> - </SvnCopyRootSimple> - </list> - </option> - <option name="myMoreRealMappingRoots"> - <list> - <SvnCopyRootSimple> - <option name="myVcsRoot" value="$PROJECT_DIR$" /> - <option name="myCopyRoot" value="$PROJECT_DIR$" /> - </SvnCopyRootSimple> - </list> - </option> - </component> - <component name="TaskManager"> - <option name="tasks"> - <list> - <task id="Default" summary="Default task"> - <option name="active" value="true" /> - <option name="changeLists"> - <list> - <ChangeListInfo id="fc4abe46-3830-4abe-8568-193fc970fbdd" name="Default" comment="" /> - </list> - </option> - <option name="created" value="1254429082701" /> - <option name="updated" value="1254429082701" /> - </task> - <task id="LOCAL-00001" summary="Failed commit: Default"> - <option name="changeLists"> - <list> - <ChangeListInfo id="f0cad2f9-e9f4-434e-9b69-4bdf1f3d4f71" name="Failed commit: Default" comment="remove dependency on DTOParser" /> - </list> - </option> - <option name="created" value="1254428988860" /> - <option name="updated" value="1254428988860" /> - </task> - </list> - </option> - <option name="localTasksCounter" value="2" /> - </component> - <component name="TodoView" selected-index="0"> - <todo-panel id="selected-file"> - <are-packages-shown value="false" /> - <are-modules-shown value="false" /> - <flatten-packages value="false" /> - <is-autoscroll-to-source value="true" /> - </todo-panel> - <todo-panel id="all"> - <are-packages-shown value="true" /> - <are-modules-shown value="false" /> - <flatten-packages value="false" /> - <is-autoscroll-to-source value="true" /> - </todo-panel> - </component> - <component name="ToolWindowManager"> - <frame x="0" y="22" width="1280" height="774" extended-state="0" /> - <editor active="true" /> - <layout> - <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" /> - <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> - <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.38073394" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.38434163" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> - <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32873562" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" /> - <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> - <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22303921" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> - <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> - <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26807472" sideWeight="0.6085627" order="0" side_tool="false" content_ui="tabs" /> - <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" /> - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> - <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> - <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" /> - <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> - <window_info id="Maven" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" /> - <window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24818695" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> - <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> - <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> - <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32992035" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> - <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> - <window_info id="EJB" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> - <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" /> - <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> - <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> - </layout> - </component> - <component name="VCS.FileViewConfiguration"> - <option name="SELECTED_STATUSES" value="DEFAULT" /> - <option name="SELECTED_COLUMNS" value="DEFAULT" /> - <option name="SHOW_FILTERS" value="true" /> - <option name="CUSTOMIZE_VIEW" value="true" /> - <option name="SHOW_FILE_HISTORY_AS_TREE" value="true" /> - </component> - <component name="VcsManagerConfiguration"> - <option name="OFFER_MOVE_TO_ANOTHER_CHANGELIST_ON_PARTIAL_COMMIT" value="true" /> - <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="true" /> - <option name="PERFORM_UPDATE_IN_BACKGROUND" value="false" /> - <option name="PERFORM_COMMIT_IN_BACKGROUND" value="false" /> - <option name="PERFORM_EDIT_IN_BACKGROUND" value="true" /> - <option name="PERFORM_CHECKOUT_IN_BACKGROUND" value="true" /> - <option name="PERFORM_ADD_REMOVE_IN_BACKGROUND" value="true" /> - <option name="PERFORM_ROLLBACK_IN_BACKGROUND" value="false" /> - <option name="CHECK_LOCALLY_CHANGED_CONFLICTS_IN_BACKGROUND" value="true" /> - <option name="FORCE_NON_EMPTY_COMMENT" value="false" /> - <option name="LAST_COMMIT_MESSAGE" value="remove dependency on DTOParser" /> - <option name="MAKE_NEW_CHANGELIST_ACTIVE" value="true" /> - <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" /> - <option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" /> - <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" /> - <option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" /> - <option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" /> - <option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" /> - <option name="ACTIVE_VCS_NAME" value="svn" /> - <option name="UPDATE_GROUP_BY_PACKAGES" value="false" /> - <option name="UPDATE_GROUP_BY_CHANGELIST" value="false" /> - <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" /> - <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" /> - <MESSAGE value="remove dependency on DTOParser" /> - </component> - <component name="VssConfiguration"> - <option name="CLIENT_PATH" value="" /> - <option name="SRCSAFEINI_PATH" value="" /> - <option name="USER_NAME" value="" /> - <option name="PWD" value="" /> - <option name="VSS_IS_INITIALIZED" value="true" /> - <CheckoutOptions> - <option name="COMMENT" value="" /> - <option name="DO_NOT_GET_LATEST_VERSION" value="false" /> - <option name="REPLACE_WRITABLE" value="false" /> - <option name="RECURSIVE" value="false" /> - </CheckoutOptions> - <CheckinOptions> - <option name="COMMENT" value="" /> - <option name="KEEP_CHECKED_OUT" value="false" /> - <option name="RECURSIVE" value="false" /> - </CheckinOptions> - <AddOptions> - <option name="STORE_ONLY_LATEST_VERSION" value="false" /> - <option name="CHECK_OUT_IMMEDIATELY" value="false" /> - <option name="FILE_TYPE" value="0" /> - </AddOptions> - <UndocheckoutOptions> - <option name="MAKE_WRITABLE" value="false" /> - <option name="REPLACE_LOCAL_COPY" value="0" /> - <option name="RECURSIVE" value="false" /> - </UndocheckoutOptions> - <GetOptions> - <option name="REPLACE_WRITABLE" value="0" /> - <option name="MAKE_WRITABLE" value="false" /> - <option name="ANSWER_NEGATIVELY" value="false" /> - <option name="ANSWER_POSITIVELY" value="false" /> - <option name="RECURSIVE" value="false" /> - <option name="VERSION" /> - </GetOptions> - <VssConfigurableExcludedFilesTag /> - </component> - <component name="XDebuggerManager"> - <breakpoint-manager /> - </component> - <component name="antWorkspaceConfiguration"> - <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" /> - <option name="FILTER_TARGETS" value="false" /> - </component> - <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,0.5" version="1"> - <option name="myPlainMode" value="false" /> - <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://$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="46" selection-start="4817" selection-end="4817" vertical-scroll-proportion="0.46529564" /> - </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="73" column="18" selection-start="2595" selection-end="2595" vertical-scroll-proportion="0.778058" /> - </provider> - </entry> - <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="118" column="40" selection-start="3620" selection-end="3620" vertical-scroll-proportion="1.2812105" /> - </provider> - </entry> - <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="72" column="4" selection-start="2593" selection-end="2593" vertical-scroll-proportion="0.50642675" /> - </provider> - </entry> - <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="71" column="60" selection-start="2781" selection-end="2781" vertical-scroll-proportion="0.7609255" /> - </provider> - </entry> - <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="68" column="4" selection-start="2572" selection-end="2572" vertical-scroll-proportion="0.51450187" /> - </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="197" column="31" selection-start="6256" selection-end="6256" vertical-scroll-proportion="0.86760926" /> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="46" column="6" selection-start="1992" selection-end="1992" vertical-scroll-proportion="-2.3444731" /> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/BootstrapAction.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="40" column="30" selection-start="1690" selection-end="1690" vertical-scroll-proportion="0.2673522" /> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/MainLayout.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="83" column="67" selection-start="2977" selection-end="2977" vertical-scroll-proportion="0.19151671" /> - </provider> - </entry> - <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="65" column="4" selection-start="2077" selection-end="2077" vertical-scroll-proportion="0.27377892" /> - </provider> - </entry> - <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="63" column="73" selection-start="2347" selection-end="2347" vertical-scroll-proportion="0.69922876" /> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="196" column="55" selection-start="6563" selection-end="6563" vertical-scroll-proportion="0.781491" /> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/gui/pom.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state line="14" column="13" selection-start="533" selection-end="533" vertical-scroll-proportion="0.28791773" /> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/pom.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state line="59" column="50" selection-start="2204" selection-end="2204" vertical-scroll-proportion="0.80205655" /> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/engine/DeploymentDetailView.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> - <folding /> - </state> - </provider> - </entry> - </component> -</project> - Deleted: bpm-console/trunk/bpmc-toplevel.iml =================================================================== --- bpm-console/trunk/bpmc-toplevel.iml 2010-03-12 15:44:56 UTC (rev 1007) +++ bpm-console/trunk/bpmc-toplevel.iml 2010-03-18 10:32:27 UTC (rev 1008) @@ -1,547 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module relativePaths="true" type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" inherit-compiler-output="true"> - <exclude-output /> - <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/gui/profiles/drools/src/main/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/gui/profiles/drools/src/main/resources" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/gui/profiles/jbpm/src/main/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/gui/profiles/jbpm/src/main/resources" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/gui/profiles/riftsaw/src/main/resources" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/gui/war/src/main/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/gui/war/src/main/resources" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/gui/war/src/test/java" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/gui/war/src/test/resources" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/server/integration/src/main/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/server/war/src/main/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/server/war/src/main/resources" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/server/war/src/test/java" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/shared/rpc/src/main/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/shared/rpc/src/main/resources" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/workspace/workspace-api/src/main/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/workspace/workspace-api/src/main/resources" isTestSource="false" /> - </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="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> - <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-simple/1.5.2/slf4j-simple-1.5.2.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://$MAVEN_REPOSITORY$/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.3:provided"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/gwt/gwt-user/1.5.3/gwt-user-1.5.3.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:compile"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/jboss/resteasy/resteasy-jaxrs/1.0.2.GA/resteasy-jaxrs-1.0.2.GA.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"> - <CLASSES> - <root url="jar://$MAVEN_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: net.sf.ezmorph:ezmorph:jar:1.0.6:test"> - <CLASSES> - <root url="jar://$MAVEN_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: org.slf4j:slf4j-api:jar:1.5.2:compile"> - <CLASSES> - <root url="jar://$MAVEN_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: javassist:javassist:jar:3.6.0.GA:compile"> - <CLASSES> - <root url="jar://$MAVEN_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: org.jboss.resteasy:jaxrs-api:jar:1.0.2.GA:compile"> - <CLASSES> - <root url="jar://$MAVEN_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: javax.xml.bind:jaxb-api:jar:2.1:provided"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES> - <root url="jar://$MAVEN_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: commons-logging:commons-logging:jar:1.1.1:provided"> - <CLASSES> - <root url="jar://$MAVEN_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: junit:junit:jar:3.8.1:test"> - <CLASSES> - <root url="jar://$MAVEN_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: net.sf.json-lib:json-lib:jar:2.2.3:test"> - <CLASSES> - <root url="jar://$MAVEN_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: org.slf4j:slf4j-log4j12:jar:1.5.2:compile"> - <CLASSES> - <root url="jar://$MAVEN_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: javax.xml:jaxb-impl:jar:2.1:provided"> - <CLASSES> - <root url="jar://$MAVEN_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: commons-fileupload:commons-fileupload:jar:1.2.1:compile"> - <CLASSES> - <root url="jar://$MAVEN_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"> - <CLASSES> - <root url="jar://$MAVEN_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: javax.annotation:jsr250-api:jar:1.0:compile"> - <CLASSES> - <root url="jar://$MAVEN_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.activation:activation:jar:1.1:provided"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/javax/activation/activation/1.1/activation-1.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/javax/activation/activation/1.1/activation-1.1-sources.jar!/" /> - </SOURCES> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: javax.ejb:ejb-api:jar:3.0:provided"> - <CLASSES> - <root url="jar://$MAVEN_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: commons-collections:commons-collections:jar:3.2:test"> - <CLASSES> - <root url="jar://$MAVEN_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: org.scannotation:scannotation:jar:1.0.2:compile"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/scannotation/scannotation/1.0.2/scannotation-1.0.2.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"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/jboss/javaee/jboss-javaee/5.0.0.GA/jboss-javaee-5.0.0.GA.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES> - <root url="jar://$MAVEN_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: org.eclipse.birt:chartengineapi:jar:2.3.2:compile"> - <CLASSES> - <root url="jar://$MAVEN_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:common:jar:2.4.0:compile"> - <CLASSES> - <root url="jar://$MAVEN_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: org.eclipse.birt:scriptapi:jar:2.3.2:compile"> - <CLASSES> - <root url="jar://$MAVEN_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: org.eclipse.birt:engineapi:jar:2.3.2:compile"> - <CLASSES> - <root url="jar://$MAVEN_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: commons-codec:commons-codec:jar:1.3:compile"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.3/commons-codec-1.3.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES> - <root url="jar://$MAVEN_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:coreapi:jar:2.3.2:compile"> - <CLASSES> - <root url="jar://$MAVEN_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: rhino:js:jar:1.6R2:compile"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/rhino/js/1.6R2/js-1.6R2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.eclipse.emf:ecore:jar:2.4.2:compile"> - <CLASSES> - <root url="jar://$MAVEN_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:flute:jar:1.2:compile"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/w3c/flute/1.2/flute-1.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"> - <CLASSES> - <root url="jar://$MAVEN_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: org.eclipse.birt:modelapi:jar:2.3.2:compile"> - <CLASSES> - <root url="jar://$MAVEN_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: commons-discovery:commons-discovery:jar:0.2:compile"> - <CLASSES> - <root url="jar://$MAVEN_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: org.eclipse.birt:dataadapterapi:jar:2.3.2:compile"> - <CLASSES> - <root url="jar://$MAVEN_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: org.eclipse.emf:ecore-xmi:jar:2.4.1:compile"> - <CLASSES> - <root url="jar://$MAVEN_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: commons-cli:commons-cli:jar:1.0:compile"> - <CLASSES> - <root url="jar://$MAVEN_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: org.eclipse.birt:dteapi:jar:2.3.2:compile"> - <CLASSES> - <root url="jar://$MAVEN_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.w3c:sac:jar:1.3:compile"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/w3c/sac/1.3/sac-1.3.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: com.lowagie:itext:jar:1.3:compile"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/com/lowagie/itext/1.3/itext-1.3.jar!/" /> - </CLASSES> - <JAVADOC /> - <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://$MAVEN_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://$MAVEN_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://$MAVEN_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://$MAVEN_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://$MAVEN_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://$MAVEN_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://$MAVEN_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://$MAVEN_REPOSITORY$/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES> - <root url="jar://$MAVEN_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://$MAVEN_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://$MAVEN_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://$MAVEN_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://$MAVEN_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://$MAVEN_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://$MAVEN_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://$MAVEN_REPOSITORY$/commons-beanutils/commons-beanutils-core/1.8.0/commons-beanutils-core-1.8.0.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - </component> -</module> - Deleted: bpm-console/trunk/doc/doc.iml =================================================================== --- bpm-console/trunk/doc/doc.iml 2010-03-12 15:44:56 UTC (rev 1007) +++ bpm-console/trunk/doc/doc.iml 2010-03-18 10:32:27 UTC (rev 1008) @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module relativePaths="true" type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" inherit-compiler-output="true"> - <exclude-output /> - <content url="file://$MODULE_DIR$" /> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - </component> -</module> - Deleted: bpm-console/trunk/gui/profiles/gui-profiles.iml =================================================================== --- bpm-console/trunk/gui/profiles/gui-profiles.iml 2010-03-12 15:44:56 UTC (rev 1007) +++ bpm-console/trunk/gui/profiles/gui-profiles.iml 2010-03-18 10:32:27 UTC (rev 1008) @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module relativePaths="true" type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" inherit-compiler-output="true"> - <exclude-output /> - <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/drools/src/main/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/drools/src/main/resources" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/jbpm/src/main/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/jbpm/src/main/resources" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/riftsaw/src/main/resources" isTestSource="false" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - </component> -</module> - Modified: bpm-console/trunk/gui/profiles/jbpm/src/main/resources/toolset-profile.properties =================================================================== --- bpm-console/trunk/gui/profiles/jbpm/src/main/resources/toolset-profile.properties 2010-03-12 15:44:56 UTC (rev 1007) +++ bpm-console/trunk/gui/profiles/jbpm/src/main/resources/toolset-profile.properties 2010-03-18 10:32:27 UTC (rev 1008) @@ -5,4 +5,5 @@ org.jboss.bpm.console.client.PreferencesModule org.jboss.bpm.console.client.ServerStatusModule org.jboss.bpm.console.client.process.ProcessModule +org.jboss.bpm.console.client.process.ProcessHistoryModule org.jboss.bpm.console.client.report.ReportModule \ No newline at end of file Deleted: bpm-console/trunk/gui/war/gui-war.iml =================================================================== --- bpm-console/trunk/gui/war/gui-war.iml 2010-03-12 15:44:56 UTC (rev 1007) +++ bpm-console/trunk/gui/war/gui-war.iml 2010-03-18 10:32:27 UTC (rev 1008) @@ -1,214 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module relativePaths="true" type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" inherit-compiler-output="true"> - <exclude-output /> - <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" /> - </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" /> - <orderEntry type="module-library"> - <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:provided"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1-sources.jar!/" /> - </SOURCES> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: commons-collections:commons-collections:jar:3.2.1:provided"> - <CLASSES> - <root url="jar://$MAVEN_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: commons-logging:commons-logging:jar:1.1.1:provided"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: junit:junit:jar:3.8.1:test"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/junit/junit/3.8.1/junit-3.8.1.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://$MAVEN_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://$MAVEN_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: com.google.gwt:gwt-dev:jar:mac:1.5.3:provided"> - <CLASSES> - <root url="jar://$MAVEN_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: commons-digester:commons-digester:jar:1.8:provided"> - <CLASSES> - <root url="jar://$MAVEN_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: com.googlecode.mvc4g:mvc4g:jar:1.0.0-jboss:provided"> - <CLASSES> - <root url="jar://$MAVEN_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: com.googlecode.gwtmosaic:gwt-mosaic-dnd:jar:0.1.10:provided"> - <CLASSES> - <root url="jar://$MAVEN_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.google.gwt:gwt-servlet:jar:1.5.3:provided"> - <CLASSES> - <root url="jar://$MAVEN_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.gwtmosaic:gwt-mosaic-gwtx:jar:0.1.10:provided"> - <CLASSES> - <root url="jar://$MAVEN_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: javax.xml.stream:stax-api:jar:1.0-2:provided"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.3:provided"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/gwt/gwt-user/1.5.3/gwt-user-1.5.3.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://$MAVEN_REPOSITORY$/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES> - <root url="jar://$MAVEN_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: commons-configuration:commons-configuration:jar:1.6:provided"> - <CLASSES> - <root url="jar://$MAVEN_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://$MAVEN_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://$MAVEN_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"> - <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-incubator:jar:0.1.10:provided"> - <CLASSES> - <root url="jar://$MAVEN_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: com.google.code.gwt-log:gwt-log:jar:2.5.2:provided"> - <CLASSES> - <root url="jar://$MAVEN_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: javax.activation:activation:jar:1.1:provided"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/javax/activation/activation/1.1/activation-1.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/javax/activation/activation/1.1/activation-1.1-sources.jar!/" /> - </SOURCES> - </library> - </orderEntry> - </component> -</module> - Modified: bpm-console/trunk/gui/war/pom.xml =================================================================== --- bpm-console/trunk/gui/war/pom.xml 2010-03-12 15:44:56 UTC (rev 1007) +++ bpm-console/trunk/gui/war/pom.xml 2010-03-18 10:32:27 UTC (rev 1008) @@ -15,10 +15,7 @@ </parent> <properties> - <gwt-maven.version>2.0-RC1</gwt-maven.version> - <mvel.version>2.0.16</mvel.version> - <guice.version>2.0</guice.version> - <slf4j.version>1.5.2</slf4j.version> + <gwt-maven.version>2.0-RC1</gwt-maven.version> </properties>  @@ -125,7 +122,7 @@   - <dependency> +  <dependency> - <groupId>com.google.code.gwt-log</groupId> - <artifactId>gwt-log</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> <groupId>com.googlecode.mvc4g</groupId> <artifactId>mvc4g</artifactId> <scope>provided</scope> @@ -228,6 +213,13 @@ </exclusions> <scope>provided</scope> </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.9</version> + </dependency> + </dependencies>  @@ -388,7 +380,7 @@ <artifactId>gwt-console-profile-jbpm</artifactId> <version>${version}</version> <scope>provided</scope> - </dependency> + </dependency> </dependencies> <properties> <console.app.webcontext>jbpm-console</console.app.webcontext> Modified: bpm-console/trunk/gui/war/src/main/java/jmaki/xhp/HttpClient.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/jmaki/xhp/HttpClient.java 2010-03-12 15:44:56 UTC (rev 1007) +++ bpm-console/trunk/gui/war/src/main/java/jmaki/xhp/HttpClient.java 2010-03-18 10:32:27 UTC (rev 1008) @@ -252,6 +252,7 @@ return (this.urlConnection.getInputStream()); } catch (Exception e) { + System.out.println("Failed to open " + this.urlConnection.getURL()); e.printStackTrace(); return null; } Modified: bpm-console/trunk/gui/war/src/main/java/jmaki/xhp/XmlHttpProxyServlet.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/jmaki/xhp/XmlHttpProxyServlet.java 2010-03-12 15:44:56 UTC (rev 1007) +++ bpm-console/trunk/gui/war/src/main/java/jmaki/xhp/XmlHttpProxyServlet.java 2010-03-18 10:32:27 UTC (rev 1008) @@ -53,7 +53,8 @@ private static String testPass; private static String setCookie; - + private String configResource = null; + public XmlHttpProxyServlet() { if (rDebug) { logger = getLogger(); @@ -126,6 +127,12 @@ } else { xhp = new XmlHttpProxy(); } + + // config override + String servletName = config.getServletName(); + String configName = config.getInitParameter("config.name"); + configResource = configName!=null ? configName : XHP_CONFIG; + System.out.println("Configure "+servletName + " through "+configResource); } private void getServices(HttpServletResponse res) @@ -133,10 +140,10 @@ InputStream is = null; try { - URL url = ctx.getResource(resourcesDir + XHP_CONFIG); + URL url = ctx.getResource(resourcesDir + configResource); // use classpath if not found locally. //if (url == null) url = XmlHttpProxyServlet.class.getResource(classpathResourcesDir + XHP_CONFIG); - if (url == null) url = XmlHttpProxyServlet.class.getResource(XHP_CONFIG); // same package + if (url == null) url = XmlHttpProxyServlet.class.getResource(configResource); // same package is = url.openStream(); } catch (Exception ex) @@ -316,10 +323,8 @@ // override service url and url params String path = req.getRequestURI(); - if(path.indexOf("xhp/")!=-1) - path = path.substring(path.indexOf("xhp/")+3, path.length()); - else - path = path.substring(path.indexOf("xhp")+3, path.length()); + String servletPath = req.getServletPath(); + path = path.substring(path.indexOf(servletPath)+servletPath.length(), path.length()); StringTokenizer tok = new StringTokenizer(path, "/"); while(tok.hasMoreTokens()) @@ -331,7 +336,8 @@ sb.append("/").append(URLEncoder.encode(token)); } - sb.append("?").append(req.getQueryString()); + if(req.getQueryString()!=null) + sb.append("?").append(req.getQueryString()); urlString = sb.toString(); } @@ -482,7 +488,7 @@ */ private boolean configUpdated() { try { - URL url = ctx.getResource(resourcesDir + XHP_CONFIG); + URL url = ctx.getResource(resourcesDir + configResource); URLConnection con; if (url == null) return false ; con = url.openConnection(); Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/Application.gwt.xml =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/Application.gwt.xml 2010-03-12 15:44:56 UTC (rev 1007) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/Application.gwt.xml 2010-03-18 10:32:27 UTC (rev 1008) @@ -13,19 +13,7 @@ <inherits name="org.jboss.errai.common.ErraiCommon"/> <inherits name="org.jboss.errai.bus.ErraiBus" /> <inherits name="org.jboss.errai.workspaces.ErraiWorkspaces" /> - -  - <inherits name="com.allen_sauer.gwt.log.gwt-log-DEBUG" /> - <set-property name="log_ConsoleLogger" value="ENABLED" /> - <set-property name="log_DivLogger" value="DISABLED" /> - <set-property name="log_GWTLogger" value="ENABLED" /> - <set-property name="log_SystemLogger" value="ENABLED" /> - -  - <set-property name="log_FirebugLogger" value="DISABLED" /> - <set-property name="log_RemoteLogger" value="DISABLED" /> - <set-property name="log_WindowLogger" value="DISABLED" /> - +  <inherits name='org.jboss.bpm.report.BPMReport' /> 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 2010-03-12 15:44:56 UTC (rev 1007) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java 2010-03-18 10:32:27 UTC (rev 1008) @@ -21,6 +21,8 @@ */ package org.jboss.bpm.console.client; +import java.util.List; + import com.google.gwt.core.client.GWT; import com.google.gwt.http.client.URL; import org.jboss.bpm.console.client.model.ProcessInstanceRef; @@ -223,4 +225,30 @@ String encodedId = URL.encode(id); return config.getConsoleServerUrl() + "/rs/engine/job/"+encodedId+"/execute"; } + + public String getInstanceHistoryURL(String instanceId) + { + return config.getConsoleServerUrl() + "/rs/process/instance/history/" + instanceId; + } + + public String getDefinitionHistoryURL(String definitionId) + { + return config.getConsoleServerUrl() + "/rs/process/definition/history/" + definitionId; + } + + public String getDefinitionHistoryNodeInfoURL(String definitionId, List<String> activities) + { + StringBuffer queryString = new StringBuffer(); + boolean isFirst = true; + for (String activity : activities) { + if (isFirst) { + queryString.append("activity=" + activity); + isFirst = false; + } else { + queryString.append("&activity=" + activity); + } + } + + return config.getConsoleServerUrl() + "/rs/process/definition/history/" + definitionId + "/nodeInfo?" + queryString.toString(); + } } Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/DeploymentListView.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/DeploymentListView.java 2010-03-12 15:44:56 UTC (rev 1007) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/DeploymentListView.java 2010-03-18 10:32:27 UTC (rev 1008) @@ -23,8 +23,6 @@ import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; -import com.google.gwt.gen2.table.event.client.RowSelectionEvent; -import com.google.gwt.gen2.table.event.client.RowSelectionHandler; import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.ChangeListener; @@ -36,14 +34,16 @@ import org.gwt.mosaic.ui.client.ListBox; import org.gwt.mosaic.ui.client.MessageBox; import org.gwt.mosaic.ui.client.ToolBar; +import org.gwt.mosaic.ui.client.event.RowSelectionEvent; +import org.gwt.mosaic.ui.client.event.RowSelectionHandler; import org.gwt.mosaic.ui.client.layout.*; import org.gwt.mosaic.ui.client.list.DefaultListModel; import org.jboss.bpm.console.client.common.DataDriven; import org.jboss.bpm.console.client.common.LoadingOverlay; import org.jboss.bpm.console.client.model.DeploymentRef; import org.jboss.bpm.console.client.util.SimpleDateFormat; +import org.jboss.errai.workspaces.client.api.ProvisioningCallback; import org.jboss.errai.workspaces.client.api.WidgetProvider; -import org.jboss.errai.workspaces.client.api.ProvisioningCallback; import org.jboss.errai.workspaces.client.framework.Registry; import java.util.List; Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/JobListView.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/JobListView.java 2010-03-12 15:44:56 UTC (rev 1007) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/JobListView.java 2010-03-18 10:32:27 UTC (rev 1008) @@ -23,8 +23,6 @@ import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; -import com.google.gwt.gen2.table.event.client.RowSelectionEvent; -import com.google.gwt.gen2.table.event.client.RowSelectionHandler; import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.ChangeListener; @@ -35,6 +33,8 @@ import org.gwt.mosaic.ui.client.ListBox; import org.gwt.mosaic.ui.client.MessageBox; import org.gwt.mosaic.ui.client.ToolBar; +import org.gwt.mosaic.ui.client.event.RowSelectionEvent; +import org.gwt.mosaic.ui.client.event.RowSelectionHandler; import org.gwt.mosaic.ui.client.layout.BoxLayout; import org.gwt.mosaic.ui.client.layout.BoxLayoutData; import org.gwt.mosaic.ui.client.layout.MosaicPanel; 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 2010-03-12 15:44:56 UTC (rev 1007) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java 2010-03-18 10:32:27 UTC (rev 1008) @@ -22,8 +22,10 @@ package org.jboss.bpm.console.client.model; 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.console.client.util.JSONWalk.JSONWrapper; import java.util.ArrayList; import java.util.Date; @@ -337,4 +339,39 @@ return result; } + + public static List<ActiveNodeInfo> parseActiveNodeInfo(String json) { + ConsoleLog.debug("Parse: " + json); + + List<ActiveNodeInfo> activeNodeInfos = new ArrayList<ActiveNodeInfo>(); + JSONValue root = JSONParser.parse(json); + //int diagramWidth = JSONWalk.on(root).next("diagramWidth").asInt(); + //int diagramHeight = JSONWalk.on(root).next("diagramHeight").asInt(); + + if (root instanceof JSONArray) { + JSONArray array = (JSONArray) root; + + for (int i = 0; i < array.size(); i++) { + JSONWalk walk = JSONWalk.on(array.get(i)); + JSONWrapper wrapper = walk.next("activeNode"); + JSONObject activeNode = wrapper.asObject(); + + int x = JSONWalk.on(activeNode).next("x").asInt(); + int y = JSONWalk.on(activeNode).next("y").asInt(); + + int width = JSONWalk.on(activeNode).next("width").asInt(); + int height = JSONWalk.on(activeNode).next("height").asInt(); + String name = JSONWalk.on(activeNode).next("name").asString(); + + activeNodeInfos.add( + new ActiveNodeInfo( + -1, -1, + new DiagramNodeInfo(name, x, y, width, height) + ) + ); + wrapper = walk.next("activeNode"); + } + } + return activeNodeInfos; + } } Modified: 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 2010-03-12 15:44:56 UTC (rev 1007) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/model/JSOParser.java 2010-03-18 10:32:27 UTC (rev 1008) @@ -165,6 +165,71 @@ return status; } + + public static List<HistoryActivityInstanceRef> parseProcessInstanceHistory(String json) + { + + List<HistoryActivityInstanceRef> results = new ArrayList<HistoryActivityInstanceRef>(); + JSOModel rootModel = JSOModel.fromJson(json); + + JsArray<JSOModel> historyEntires = rootModel.getArray("historyEntires"); + + for(int i=0; i<historyEntires.length(); i++) + { + JSOModel entry = historyEntires.get(i); + results.add(parseProcessInstanceHistory(entry)); + } + + return results; + } + + public static HistoryActivityInstanceRef parseProcessInstanceHistory(JSOModel rootModel) + { + HistoryActivityInstanceRef def = new HistoryActivityInstanceRef(); + + def.setActivityName(rootModel.get("activityName")); + def.setStartTime(rootModel.getDate("startTime")); + def.setEndTime(rootModel.getDate("endTime")); + def.setExecutionId(rootModel.get("executionId")); + def.setDuration(rootModel.getLong("duration")); + + + return def; + } + + public static List<HistoryProcessInstanceRef> parseProcessDefinitionHistory(String json) + { + + List<HistoryProcessInstanceRef> results = new ArrayList<HistoryProcessInstanceRef>(); + JSOModel rootModel = JSOModel.fromJson(json); + + JsArray<JSOModel> historyEntires = rootModel.getArray("historyEntires"); + + for(int i=0; i<historyEntires.length(); i++) + { + JSOModel entry = historyEntires.get(i); + results.add(parseProcessDefinitionHistory(entry)); + } + + return results; + } + + public static HistoryProcessInstanceRef parseProcessDefinitionHistory(JSOModel rootModel) + { + HistoryProcessInstanceRef def = new HistoryProcessInstanceRef(); + + def.setProcessDefinitionId(rootModel.get("processDefinitionId")); + def.setProcessInstanceId(rootModel.get("processInstanceId")); + def.setStartTime(rootModel.getDate("startTime")); + def.setEndTime(rootModel.getDate("endTime")); + def.setEndActivityName(rootModel.get("endActivityName")); + def.setState(rootModel.get("state")); + def.setKey(rootModel.get("key")); + def.setDuration(rootModel.getLong("duration")); + + + return def; + } } Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ActivityDiagramView.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ActivityDiagramView.java 2010-03-12 15:44:56 UTC (rev 1007) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ActivityDiagramView.java 2010-03-18 10:32:27 UTC (rev 1008) @@ -85,7 +85,8 @@ "<div id=\"imageContainer\" style=\"position:relative;top:-1;left:-1;\">" + "<img src=\""+imageUrl+"\" style=\"position:absolute;top:0;left:0\" />"; for (ActiveNodeInfo activeNodeInfo: activeNodeInfos) { - s+= "<div class=\"bpm-graphView-activityImage\" style=\"position:absolute;top:"+ (activeNodeInfo.getActiveNode().getY()-8) +"px;left:"+(activeNodeInfo.getActiveNode().getX()-8)+"px;width:50px;height:50px; z-index:1000;\"></div>"; + + s+= "<div class=\"bpm-graphView-activityImage\" style=\"position:absolute;top:"+ (activeNodeInfo.getActiveNode().getY()-8) +"px;left:"+(activeNodeInfo.getActiveNode().getX()-8)+"px;width:50px;height:50px; z-index:1000;background-image: url(images/icons/play_red_big.png);background-repeat:no-repeat;\"></div>"; } s+= "</div>" + "</div>"; Added: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionHistoryListView.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionHistoryListView.java (rev 0) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionHistoryListView.java 2010-03-18 10:32:27 UTC (rev 1008) @@ -0,0 +1,347 @@ +/* + * 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.process; + +import java.util.ArrayList; +import java.util.List; + +import org.gwt.mosaic.ui.client.ListBox; +import org.gwt.mosaic.ui.client.ToolBar; +import org.gwt.mosaic.ui.client.event.RowSelectionEvent; +import org.gwt.mosaic.ui.client.event.RowSelectionHandler; +import org.gwt.mosaic.ui.client.layout.BoxLayout; +import org.gwt.mosaic.ui.client.layout.BoxLayoutData; +import org.gwt.mosaic.ui.client.layout.MosaicPanel; +import org.gwt.mosaic.ui.client.list.DefaultListModel; +import org.gwt.mosaic.ui.client.table.AbstractScrollTable; +import org.jboss.bpm.console.client.common.DataDriven; +import org.jboss.bpm.console.client.common.LoadingOverlay; +import org.jboss.bpm.console.client.common.Model; +import org.jboss.bpm.console.client.common.ModelCommands; +import org.jboss.bpm.console.client.common.ModelParts; +import org.jboss.bpm.console.client.common.PagingCallback; +import org.jboss.bpm.console.client.common.PagingPanel; +import org.jboss.bpm.console.client.model.ProcessDefinitionRef; +import org.jboss.errai.bus.client.ErraiBus; +import org.jboss.errai.bus.client.api.Message; +import org.jboss.errai.bus.client.api.MessageCallback; +import org.jboss.errai.workspaces.client.api.ProvisioningCallback; +import org.jboss.errai.workspaces.client.api.WidgetProvider; +import org.jboss.errai.workspaces.client.framework.Registry; + +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.user.client.Command; +import com.google.gwt.user.client.DeferredCommand; +import com.google.gwt.user.client.Timer; +import com.google.gwt.user.client.ui.Button; +import com.google.gwt.user.client.ui.HTML; +import com.mvc4g.client.Controller; +import com.mvc4g.client.Event; +import com.mvc4g.client.ViewInterface; + +/** + * Maciej Swiderski <swiderski.maciej(a)gmail.com> + */ +public class DefinitionHistoryListView implements WidgetProvider, ViewInterface, DataDriven +{ + public final static String ID = DefinitionHistoryListView.class.getName(); + + private Controller controller; + + private MosaicPanel definitionList = null; + + private ListBox<ProcessDefinitionRef> listBox; + + private boolean isInitialized; + + private List<ProcessDefinitionRef> definitions = null; + private PagingPanel pagingPanel; + + private MosaicPanel panel; + + public void provideWidget(ProvisioningCallback callback) + { + + panel = new MosaicPanel(); + panel.setWidgetSpacing(0); + panel.setPadding(0); + + listBox = createListBox(); + final Controller controller = Registry.get(Controller.class); + controller.addView(ID, this); + + controller.addAction(UpdateHistoryDefinitionAction.ID, new UpdateHistoryDefinitionAction()); + controller.addAction(UpdateHistoryInstanceAction.ID, new UpdateHistoryInstanceAction()); + controller.addAction(LoadHistoryDiagramAction.ID, new LoadHistoryDiagramAction()); + controller.addAction(UpdateHistoryDefinitionsAction.ID, new UpdateHistoryDefinitionsAction()); + + + initialize(); + + Timer t = new Timer() + { + @Override + public void run() + { + controller.handleEvent( + new Event(UpdateHistoryDefinitionsAction.ID, null) + ); + } + }; + + t.schedule(500); + + callback.onSuccess(panel); + } + + public boolean isInitialized() + { + return isInitialized; + } + + public void initialize() + { + if(!isInitialized) + { + + definitionList = new MosaicPanel( new BoxLayout(BoxLayout.Orientation.VERTICAL)); + definitionList.setPadding(0); + definitionList.setWidgetSpacing(0); + + // toolbar + + final MosaicPanel toolBox = new MosaicPanel(); + toolBox.setPadding(0); + toolBox.setWidgetSpacing(0); + toolBox.setLayout(new BoxLayout(BoxLayout.Orientation.HORIZONTAL)); + + // toolbar + final ToolBar toolBar = new ToolBar(); + ClickHandler clickHandler = new ClickHandler() + { + public void onClick(ClickEvent clickEvent) + { + reload(); + } + }; + + toolBar.add( + new Button("Refresh", clickHandler + ) + ); + + toolBox.add(toolBar, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); + + definitionList.add(toolBox, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); + + definitionList.add(listBox, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH)); + pagingPanel = new PagingPanel( + new PagingCallback() + { + public void rev() + { + renderFiltered(); + } + + public void ffw() + { + renderFiltered(); + } + } + ); + definitionList.add(pagingPanel,new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); + + + panel.add(definitionList); + + // deployments model listener + ErraiBus.get().subscribe(Model.SUBJECT, + new MessageCallback() + { + public void callback(Message message) + { + switch (ModelCommands.valueOf(message.getCommandType())) + { + case HAS_BEEN_UPDATED: + if(message.get(String.class, ModelParts.CLASS).equals(Model.DEPLOYMENT_MODEL)) + reload(); + break; + } + } + }); + + isInitialized = true; + } + } + + private void reload() + { + DeferredCommand.addCommand( + new Command() + { + public void execute() + { + final DefaultListModel<ProcessDefinitionRef> model = + (DefaultListModel<ProcessDefinitionRef>) listBox.getModel(); + model.clear(); + + // force loading + controller.handleEvent( + new Event(UpdateHistoryDefinitionsAction.ID, null) + ); + } + } + ); + } + + private ListBox<ProcessDefinitionRef> createListBox() + { + final ListBox<ProcessDefinitionRef> listBox = + new ListBox<ProcessDefinitionRef>( + new String[] { + "<b>Process</b>", "v."//, "Version", "Suspended" + } + ); + + listBox.setFocus(true); + + listBox.setCellRenderer(new ListBox.CellRenderer<ProcessDefinitionRef>() { + public void renderCell(ListBox<ProcessDefinitionRef> listBox, int row, int column, + ProcessDefinitionRef item) { + switch (column) { + case 0: + + String name = item.getName(); + String s = name.indexOf("}") > 0 ? + name.substring(name.lastIndexOf("}")+1, name.length()) : name; + + String color= item.isSuspended() ? "#CCCCCC" : "#000000"; + String text = "<div style=\"color:"+color+"\">"+ s +"</div>"; + + listBox.setWidget(row, column, new HTML(text)); + break; + case 1: + listBox.setText(row, column, String.valueOf(item.getVersion())); + break; + case 2: + listBox.setText(row, column, String.valueOf(item.isSuspended())); + break; + default: + throw new RuntimeException("Unexpected column size"); + } + } + }); + + listBox.setMinimumColumnWidth(0, 190); + listBox.setColumnResizePolicy(AbstractScrollTable.ColumnResizePolicy.MULTI_CELL); + + listBox.addRowSelectionHandler( + new RowSelectionHandler() + { + public void onRowSelection(RowSelectionEvent rowSelectionEvent) + { + int index = listBox.getSelectedIndex(); + if(index!=-1) + { + ProcessDefinitionRef item = listBox.getItem(index); + + // load history instances + controller.handleEvent( + new Event( + UpdateHistoryDefinitionAction.ID, + item + ) + ); + + + } + } + } + ); + + return listBox; + } + + + public void setController(Controller controller) + { + this.controller = controller; + } + + public void reset() + { + final DefaultListModel<ProcessDefinitionRef> model = + (DefaultListModel<ProcessDefinitionRef>) listBox.getModel(); + + model.clear(); + + } + + public void update(Object... data) + { + this.definitions = (List<ProcessDefinitionRef>) data[0]; + pagingPanel.reset(); + renderFiltered(); + } + + public void setLoading(boolean isLoading) + { + LoadingOverlay.on(panel, isLoading); + } + + private void renderFiltered() + { + if(this.definitions!=null) + { + reset(); + + final DefaultListModel<ProcessDefinitionRef> model = + (DefaultListModel<ProcessDefinitionRef>) listBox.getModel(); + + List<ProcessDefinitionRef> tmp = new ArrayList<ProcessDefinitionRef>(); + for(ProcessDefinitionRef def : definitions) + { + + tmp.add(def); + + } + + for(ProcessDefinitionRef def : (List<ProcessDefinitionRef>) pagingPanel.trim(tmp) ) + model.add(def); + + if(listBox.getSelectedIndex()!=-1) + listBox.setItemSelected(listBox.getSelectedIndex(), false); + + } + } + + public ProcessDefinitionRef getSelection() + { + ProcessDefinitionRef selection = null; + if(isInitialized() && listBox.getSelectedIndex()!=-1) + selection = listBox.getItem( listBox.getSelectedIndex()); + return selection; + } + +} + Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java 2010-03-12 15:44:56 UTC (rev 1007) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java 2010-03-18 10:32:27 UTC (rev 1008) @@ -25,9 +25,6 @@ import com.google.gwt.event.dom.client.ChangeHandler; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; -import com.google.gwt.gen2.table.client.AbstractScrollTable; -import com.google.gwt.gen2.table.event.client.RowSelectionEvent; -import com.google.gwt.gen2.table.event.client.RowSelectionHandler; import com.google.gwt.user.client.Command; import com.google.gwt.user.client.DeferredCommand; import com.google.gwt.user.client.Timer; @@ -38,10 +35,13 @@ import com.mvc4g.client.ViewInterface; import org.gwt.mosaic.ui.client.ListBox; import org.gwt.mosaic.ui.client.ToolBar; +import org.gwt.mosaic.ui.client.event.RowSelectionEvent; +import org.gwt.mosaic.ui.client.event.RowSelectionHandler; import org.gwt.mosaic.ui.client.layout.BoxLayout; import org.gwt.mosaic.ui.client.layout.BoxLayoutData; import org.gwt.mosaic.ui.client.layout.MosaicPanel; import org.gwt.mosaic.ui.client.list.DefaultListModel; +import org.gwt.mosaic.ui.client.table.AbstractScrollTable; import org.jboss.bpm.console.client.common.*; import org.jboss.bpm.console.client.model.ProcessDefinitionRef; import org.jboss.errai.bus.client.ErraiBus; Added: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/HistoryInstanceListView.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/HistoryInstanceListView.java (rev 0) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/HistoryInstanceListView.java 2010-03-18 10:32:27 UTC (rev 1008) @@ -0,0 +1,441 @@ +/* + * 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.process; + +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.user.client.ui.Button; +import com.google.gwt.user.client.ui.Label; +import com.mvc4g.client.Controller; +import com.mvc4g.client.Event; +import com.mvc4g.client.ViewInterface; +import org.gwt.mosaic.ui.client.ListBox; +import org.gwt.mosaic.ui.client.MessageBox; +import org.gwt.mosaic.ui.client.ToolBar; +import org.gwt.mosaic.ui.client.event.RowSelectionEvent; +import org.gwt.mosaic.ui.client.event.RowSelectionHandler; +import org.gwt.mosaic.ui.client.layout.*; +import org.gwt.mosaic.ui.client.list.DefaultListModel; +import org.jboss.bpm.console.client.ApplicationContext; +import org.jboss.bpm.console.client.common.*; +import org.jboss.bpm.console.client.model.HistoryActivityInstanceRef; +import org.jboss.bpm.console.client.model.HistoryProcessInstanceRef; +import org.jboss.bpm.console.client.model.ProcessDefinitionRef; +import org.jboss.bpm.console.client.process.events.HistoryActivityDiagramEvent; +import org.jboss.bpm.console.client.util.SimpleDateFormat; +import org.jboss.errai.workspaces.client.api.ProvisioningCallback; +import org.jboss.errai.workspaces.client.api.WidgetProvider; +import org.jboss.errai.workspaces.client.framework.Registry; + +import java.util.ArrayList; +import java.util.List; + + +/** + * @author Maciej Swiderski <swiderski.maciej(a)gmail.com> + */ +public class HistoryInstanceListView implements WidgetProvider, ViewInterface, DataDriven +{ + public final static String ID = HistoryInstanceListView.class.getName(); + + private Controller controller; + + private MosaicPanel instanceList = null; + + private ListBox<HistoryProcessInstanceRef> listBoxHistory; + + private ListBox<HistoryActivityInstanceRef> listBoxInstanceActivity; + + private ProcessDefinitionRef currentDefinition; + + private boolean isInitialized; + + private List<HistoryProcessInstanceRef> cachedInstances = null; + + private List<HistoryActivityInstanceRef> cachedInstancesActivity = null; + + private List<String> executedActivities = null; + + private SimpleDateFormat dateFormat = new SimpleDateFormat(); + + private ApplicationContext appContext; + + private PagingPanel pagingPanel; + + MosaicPanel panel; + + private Button diagramBtn; + + private WidgetWindowPanel diagramWindowPanel; + + private ActivityDiagramView diagramView; + + public void provideWidget(ProvisioningCallback callback) + { + + this.appContext = Registry.get(ApplicationContext.class); + + panel = new MosaicPanel(); + panel.setPadding(0); + + Registry.get(Controller.class).addView(ID, this); + initialize(); + + callback.onSuccess(panel); + } + + public boolean isInitialized() + { + return isInitialized; + } + + public void initialize() + { + if(!isInitialized) + { + instanceList = new MosaicPanel( new BoxLayout(BoxLayout.Orientation.VERTICAL)); + instanceList.setPadding(0); + instanceList.setWidgetSpacing(0); + + // create history list box elements + listBoxHistory = createHistoryListBox(); + // create list of activities executed for currently selected history process instance + this.listBoxInstanceActivity = createHistoryActivitiesListBox(); + + // toolbar + final MosaicPanel toolBox = new MosaicPanel(); + + toolBox.setPadding(0); + toolBox.setWidgetSpacing(5); + toolBox.setLayout(new BoxLayout(BoxLayout.Orientation.HORIZONTAL)); + + final ToolBar toolBar = new ToolBar(); + toolBar.add( + new Button("Refresh", new ClickHandler() { + + public void onClick(ClickEvent clickEvent) + { + + controller.handleEvent( + new Event( + UpdateHistoryDefinitionAction.ID, + getCurrentDefinition() + ) + ); + } + } + ) + ); + + diagramBtn = new Button("Diagram", new ClickHandler() + { + public void onClick(ClickEvent clickEvent) + { + String diagramUrl = currentDefinition.getDiagramUrl(); + if (currentDefinition != null && executedActivities != null) { + HistoryActivityDiagramEvent eventData = new HistoryActivityDiagramEvent(currentDefinition, executedActivities); + if(diagramUrl !=null && !diagramUrl.equals("")) + { + createDiagramWindow(); + controller.handleEvent( + new Event(LoadHistoryDiagramAction.ID, eventData) + ); + + } + else + { + MessageBox.alert("Incomplete deployment", "No diagram associated with process"); + } + } + } + } + ); + + + + // terminate works on any BPM Engine + toolBar.add(diagramBtn); + diagramBtn.setEnabled(false); + + toolBox.add(toolBar, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); + + + instanceList.add(toolBox, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); + instanceList.add(listBoxHistory, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH)); + + pagingPanel = new PagingPanel( + new PagingCallback() + { + public void rev() + { + renderUpdate(); + } + + public void ffw() + { + renderUpdate(); + } + } + ); + instanceList.add(pagingPanel, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); + instanceList.add(listBoxInstanceActivity, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH)); + + + // cached data? + if(this.cachedInstances!=null) + bindData(this.cachedInstances); + + // layout + MosaicPanel layout = new MosaicPanel(new BorderLayout()); + layout.setPadding(0); + layout.add(instanceList, new BorderLayoutData(BorderLayout.Region.CENTER)); + + + panel.add(layout); + + isInitialized = true; + + this.executedActivities = new ArrayList<String>(); + + } + } + + public HistoryProcessInstanceRef getSelection() + { + HistoryProcessInstanceRef selection = null; + if(listBoxHistory.getSelectedIndex()!=-1) + selection = listBoxHistory.getItem( listBoxHistory.getSelectedIndex()); + return selection; + } + + public ProcessDefinitionRef getCurrentDefinition() + { + return this.currentDefinition; + } + + public void setController(Controller controller) + { + this.controller = controller; + + this.diagramView = new ActivityDiagramView(); + + controller.addView(ActivityDiagramView.ID, diagramView); + } + + public void reset() + { + this.currentDefinition = null; + this.cachedInstances = new ArrayList<HistoryProcessInstanceRef>(); + renderUpdate(); + + diagramBtn.setEnabled(false); + } + + public void update(Object... data) + { + if (data[0] instanceof ProcessDefinitionRef) { + // fill in list box for finished process instances for current definition + this.currentDefinition = (ProcessDefinitionRef)data[0]; + this.cachedInstances = (List<HistoryProcessInstanceRef>)data[1]; + + //if(isInitialized()) pagingPanel.reset(); + renderUpdate(); + + //clear activity list box + final DefaultListModel<HistoryActivityInstanceRef> model = + (DefaultListModel<HistoryActivityInstanceRef>) listBoxInstanceActivity.getModel(); + + model.clear(); + diagramBtn.setEnabled(false); + } + else + { + // fill in list box of activities executed for currently selected process instance + this.cachedInstancesActivity = (List<HistoryActivityInstanceRef>) data[0]; + + renderHistoryActivityList(); + } + } + + public void setLoading(boolean isLoading) + { + LoadingOverlay.on(instanceList, isLoading); + } + + private void renderUpdate() + { + if(isInitialized()) + { + bindData(this.cachedInstances); + + + } + } + + private void bindData(List<HistoryProcessInstanceRef> instances) + { + final DefaultListModel<HistoryProcessInstanceRef> model = + (DefaultListModel<HistoryProcessInstanceRef>) listBoxHistory.getModel(); + model.clear(); + + List<HistoryProcessInstanceRef> list = pagingPanel.trim(instances); + for(HistoryProcessInstanceRef inst : list) + { + model.add(inst); + } + + // layout again + panel.invalidate(); + } + + private void renderHistoryActivityList() + { + + if(this.cachedInstancesActivity!=null) + { + + final DefaultListModel<HistoryActivityInstanceRef> model = + (DefaultListModel<HistoryActivityInstanceRef>) listBoxInstanceActivity.getModel(); + + model.clear(); + this.executedActivities.clear(); + + for(HistoryActivityInstanceRef def : cachedInstancesActivity) + { + + model.add(def); + this.executedActivities.add(def.getActivityName()); + + } + + if(listBoxInstanceActivity.getSelectedIndex()!=-1) + listBoxInstanceActivity.setItemSelected(listBoxInstanceActivity.getSelectedIndex(), false); + + } + } + + + protected ListBox<HistoryProcessInstanceRef> createHistoryListBox() { + listBoxHistory = new ListBox<HistoryProcessInstanceRef>(new String[] { "<b>Instance</b>", "State", "Start Date", "End Date", "Duration" }); + + listBoxHistory.setCellRenderer(new ListBox.CellRenderer<HistoryProcessInstanceRef>() { + + public void renderCell(ListBox<HistoryProcessInstanceRef> listBox, int row, int column, HistoryProcessInstanceRef item) { + switch (column) { + case 0: + listBox.setText(row, column, item.getProcessInstanceId()); + break; + case 1: + listBox.setText(row, column, item.getState().toString()); + break; + case 2: + String d = item.getStartTime() != null ? dateFormat.format(item.getStartTime()) : ""; + listBox.setText(row, column, d); + break; + case 3: + String de = item.getEndTime() != null ? dateFormat.format(item.getEndTime()) : ""; + listBox.setText(row, column, de); + break; + case 4: + listBox.setText(row, column, String.valueOf(item.getDuration())); + break; + default: + throw new RuntimeException("Unexpected column size"); + } + } + }); + + listBoxHistory.addRowSelectionHandler(new RowSelectionHandler() { + + public void onRowSelection(RowSelectionEvent rowSelectionEvent) { + int index = listBoxHistory.getSelectedIndex(); + if (index != -1) { + HistoryProcessInstanceRef item = listBoxHistory.getItem(index); + + // update details + controller.handleEvent(new Event(UpdateHistoryInstanceAction.ID, item.getProcessInstanceId())); + + diagramBtn.setEnabled(true); + } + } + }); + + return listBoxHistory; + } + + private ListBox<HistoryActivityInstanceRef> createHistoryActivitiesListBox() + { + final ListBox<HistoryActivityInstanceRef> listBox = + new ListBox<HistoryActivityInstanceRef>( + new String[] { + "ActivityName", "StartTime", "EndTime", "Duration" + } + ); + + listBox.setCellRenderer(new ListBox.CellRenderer<HistoryActivityInstanceRef>() { + public void renderCell(ListBox<HistoryActivityInstanceRef> listBox, int row, int column, + HistoryActivityInstanceRef item) { + switch (column) { + case 0: + listBox.setText(row, column, item.getActivityName()); + break; + case 1: + listBox.setText(row, column, String.valueOf(item.getStartTime())); + break; + case 2: + listBox.setText(row, column, String.valueOf(item.getEndTime())); + break; + case 3: + listBox.setText(row, column, String.valueOf(item.getDuration())); + break; + default: + throw new RuntimeException("Unexpected column size"); + } + } + }); + + + + return listBox; + } + + private void createDiagramWindow() + { + + MosaicPanel layout = new MosaicPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL)); + layout.setStyleName("bpm-window-layout"); + layout.setPadding(5); + + Label header = new Label("Instance: "); + header.setStyleName("bpm-label-header"); + layout.add(header, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); + + layout.add(diagramView, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH)); + + diagramWindowPanel = new WidgetWindowPanel( + "Process Instance Activity", + layout, true + ); + + } +} + 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 2010-03-12 15:44:56 UTC (rev 1007) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceDataView.java 2010-03-18 10:32:27 UTC (rev 1008) @@ -21,7 +21,6 @@ */ package org.jboss.bpm.console.client.process; -import com.google.gwt.gen2.table.client.AbstractScrollTable; import com.google.gwt.xml.client.Document; import com.google.gwt.xml.client.NamedNodeMap; import com.google.gwt.xml.client.Node; @@ -30,6 +29,7 @@ import org.gwt.mosaic.ui.client.ListBox; import org.gwt.mosaic.ui.client.layout.MosaicPanel; import org.gwt.mosaic.ui.client.list.DefaultListModel; +import org.gwt.mosaic.ui.client.table.AbstractScrollTable; import org.jboss.bpm.console.client.ApplicationContext; import org.jboss.bpm.console.client.LazyPanel; import org.jboss.bpm.console.client.util.ConsoleLog; Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java 2010-03-12 15:44:56 UTC (rev 1007) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java 2010-03-18 10:32:27 UTC (rev 1008) @@ -23,16 +23,15 @@ import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; -import com.google.gwt.gen2.table.event.client.RowSelectionEvent; -import com.google.gwt.gen2.table.event.client.RowSelectionHandler; import com.google.gwt.user.client.ui.Button; -import com.google.gwt.user.client.ui.HTML; import com.mvc4g.client.Controller; import com.mvc4g.client.Event; import com.mvc4g.client.ViewInterface; import org.gwt.mosaic.ui.client.ListBox; import org.gwt.mosaic.ui.client.MessageBox; import org.gwt.mosaic.ui.client.ToolBar; +import org.gwt.mosaic.ui.client.event.RowSelectionEvent; +import org.gwt.mosaic.ui.client.event.RowSelectionHandler; import org.gwt.mosaic.ui.client.layout.*; import org.gwt.mosaic.ui.client.list.DefaultListModel; import org.jboss.bpm.console.client.ApplicationContext; Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/JSONTree.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/JSONTree.java 2010-03-12 15:44:56 UTC (rev 1007) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/JSONTree.java 2010-03-18 10:32:27 UTC (rev 1008) @@ -27,8 +27,6 @@ import com.google.gwt.user.client.ui.ScrollPanel; import com.google.gwt.user.client.ui.Tree; import com.google.gwt.user.client.ui.TreeItem; -import com.google.gwt.widgetideas.client.FastTree; -import com.google.gwt.widgetideas.client.FastTreeItem; import org.jboss.bpm.console.client.util.ConsoleLog; public class JSONTree extends ScrollPanel Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/LoadActivityDiagramAction.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/LoadActivityDiagramAction.java 2010-03-12 15:44:56 UTC (rev 1007) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/LoadActivityDiagramAction.java 2010-03-18 10:32:27 UTC (rev 1008) @@ -21,25 +21,18 @@ */ package org.jboss.bpm.console.client.process; -import com.google.gwt.http.client.RequestBuilder; -import com.google.gwt.http.client.Response; -import com.google.gwt.json.client.JSONArray; -import com.google.gwt.json.client.JSONObject; -import com.google.gwt.json.client.JSONParser; -import com.google.gwt.json.client.JSONValue; -import com.mvc4g.client.Controller; +import java.util.List; + import org.jboss.bpm.console.client.URLBuilder; import org.jboss.bpm.console.client.common.AbstractRESTAction; import org.jboss.bpm.console.client.model.ActiveNodeInfo; -import org.jboss.bpm.console.client.model.DiagramNodeInfo; +import org.jboss.bpm.console.client.model.DTOParser; import org.jboss.bpm.console.client.model.ProcessInstanceRef; import org.jboss.bpm.console.client.process.events.ActivityDiagramResultEvent; -import org.jboss.bpm.console.client.util.ConsoleLog; -import org.jboss.bpm.console.client.util.JSONWalk; -import org.jboss.bpm.console.client.util.JSONWalk.JSONWrapper; -import java.util.ArrayList; -import java.util.List; +import com.google.gwt.http.client.RequestBuilder; +import com.google.gwt.http.client.Response; +import com.mvc4g.client.Controller; /** * @author Heiko.Braun <heiko.braun(a)jboss.com> @@ -69,45 +62,10 @@ { ProcessInstanceRef inst = (ProcessInstanceRef)event; - ConsoleLog.debug("Parse: " + response.getText()); - - //TODO: move to DTO Parser - JSONValue root = JSONParser.parse(response.getText()); - //int diagramWidth = JSONWalk.on(root).next("diagramWidth").asInt(); - //int diagramHeight = JSONWalk.on(root).next("diagramHeight").asInt(); - - if (root instanceof JSONArray) { - JSONArray array = (JSONArray) root; - List<ActiveNodeInfo> activeNodeInfos = new ArrayList<ActiveNodeInfo>(); - for (int i = 0; i < array.size(); i++) { - JSONWalk walk = JSONWalk.on(array.get(i)); - JSONWrapper wrapper = walk.next("activeNode"); - JSONObject activeNode = wrapper.asObject(); - - int x = JSONWalk.on(activeNode).next("x").asInt(); - int y = JSONWalk.on(activeNode).next("y").asInt(); - - int width = JSONWalk.on(activeNode).next("width").asInt(); - int height = JSONWalk.on(activeNode).next("height").asInt(); - String name = JSONWalk.on(activeNode).next("name").asString(); - - activeNodeInfos.add( - new ActiveNodeInfo( - -1, -1, - new DiagramNodeInfo(name, x, y, width, height) - ) - ); - wrapper = walk.next("activeNode"); - } - - // update view - ActivityDiagramView view = (ActivityDiagramView) controller.getView(ActivityDiagramView.ID); - view.update( - new ActivityDiagramResultEvent( - URLBuilder.getInstance().getProcessImageURL(inst.getDefinitionId()), - activeNodeInfos - ) - ); + List<ActiveNodeInfo> activeNodeInfos = DTOParser.parseActiveNodeInfo(response.getText()); + // update view + ActivityDiagramView view = (ActivityDiagramView) controller.getView(ActivityDiagramView.ID); + view.update(new ActivityDiagramResultEvent(URLBuilder.getInstance().getProcessImageURL(inst.getDefinitionId()), activeNodeInfos)); } - } + } Added: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/LoadHistoryDiagramAction.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/LoadHistoryDiagramAction.java (rev 0) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/LoadHistoryDiagramAction.java 2010-03-18 10:32:27 UTC (rev 1008) @@ -0,0 +1,80 @@ +/* + * 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.process; + +import java.util.List; + +import org.jboss.bpm.console.client.URLBuilder; +import org.jboss.bpm.console.client.common.AbstractRESTAction; +import org.jboss.bpm.console.client.model.ActiveNodeInfo; +import org.jboss.bpm.console.client.model.DTOParser; +import org.jboss.bpm.console.client.model.ProcessDefinitionRef; +import org.jboss.bpm.console.client.process.events.ActivityDiagramResultEvent; +import org.jboss.bpm.console.client.process.events.HistoryActivityDiagramEvent; + +import com.google.gwt.http.client.RequestBuilder; +import com.google.gwt.http.client.Response; +import com.mvc4g.client.Controller; + + +/** + * @author Maciej Swiderski <swiderski.maciej(a)gmail.com> + */ +public class LoadHistoryDiagramAction extends AbstractRESTAction +{ + public final static String ID = LoadHistoryDiagramAction.class.getName(); + + public String getId() + { + return ID; + } + + public String getUrl(Object event) + { + ProcessDefinitionRef inst = ((HistoryActivityDiagramEvent) event).getDefinition(); + return URLBuilder.getInstance().getDefinitionHistoryNodeInfoURL(inst.getId(), ((HistoryActivityDiagramEvent) event).getExecutedActivities()); + } + + public RequestBuilder.Method getRequestMethod() + { + return RequestBuilder.GET; + } + + public void handleSuccessfulResponse( + final Controller controller, final Object event, Response response) + { + ProcessDefinitionRef inst = ((HistoryActivityDiagramEvent) event).getDefinition(); + + List<ActiveNodeInfo> activeNodeInfos = DTOParser.parseActiveNodeInfo(response.getText()); + + // update view + ActivityDiagramView view = (ActivityDiagramView) controller.getView(ActivityDiagramView.ID); + view.update( + new ActivityDiagramResultEvent( + URLBuilder.getInstance().getProcessImageURL(inst.getId()), + activeNodeInfos + ) + ); + + } + +} Added: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/MergedProcessHistoryView.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/MergedProcessHistoryView.java (rev 0) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/MergedProcessHistoryView.java 2010-03-18 10:32:27 UTC (rev 1008) @@ -0,0 +1,70 @@ +package org.jboss.bpm.console.client.process; + +import org.gwt.mosaic.ui.client.layout.ColumnLayout; +import org.gwt.mosaic.ui.client.layout.ColumnLayoutData; +import org.gwt.mosaic.ui.client.layout.MosaicPanel; +import org.jboss.bpm.console.client.util.ConsoleLog; +import org.jboss.errai.workspaces.client.api.ProvisioningCallback; +import org.jboss.errai.workspaces.client.api.WidgetProvider; +import org.jboss.errai.workspaces.client.framework.Registry; + +import com.google.gwt.user.client.ui.Widget; +import com.mvc4g.client.Controller; + + +/** + * @author Maciej Swiderski <swiderski.maciej(a)gmail.com> + */ +public class MergedProcessHistoryView implements WidgetProvider +{ + MosaicPanel panel; + + DefinitionHistoryListView definitionView; + HistoryInstanceListView instanceView; + + public void provideWidget(ProvisioningCallback callback) + { + Controller controller = Registry.get(Controller.class); + + panel = new MosaicPanel(); + panel.setPadding(0); + + definitionView = new DefinitionHistoryListView(); + instanceView = new HistoryInstanceListView(); + + final MosaicPanel splitPanel = new MosaicPanel(new ColumnLayout()); + splitPanel.setPadding(0); + + definitionView.provideWidget(new ProvisioningCallback() + { + public void onSuccess(Widget instance) + { + splitPanel.add(instance, new ColumnLayoutData("250 px")); + } + + public void onUnavailable() + { + ConsoleLog.error("Failed to load DefinitionListView.class"); + } + }); + + instanceView.provideWidget( + new ProvisioningCallback() + { + public void onSuccess(Widget instance) + { + splitPanel.add(instance); + } + + public void onUnavailable() + { + ConsoleLog.error("Failed to load DefinitionListView.class"); + } + } + ); + + panel.add(splitPanel); + + callback.onSuccess(panel); + } +} Added: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessHistoryModule.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessHistoryModule.java (rev 0) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessHistoryModule.java 2010-03-18 10:32:27 UTC (rev 1008) @@ -0,0 +1,47 @@ +package org.jboss.bpm.console.client.process; + +import org.jboss.bpm.console.client.util.ConsoleLog; +import org.jboss.errai.workspaces.client.api.ProvisioningCallback; +import org.jboss.errai.workspaces.client.api.WidgetProvider; +import org.jboss.errai.workspaces.client.api.annotations.LoadTool; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.core.client.RunAsyncCallback; + + +/** + * @author Maciej Swiderski <swiderski.maciej(a)gmail.com> + */ +@LoadTool(name = "Process History", group = "Processes", icon = "processIcon", priority = 2) +public class ProcessHistoryModule implements WidgetProvider +{ + static MergedProcessHistoryView instance = null; + + public void provideWidget(final ProvisioningCallback callback) + { + ProcessHistoryModule.createInstance(callback); + } + + public static void createInstance(final ProvisioningCallback callback) + { + GWT.runAsync( + new RunAsyncCallback() + { + public void onFailure(Throwable err) + { + ConsoleLog.error("Failed to load tool", err); + } + + public void onSuccess() + { + if (instance == null) { + instance = new MergedProcessHistoryView(); + } + instance.provideWidget(callback); + } + } + + ); + + } +} Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessModule.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessModule.java 2010-03-12 15:44:56 UTC (rev 1007) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessModule.java 2010-03-18 10:32:27 UTC (rev 1008) @@ -28,7 +28,7 @@ import org.jboss.errai.workspaces.client.api.ProvisioningCallback; import org.jboss.errai.workspaces.client.api.annotations.LoadTool; -@LoadTool(name = "Process Overview", group = "Processes", icon = "processIcon") +@LoadTool(name = "Process Overview", group = "Processes", icon = "processIcon", priority = 1) public class ProcessModule implements WidgetProvider { static MergedProcessView instance = null; Added: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateHistoryDefinitionAction.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateHistoryDefinitionAction.java (rev 0) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateHistoryDefinitionAction.java 2010-03-18 10:32:27 UTC (rev 1008) @@ -0,0 +1,97 @@ +/* + * 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.process; + +import java.util.List; + +import com.mvc4g.client.ActionInterface; +import org.jboss.bpm.console.client.URLBuilder; +import org.jboss.bpm.console.client.common.AbstractRESTAction; +import org.jboss.bpm.console.client.model.HistoryProcessInstanceRef; +import org.jboss.bpm.console.client.model.JSOParser; +import org.jboss.bpm.console.client.model.ProcessDefinitionRef; +import org.jboss.bpm.console.client.util.ConsoleLog; + +import com.google.gwt.http.client.RequestBuilder; +import com.google.gwt.http.client.Response; +import com.google.gwt.http.client.RequestBuilder.Method; +import com.mvc4g.client.Controller; +import org.jboss.errai.bus.client.ErraiBus; +import org.jboss.errai.bus.client.api.Message; +import org.jboss.errai.bus.client.api.MessageCallback; +import org.jboss.errai.bus.client.api.base.MessageBuilder; +import org.jboss.errai.bus.client.framework.MessageBus; +import org.jboss.errai.bus.client.protocols.MessageParts; + + +/** + * @author Maciej Swiderski <swiderski.maciej(a)gmail.com> + */ +public class UpdateHistoryDefinitionAction implements ActionInterface +{ + + public final static String ID = UpdateHistoryDefinitionAction.class.getName(); + + private MessageBus bus = ErraiBus.get(); + + private Controller controller; + + public UpdateHistoryDefinitionAction() + { + bus.subscribe(ID, new MessageCallback() + { + public void callback(final Message message) + { + // Currently selected process definition + DefinitionHistoryListView definitionList = (DefinitionHistoryListView) + controller.getView(DefinitionHistoryListView.ID); + ProcessDefinitionRef selectedDefinition = definitionList.getSelection(); + assert selectedDefinition!=null; + + HistoryInstanceListView view = (HistoryInstanceListView) + controller.getView(HistoryInstanceListView.ID); + + if(view!=null) // may not be initialized (lazy) + { + List<HistoryProcessInstanceRef> results = message.get(List.class, "INSTANCE_LIST"); + view.update(selectedDefinition, results); + } + } + }); + } + + public void execute(Controller controller, Object o) + { + this.controller = controller; + + ProcessDefinitionRef def = (ProcessDefinitionRef)o; + + MessageBuilder.createMessage() + .toSubject("JBPM_HISTORY_SERVICE") + .command("GET_FINISHED_PROCESS_INSTANCES") + .with(MessageParts.ReplyTo, ID) + .with("PROCESS_DEFINITION_ID", def.getId()) + .noErrorHandling() + .sendNowWith(bus); + } + +} Added: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateHistoryDefinitionsAction.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateHistoryDefinitionsAction.java (rev 0) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateHistoryDefinitionsAction.java 2010-03-18 10:32:27 UTC (rev 1008) @@ -0,0 +1,82 @@ +/* + * 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.process; + +import com.google.gwt.http.client.RequestBuilder; +import com.google.gwt.http.client.Response; +import com.mvc4g.client.Controller; +import org.jboss.bpm.console.client.URLBuilder; +import org.jboss.bpm.console.client.common.AbstractRESTAction; +import org.jboss.bpm.console.client.common.DataDriven; +import org.jboss.bpm.console.client.model.JSOParser; +import org.jboss.bpm.console.client.model.ProcessDefinitionRef; +import org.jboss.bpm.console.client.util.ConsoleLog; + +import java.util.List; + +/** + * Loads a process definition list for a history instances + * and updates {@link org.jboss.bpm.console.client.process.DefinitionHistoryListView} + * + * @author Maciej Swiderski <swiderski.maciej(a)gmail.com> + */ +public class UpdateHistoryDefinitionsAction extends AbstractRESTAction +{ + public final static String ID = UpdateHistoryDefinitionsAction.class.getName(); + + public String getId() + { + return ID; + } + + public String getUrl(Object event) + { + return URLBuilder.getInstance().getProcessDefinitionsURL(); + } + + public RequestBuilder.Method getRequestMethod() + { + return RequestBuilder.GET; + } + + @Override + protected DataDriven getDataDriven(Controller controller) + { + return (DefinitionHistoryListView) controller.getView(DefinitionHistoryListView.ID); + } + + public void handleSuccessfulResponse(final Controller controller, final Object event, Response response) + { + long start = System.currentTimeMillis(); + + DefinitionHistoryListView view = (DefinitionHistoryListView) controller.getView(DefinitionHistoryListView.ID); + if(view!=null) // may not be initialized (lazy) + { + //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"); + + } + } +} \ No newline at end of file Added: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateHistoryInstanceAction.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateHistoryInstanceAction.java (rev 0) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateHistoryInstanceAction.java 2010-03-18 10:32:27 UTC (rev 1008) @@ -0,0 +1,114 @@ +/* + * 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.process; + +import java.util.List; + +import com.mvc4g.client.ActionInterface; +import org.jboss.bpm.console.client.URLBuilder; +import org.jboss.bpm.console.client.common.AbstractRESTAction; +import org.jboss.bpm.console.client.model.HistoryActivityInstanceRef; +import org.jboss.bpm.console.client.model.HistoryProcessInstanceRef; +import org.jboss.bpm.console.client.model.JSOParser; +import org.jboss.bpm.console.client.model.ProcessDefinitionRef; +import org.jboss.bpm.console.client.util.ConsoleLog; + +import com.google.gwt.http.client.RequestBuilder; +import com.google.gwt.http.client.Response; +import com.google.gwt.http.client.RequestBuilder.Method; +import com.mvc4g.client.Controller; +import org.jboss.errai.bus.client.ErraiBus; +import org.jboss.errai.bus.client.api.Message; +import org.jboss.errai.bus.client.api.MessageCallback; +import org.jboss.errai.bus.client.api.base.MessageBuilder; +import org.jboss.errai.bus.client.framework.MessageBus; +import org.jboss.errai.bus.client.protocols.MessageParts; + + +/** + * @author Maciej Swiderski <swiderski.maciej(a)gmail.com> + */ +public class UpdateHistoryInstanceAction implements ActionInterface +{ + + public final static String ID = UpdateHistoryInstanceAction.class.getName(); + + private MessageBus bus = ErraiBus.get(); + + private Controller controller; + + public UpdateHistoryInstanceAction() + { + bus.subscribe(ID, new MessageCallback() + { + public void callback(final Message message) + { + HistoryInstanceListView view = (HistoryInstanceListView) + controller.getView(HistoryInstanceListView.ID); + + if(view!=null) // may not be initialized (lazy) + { + List<HistoryActivityInstanceRef> records = (List<HistoryActivityInstanceRef>) + message.get(List.class, "HISTORY_RECORDS"); + view.update(records); + } + } + }); + } + + public void execute(Controller controller, Object o) + { + this.controller = controller; + + String instanceId = (String)o; + + MessageBuilder.createMessage() + .toSubject("JBPM_HISTORY_SERVICE") + .command("GET_PROCESS_INSTANCE_HISTORY") + .with(MessageParts.ReplyTo, ID) + .with("PROCESS_INSTANCE_ID", instanceId) + .noErrorHandling() + .sendNowWith(bus); + } + + /* + public void handleSuccessfulResponse(Controller controller, Object event, Response response) { + long start = System.currentTimeMillis(); + + HistoryInstanceListView view = (HistoryInstanceListView) controller.getView(HistoryInstanceListView.ID); + + if(view!=null) // may not be initialized (lazy) + { + + //JSONValue json = JSONParser.parse(response.getText()); + List<HistoryActivityInstanceRef> definitions = + JSOParser.parseProcessInstanceHistory(response.getText()); + + view.update(definitions); + + ConsoleLog.info("Loaded " + definitions.size() + " process instance history entries in " +(System.currentTimeMillis()-start)+" ms"); + + } + + } */ + +} Added: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/events/HistoryActivityDiagramEvent.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/events/HistoryActivityDiagramEvent.java (rev 0) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/events/HistoryActivityDiagramEvent.java 2010-03-18 10:32:27 UTC (rev 1008) @@ -0,0 +1,51 @@ +/* + * 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.process.events; + +import java.util.List; + +import org.jboss.bpm.console.client.model.ProcessDefinitionRef; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public class HistoryActivityDiagramEvent +{ + private ProcessDefinitionRef definition; + private List<String> executedActivities; + + public HistoryActivityDiagramEvent(ProcessDefinitionRef definition, List<String> executedActivities) + { + this.definition = definition; + this.executedActivities = executedActivities; + } + + public ProcessDefinitionRef getDefinition() + { + return definition; + } + + public List<String> getExecutedActivities() + { + return executedActivities; + } +} Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java 2010-03-12 15:44:56 UTC (rev 1007) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java 2010-03-18 10:32:27 UTC (rev 1008) @@ -23,8 +23,6 @@ import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; -import com.google.gwt.gen2.table.event.client.RowSelectionEvent; -import com.google.gwt.gen2.table.event.client.RowSelectionHandler; import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.ui.Button; import com.mvc4g.client.Controller; @@ -32,6 +30,8 @@ import org.gwt.mosaic.ui.client.ListBox; import org.gwt.mosaic.ui.client.MessageBox; import org.gwt.mosaic.ui.client.ToolBar; +import org.gwt.mosaic.ui.client.event.RowSelectionEvent; +import org.gwt.mosaic.ui.client.event.RowSelectionHandler; import org.gwt.mosaic.ui.client.layout.*; import org.gwt.mosaic.ui.client.list.DefaultListModel; import org.jboss.bpm.console.client.ApplicationContext; Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java 2010-03-12 15:44:56 UTC (rev 1007) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java 2010-03-18 10:32:27 UTC (rev 1008) @@ -23,8 +23,6 @@ import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; -import com.google.gwt.gen2.table.event.client.RowSelectionEvent; -import com.google.gwt.gen2.table.event.client.RowSelectionHandler; import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.ui.Button; import com.mvc4g.client.Controller; @@ -32,6 +30,8 @@ import org.gwt.mosaic.ui.client.ListBox; import org.gwt.mosaic.ui.client.MessageBox; import org.gwt.mosaic.ui.client.ToolBar; +import org.gwt.mosaic.ui.client.event.RowSelectionEvent; +import org.gwt.mosaic.ui.client.event.RowSelectionHandler; import org.gwt.mosaic.ui.client.layout.*; import org.gwt.mosaic.ui.client.list.DefaultListModel; import org.jboss.bpm.console.client.ApplicationContext; Added: bpm-console/trunk/gui/war/src/main/resources/jmaki/xhp/errai-proxy.json =================================================================== --- bpm-console/trunk/gui/war/src/main/resources/jmaki/xhp/errai-proxy.json (rev 0) +++ bpm-console/trunk/gui/war/src/main/resources/jmaki/xhp/errai-proxy.json 2010-03-18 10:32:27 UTC (rev 1008) @@ -0,0 +1,10 @@ +{"xhp": { + "version": "1.1", + "services": [ + {"id": "default", + "url":"http://127.0.0.1:8080/jbpm-console/in.erraiBus", + "passthrough":true + }, + ] + } +} \ No newline at end of file Modified: bpm-console/trunk/gui/war/war/WEB-INF/web.xml =================================================================== --- bpm-console/trunk/gui/war/war/WEB-INF/web.xml 2010-03-12 15:44:56 UTC (rev 1007) +++ bpm-console/trunk/gui/war/war/WEB-INF/web.xml 2010-03-18 10:32:27 UTC (rev 1008) @@ -12,6 +12,17 @@ </servlet> <servlet> + <servlet-name>erraiProxy</servlet-name> + <description>Errai Proxy</description> + <servlet-class>jmaki.xhp.XmlHttpProxyServlet</servlet-class> + <init-param> + <param-name>config.name</param-name> + <param-value>errai-proxy.json</param-value> + </init-param> + <load-on-startup>1</load-on-startup> + </servlet> + + <servlet> <servlet-name>ErraiServlet</servlet-name> <servlet-class>org.jboss.errai.bus.server.servlet.DefaultBlockingServlet</servlet-class> <load-on-startup>1</load-on-startup> @@ -22,10 +33,14 @@ <url-pattern>*.erraiBus</url-pattern> </servlet-mapping> - - <servlet-mapping> + <servlet-mapping> <servlet-name>xmlProxy</servlet-name> <url-pattern>/app/xhp/*</url-pattern> </servlet-mapping> + + <servlet-mapping> + <servlet-name>erraiProxy</servlet-name> + <url-pattern>/app/proxy/*</url-pattern> + </servlet-mapping> </web-app> \ No newline at end of file Modified: bpm-console/trunk/pom.xml =================================================================== --- bpm-console/trunk/pom.xml 2010-03-12 15:44:56 UTC (rev 1007) +++ bpm-console/trunk/pom.xml 2010-03-18 10:32:27 UTC (rev 1008) @@ -42,19 +42,22 @@ <gson.version>1.2.2</gson.version> <gwt.version>2.0.0</gwt.version> - <gwt.maven>1.2.0-11137</gwt.maven> - <gwt-log.version>3.0.0</gwt-log.version> + <gwt.maven>1.2.0-11137</gwt.maven> <jaf.version>1.1</jaf.version> <javax.ejb.version>3.0</javax.ejb.version> <javax.jaxb.version>2.1</javax.jaxb.version> <jboss.common.version>2.2.7.GA</jboss.common.version> <junit.version>3.8.1</junit.version> <mvc4g.version>1.0.0-jboss</mvc4g.version> - <mosaic.version>0.4.0-rc2</mosaic.version> +  <resteasy.version>1.0.2.GA</resteasy.version> <stax-api.version>1.0-2</stax-api.version> <report.server.version>1.2.0</report.server.version> - <errai.version>1.0.0</errai.version> + + <errai.version>1.1-SNAPSHOT</errai.version> + <mvel.version>2.0.17-SNAPSHOT</mvel.version> + <guice.version>2.0</guice.version> + <slf4j.version>1.5.2</slf4j.version> </properties> <modules> @@ -99,14 +102,8 @@ <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> <version>${gson.version}</version> - </dependency> + </dependency> <dependency> - <groupId>com.google.code.gwt-log</groupId> - <artifactId>gwt-log</artifactId> - <version>${gwt-log.version}</version> - </dependency> - - <dependency> <groupId>com.googlecode.mvc4g</groupId> <artifactId>mvc4g</artifactId> <version>${mvc4g.version}</version> @@ -114,7 +111,7 @@  - <dependency> +   <dependency> Deleted: bpm-console/trunk/server/integration/server-integration.iml =================================================================== --- bpm-console/trunk/server/integration/server-integration.iml 2010-03-12 15:44:56 UTC (rev 1007) +++ bpm-console/trunk/server/integration/server-integration.iml 2010-03-18 10:32:27 UTC (rev 1008) @@ -1,85 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module relativePaths="true" type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" inherit-compiler-output="true"> - <exclude-output /> - <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - <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> - <root url="jar://$MAVEN_REPOSITORY$/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1-sources.jar!/" /> - <root url="jar://$MAVEN_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: commons-logging:commons-logging:jar:1.1.1:provided"> - <CLASSES> - <root url="jar://$MAVEN_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: javax.ejb:ejb-api:jar:3.0:provided"> - <CLASSES> - <root url="jar://$MAVEN_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.google.code.gson:gson:jar:1.2.2:compile"> - <CLASSES> - <root url="jar://$MAVEN_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: javax.xml.stream:stax-api:jar:1.0-2:provided"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-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://$MAVEN_REPOSITORY$/javax/activation/activation/1.1/activation-1.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/javax/activation/activation/1.1/activation-1.1-sources.jar!/" /> - <root url="jar://$MAVEN_REPOSITORY$/javax/activation/activation/1.1/activation-1.1-sources.jar!/" /> - </SOURCES> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss.javaee:jboss-javaee:jar:5.0.0.GA:provided"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/jboss/javaee/jboss-javaee/5.0.0.GA/jboss-javaee-5.0.0.GA.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/jboss/javaee/jboss-javaee/5.0.0.GA/jboss-javaee-5.0.0.GA-sources.jar!/" /> - <root url="jar://$MAVEN_REPOSITORY$/org/jboss/javaee/jboss-javaee/5.0.0.GA/jboss-javaee-5.0.0.GA-sources.jar!/" /> - </SOURCES> - </library> - </orderEntry> - </component> -</module> - Modified: bpm-console/trunk/server/integration/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java =================================================================== --- bpm-console/trunk/server/integration/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java 2010-03-12 15:44:56 UTC (rev 1007) +++ bpm-console/trunk/server/integration/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java 2010-03-18 10:32:27 UTC (rev 1008) @@ -21,14 +21,14 @@ */ package org.jboss.bpm.console.server.integration; +import java.util.List; +import java.util.Map; + +import org.jboss.bpm.console.client.model.HistoryActivityInstanceRef; +import org.jboss.bpm.console.client.model.HistoryProcessInstanceRef; import org.jboss.bpm.console.client.model.ProcessDefinitionRef; import org.jboss.bpm.console.client.model.ProcessInstanceRef; -import org.jboss.bpm.console.client.model.ProcessInstanceRef.STATE; -import java.util.List; -import java.util.Map; -import java.io.InputStream; - /** * @author Heiko.Braun <heiko.braun(a)jboss.com> * @author Thomas.Diesler(a)jboss.com @@ -60,5 +60,9 @@ void setProcessState(String instanceId, ProcessInstanceRef.STATE nextState); void signalExecution(String executionId, String signal); + + List<HistoryActivityInstanceRef> getProcessInstanceHistory(String procesInstanceId); + + List<HistoryProcessInstanceRef> getFinishedProcessInstances(String definitionId); } Modified: bpm-console/trunk/server/integration/src/main/java/org/jboss/bpm/console/server/plugin/GraphViewerPlugin.java =================================================================== --- bpm-console/trunk/server/integration/src/main/java/org/jboss/bpm/console/server/plugin/GraphViewerPlugin.java 2010-03-12 15:44:56 UTC (rev 1007) +++ bpm-console/trunk/server/integration/src/main/java/org/jboss/bpm/console/server/plugin/GraphViewerPlugin.java 2010-03-18 10:32:27 UTC (rev 1008) @@ -47,4 +47,13 @@ * Can be null, in case no diagram is associated with the process */ URL getDiagramURL(String id); + + /** + * Collects node information (such as coordinates) for given processDefinitionId and selected activities. + * Both arguments must be specified. + * @param processDefinitionId process definition id which nodes information should be retrieved for + * @param activities list of activity names treated as a filter + * @return list of found node information. Can be empty list if no definition was found + */ + List<ActiveNodeInfo> getNodeInfoForActivities(String processDefinitionId, List<String> activities); } Deleted: bpm-console/trunk/server/war/server-war.iml =================================================================== --- bpm-console/trunk/server/war/server-war.iml 2010-03-12 15:44:56 UTC (rev 1007) +++ bpm-console/trunk/server/war/server-war.iml 2010-03-18 10:32:27 UTC (rev 1008) @@ -1,424 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module relativePaths="true" type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" inherit-compiler-output="true"> - <exclude-output /> - <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - <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> - <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-simple/1.5.2/slf4j-simple-1.5.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:provided"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1-sources.jar!/" /> - <root url="jar://$MAVEN_REPOSITORY$/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1-sources.jar!/" /> - </SOURCES> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: junit:junit:jar:3.8.1:test"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/junit/junit/3.8.1/junit-3.8.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: commons-logging:commons-logging:jar:1.1.1:compile"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: net.sf.json-lib:json-lib:jar:2.2.3:test"> - <CLASSES> - <root url="jar://$MAVEN_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"> - <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:provided"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.3:provided"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/gwt/gwt-user/1.5.3/gwt-user-1.5.3.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: javax.xml:jaxb-impl:jar:2.1:provided"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/javax/xml/jaxb-impl/2.1/jaxb-impl-2.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: commons-beanutils:commons-beanutils:jar:1.7.0:test"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar!/" /> - </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://$MAVEN_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: commons-fileupload:commons-fileupload:jar:1.2.1:compile"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/commons-fileupload/commons-fileupload/1.2.1/commons-fileupload-1.2.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: commons-io:commons-io:jar:1.3.2:compile"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/1.3.2/commons-io-1.3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.jboss.resteasy:resteasy-jaxrs:jar:1.0.2.GA:compile"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/jboss/resteasy/resteasy-jaxrs/1.0.2.GA/resteasy-jaxrs-1.0.2.GA.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: javax.annotation:jsr250-api:jar:1.0:compile"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.jboss.resteasy:resteasy-multipart-provider:jar:1.0.2.GA:compile"> - <CLASSES> - <root url="jar://$MAVEN_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"> - <library name="M2 Dep: javax.activation:activation:jar:1.1:provided"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/javax/activation/activation/1.1/activation-1.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/javax/activation/activation/1.1/activation-1.1-sources.jar!/" /> - <root url="jar://$MAVEN_REPOSITORY$/javax/activation/activation/1.1/activation-1.1-sources.jar!/" /> - </SOURCES> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: net.sf.ezmorph:ezmorph:jar:1.0.6:test"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/net/sf/ezmorph/ezmorph/1.0.6/ezmorph-1.0.6.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: commons-lang:commons-lang:jar:2.4:test"> - <CLASSES> - <root url="jar://$MAVEN_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: javax.ejb:ejb-api:jar:3.0:provided"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/javax/ejb/ejb-api/3.0/ejb-api-3.0.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.slf4j:slf4j-api:jar:1.5.2:compile"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: com.google.gwt:gwt-servlet:jar:1.5.3:runtime"> - <CLASSES> - <root url="jar://$MAVEN_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: javassist:javassist:jar:3.6.0.GA:compile"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/javassist/javassist/3.6.0.GA/javassist-3.6.0.GA.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://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.2/commons-collections-3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: com.google.code.gson:gson:jar:1.2.2:compile"> - <CLASSES> - <root url="jar://$MAVEN_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: org.jboss.resteasy:jaxrs-api:jar:1.0.2.GA:compile"> - <CLASSES> - <root url="jar://$MAVEN_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"> - <library name="M2 Dep: org.scannotation:scannotation:jar:1.0.2:compile"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/scannotation/scannotation/1.0.2/scannotation-1.0.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.slf4j:slf4j-log4j12:jar:1.5.2:compile"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-log4j12/1.5.2/slf4j-log4j12-1.5.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.birt:modelapi:jar:2.3.2:compile"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/birt/modelapi/2.3.2/modelapi-2.3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: commons-discovery:commons-discovery:jar:0.2:compile"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/commons-discovery/commons-discovery/0.2/commons-discovery-0.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.birt:dataadapterapi:jar:2.3.2:compile"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/birt/dataadapterapi/2.3.2/dataadapterapi-2.3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.birt:chartengineapi:jar:2.3.2:compile"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/birt/chartengineapi/2.3.2/chartengineapi-2.3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.emf:common:jar:2.4.0:compile"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/emf/common/2.4.0/common-2.4.0.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.emf:ecore-xmi:jar:2.4.1:compile"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/emf/ecore-xmi/2.4.1/ecore-xmi-2.4.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: commons-cli:commons-cli:jar:1.0:compile"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/commons-cli/commons-cli/1.0/commons-cli-1.0.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.birt:scriptapi:jar:2.3.2:compile"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/birt/scriptapi/2.3.2/scriptapi-2.3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.birt:engineapi:jar:2.3.2:compile"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/birt/engineapi/2.3.2/engineapi-2.3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.birt:dteapi:jar:2.3.2:compile"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/birt/dteapi/2.3.2/dteapi-2.3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: commons-codec:commons-codec:jar:1.3:compile"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.3/commons-codec-1.3.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.3/commons-codec-1.3-sources.jar!/" /> - </SOURCES> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.w3c:sac:jar:1.3:compile"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/w3c/sac/1.3/sac-1.3.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.birt:coreapi:jar:2.3.2:compile"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/birt/coreapi/2.3.2/coreapi-2.3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: rhino:js:jar:1.6R2:compile"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/rhino/js/1.6R2/js-1.6R2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: com.lowagie:itext:jar:1.3:compile"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/com/lowagie/itext/1.3/itext-1.3.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.emf:ecore:jar:2.4.2:compile"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/emf/ecore/2.4.2/ecore-2.4.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.w3c:flute:jar:1.2:compile"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/w3c/flute/1.2/flute-1.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: com.ibm.icu:icu4j:jar:3.8.1:compile"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/com/ibm/icu/icu4j/3.8.1/icu4j-3.8.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - </component> -</module> - Modified: bpm-console/trunk/server/war/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java =================================================================== --- bpm-console/trunk/server/war/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java 2010-03-12 15:44:56 UTC (rev 1007) +++ bpm-console/trunk/server/war/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java 2010-03-18 10:32:27 UTC (rev 1008) @@ -40,6 +40,7 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.Response; import java.net.URL; +import java.util.Arrays; import java.util.List; import java.util.Map; @@ -329,7 +330,54 @@ ); } + + @GET + @Path("instance/history/{id}") + @Produces("application/json") + public Response getInstanceHistoryJSON( + @PathParam("id") + String id) + { + List<HistoryActivityInstanceRef> historyEntries = getProcessManagement().getProcessInstanceHistory(id); + + return createJsonResponse(new HistoryActivityInstanceRefWrapper(historyEntries)); + + } + + @GET + @Path("definition/history/{id}") + @Produces("application/json") + public Response getFinishedProcessInstancesJSON( + @PathParam("id") + String id) + { + List<HistoryProcessInstanceRef> historyEntries = getProcessManagement().getFinishedProcessInstances(id); + + return createJsonResponse(new HistoryProcessInstanceRefWrapper(historyEntries)); + } + + @GET + @Path("definition/history/{id}/nodeInfo") + @Produces("application/json") + public Response getNodeInfoForActivities( + @PathParam("id") + String id, @QueryParam("activity") String[] activities) + { + + GraphViewerPlugin plugin = getGraphViewerPlugin(); + if(plugin !=null) + { + List<ActiveNodeInfo> info = plugin.getNodeInfoForActivities(id, Arrays.asList(activities)); + return createJsonResponse(info); + } + + throw new RuntimeException( + GraphViewerPlugin.class.getName()+ " not available." + ); + + } + private Response createJsonResponse(Object wrapper) { Gson gson = GsonFactory.createInstance(); Modified: bpm-console/trunk/shared/rpc/pom.xml =================================================================== --- bpm-console/trunk/shared/rpc/pom.xml 2010-03-12 15:44:56 UTC (rev 1007) +++ bpm-console/trunk/shared/rpc/pom.xml 2010-03-18 10:32:27 UTC (rev 1008) @@ -2,44 +2,54 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <name>JBoss BPM - Console::Shared::RPC</name> - <groupId>org.jboss.bpm</groupId> - <artifactId>gwt-console-rpc</artifactId> - <packaging>jar</packaging> + <modelVersion>4.0.0</modelVersion> + <name>JBoss BPM - Console::Shared::RPC</name> + <groupId>org.jboss.bpm</groupId> + <artifactId>gwt-console-rpc</artifactId> + <packaging>jar</packaging> -  - <parent> - <groupId>org.jboss.bpm</groupId> - <artifactId>gwt-console-shared</artifactId> - <version>2.0.2-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> +  + <parent> + <groupId>org.jboss.bpm</groupId> + <artifactId>gwt-console-shared</artifactId> + <version>2.0.2-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> - <dependencies> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-user</artifactId> - <version>${gwt.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - </dependency> - <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-user</artifactId> + <version>${gwt.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <scope>provided</scope> + </dependency> - <build> -  -  - </build> + <dependency> + <groupId>org.jboss.errai</groupId> + <artifactId>errai-common</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.errai</groupId> + <artifactId>errai-bus</artifactId> + </dependency> + + </dependencies> + + <build> +  +  + </build> </project> Deleted: bpm-console/trunk/shared/rpc/shared-rpc.iml =================================================================== --- bpm-console/trunk/shared/rpc/shared-rpc.iml 2010-03-12 15:44:56 UTC (rev 1007) +++ bpm-console/trunk/shared/rpc/shared-rpc.iml 2010-03-18 10:32:27 UTC (rev 1008) @@ -1,64 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module relativePaths="true" type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" inherit-compiler-output="true"> - <exclude-output /> - <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:provided"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1-sources.jar!/" /> - <root url="jar://$MAVEN_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: com.google.code.gson:gson:jar:1.2.2:compile"> - <CLASSES> - <root url="jar://$MAVEN_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: javax.xml.stream:stax-api:jar:1.0-2:provided"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.3:provided"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/gwt/gwt-user/1.5.3/gwt-user-1.5.3.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://$MAVEN_REPOSITORY$/javax/activation/activation/1.1/activation-1.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/javax/activation/activation/1.1/activation-1.1-sources.jar!/" /> - <root url="jar://$MAVEN_REPOSITORY$/javax/activation/activation/1.1/activation-1.1-sources.jar!/" /> - </SOURCES> - </library> - </orderEntry> - </component> -</module> - Added: bpm-console/trunk/shared/rpc/src/main/java/org/jboss/bpm/console/client/model/HistoryActivityInstanceRef.java =================================================================== --- bpm-console/trunk/shared/rpc/src/main/java/org/jboss/bpm/console/client/model/HistoryActivityInstanceRef.java (rev 0) +++ bpm-console/trunk/shared/rpc/src/main/java/org/jboss/bpm/console/client/model/HistoryActivityInstanceRef.java 2010-03-18 10:32:27 UTC (rev 1008) @@ -0,0 +1,62 @@ +package org.jboss.bpm.console.client.model; + +import org.jboss.errai.bus.server.annotations.ExposeEntity; + +import java.io.Serializable; +import java.util.Date; + +import javax.xml.bind.annotation.XmlRootElement; + +@XmlRootElement(name = "historyProcessInstance") +@ExposeEntity +public class HistoryActivityInstanceRef implements Serializable +{ + + private String activityName; + private Date startTime; + private Date endTime; + private String executionId; + private long duration; + + public String getActivityName() { + return activityName; + } + + public void setActivityName(String activityName) { + this.activityName = activityName; + } + + public Date getStartTime() { + return startTime; + } + + public void setStartTime(Date startTime) { + this.startTime = startTime; + } + + public Date getEndTime() { + return endTime; + } + + public void setEndTime(Date endTime) { + this.endTime = endTime; + } + + public String getExecutionId() { + return executionId; + } + + public void setExecutionId(String executionId) { + this.executionId = executionId; + } + + public long getDuration() { + return duration; + } + + public void setDuration(long duration) { + this.duration = duration; + } + + +} Added: bpm-console/trunk/shared/rpc/src/main/java/org/jboss/bpm/console/client/model/HistoryActivityInstanceRefWrapper.java =================================================================== --- bpm-console/trunk/shared/rpc/src/main/java/org/jboss/bpm/console/client/model/HistoryActivityInstanceRefWrapper.java (rev 0) +++ bpm-console/trunk/shared/rpc/src/main/java/org/jboss/bpm/console/client/model/HistoryActivityInstanceRefWrapper.java 2010-03-18 10:32:27 UTC (rev 1008) @@ -0,0 +1,37 @@ +package org.jboss.bpm.console.client.model; + +import java.util.List; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; + +@XmlRootElement(name = "wrapper") +public class HistoryActivityInstanceRefWrapper { + List<HistoryActivityInstanceRef> historyEntires; + + public HistoryActivityInstanceRefWrapper() + { + } + + public HistoryActivityInstanceRefWrapper(List<HistoryActivityInstanceRef> historyEntires) + { + this.historyEntires = historyEntires; + } + + @XmlElement + public List<HistoryActivityInstanceRef> getDefinitions() + { + return historyEntires; + } + + @XmlElement(name = "totalCount") + public int getTotalCount() + { + return historyEntires.size(); + } + + public void setDefinitions(List<HistoryActivityInstanceRef> historyEntires) + { + this.historyEntires = historyEntires; + } +} Added: bpm-console/trunk/shared/rpc/src/main/java/org/jboss/bpm/console/client/model/HistoryProcessInstanceRef.java =================================================================== --- bpm-console/trunk/shared/rpc/src/main/java/org/jboss/bpm/console/client/model/HistoryProcessInstanceRef.java (rev 0) +++ bpm-console/trunk/shared/rpc/src/main/java/org/jboss/bpm/console/client/model/HistoryProcessInstanceRef.java 2010-03-18 10:32:27 UTC (rev 1008) @@ -0,0 +1,90 @@ +package org.jboss.bpm.console.client.model; + +import org.jboss.errai.bus.server.annotations.ExposeEntity; + +import java.io.Serializable; +import java.util.Date; + +import javax.xml.bind.annotation.XmlRootElement; + +@XmlRootElement(name = "historyProcessInstance") +@ExposeEntity +public class HistoryProcessInstanceRef implements Serializable +{ + + + private String processInstanceId; + private String processDefinitionId; + private String key; + private String state; + private String endActivityName; + private Date startTime; + private Date endTime; + private long duration; + + public String getProcessInstanceId() { + return processInstanceId; + } + + public void setProcessInstanceId(String processInstanceId) { + this.processInstanceId = processInstanceId; + } + + public String getProcessDefinitionId() { + return processDefinitionId; + } + + public void setProcessDefinitionId(String processDefinitionId) { + this.processDefinitionId = processDefinitionId; + } + + public String getKey() { + return key; + } + + public void setKey(String key) { + this.key = key; + } + + public String getState() { + return state; + } + + public void setState(String state) { + this.state = state; + } + + public String getEndActivityName() { + return endActivityName; + } + + public void setEndActivityName(String endActivityName) { + this.endActivityName = endActivityName; + } + + public Date getStartTime() { + return startTime; + } + + public void setStartTime(Date startTime) { + this.startTime = startTime; + } + + public Date getEndTime() { + return endTime; + } + + public void setEndTime(Date endTime) { + this.endTime = endTime; + } + + public long getDuration() { + return duration; + } + + public void setDuration(long duration) { + this.duration = duration; + } + + +} Added: bpm-console/trunk/shared/rpc/src/main/java/org/jboss/bpm/console/client/model/HistoryProcessInstanceRefWrapper.java =================================================================== --- bpm-console/trunk/shared/rpc/src/main/java/org/jboss/bpm/console/client/model/HistoryProcessInstanceRefWrapper.java (rev 0) +++ bpm-console/trunk/shared/rpc/src/main/java/org/jboss/bpm/console/client/model/HistoryProcessInstanceRefWrapper.java 2010-03-18 10:32:27 UTC (rev 1008) @@ -0,0 +1,38 @@ +package org.jboss.bpm.console.client.model; + +import java.util.List; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; + +@XmlRootElement(name = "wrapper") +public class HistoryProcessInstanceRefWrapper { + List<HistoryProcessInstanceRef> historyEntires; + + public HistoryProcessInstanceRefWrapper() + { + } + + public HistoryProcessInstanceRefWrapper(List<HistoryProcessInstanceRef> historyEntires) + { + this.historyEntires = historyEntires; + } + + @XmlElement + public List<HistoryProcessInstanceRef> getDefinitions() + { + return historyEntires; + } + + @XmlElement(name = "totalCount") + public int getTotalCount() + { + return historyEntires.size(); + } + + public void setDefinitions(List<HistoryProcessInstanceRef> historyEntires) + { + this.historyEntires = historyEntires; + } + +} Added: bpm-console/trunk/shared/rpc/src/main/resources/ErraiApp.properties =================================================================== --- bpm-console/trunk/shared/rpc/src/main/resources/ErraiApp.properties (rev 0) +++ bpm-console/trunk/shared/rpc/src/main/resources/ErraiApp.properties 2010-03-18 10:32:27 UTC (rev 1008) @@ -0,0 +1 @@ +# errai marker file used for auto discovery \ No newline at end of file

14 years, 2 months

1
0
0 / 0

Overlord SVN: r1007 - in activity-monitor/trunk: gui/war/src/main/java/org/jboss/bpm/monitor/gui and 1 other directories.

by overlord-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2010-03-12 10:44:56 -0500 (Fri, 12 Mar 2010) New Revision: 1007 Added: activity-monitor/trunk/emu/src/main/java/org/jboss/bpm/monitor/emu/RefillStockProcess.java activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DefinitionHistoryView.java Removed: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/RecentActivityView.java Modified: activity-monitor/trunk/emu/src/main/java/org/jboss/bpm/monitor/emu/Emulation.java activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/App.gwt.xml activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/MonitorUI.java Log: Enable process selection and chart updates Modified: activity-monitor/trunk/emu/src/main/java/org/jboss/bpm/monitor/emu/Emulation.java =================================================================== --- activity-monitor/trunk/emu/src/main/java/org/jboss/bpm/monitor/emu/Emulation.java 2010-03-12 14:26:06 UTC (rev 1006) +++ activity-monitor/trunk/emu/src/main/java/org/jboss/bpm/monitor/emu/Emulation.java 2010-03-12 15:44:56 UTC (rev 1007) @@ -46,9 +46,9 @@ private boolean suspend = false; private EventHandler eventHandler; - /*private static Class[] processDefinitions = new Class[] { - OrderCheckoutProcess.class - };*/ + private static Class[] processDefinitions = new Class[] { + OrderCheckoutProcess.class, RefillStockProcess.class + }; public Emulation(EventHandler handler) { @@ -68,13 +68,14 @@ if(!suspend) { - OrderCheckoutProcess p = new OrderCheckoutProcess(); + Process p = Math.random()<0.8 ? new OrderCheckoutProcess() : new RefillStockProcess(); + ProcessRunnable process = new ProcessRunnable(p, eventHandler); try { pool.execute(process); - System.out.println("\tStart new process"); + System.out.println("\tStart new process: "+ p.getClass().getSimpleName()); } catch (RejectedExecutionException e) Added: activity-monitor/trunk/emu/src/main/java/org/jboss/bpm/monitor/emu/RefillStockProcess.java =================================================================== --- activity-monitor/trunk/emu/src/main/java/org/jboss/bpm/monitor/emu/RefillStockProcess.java (rev 0) +++ activity-monitor/trunk/emu/src/main/java/org/jboss/bpm/monitor/emu/RefillStockProcess.java 2010-03-12 15:44:56 UTC (rev 1007) @@ -0,0 +1,109 @@ +/* jboss.org */ +package org.jboss.bpm.monitor.emu; + +import java.util.UUID; + +/** + * @author: Heiko Braun <hbraun(a)redhat.com> + * @date: Mar 12, 2010 + */ +public class RefillStockProcess implements Process +{ + private final String correlationId; + + public enum Activity { + None, + CheckStock, + PlaceOrder, + VerifyReceit, + NotifyWarehouse, + Ended + }; + + private Activity current = Activity.None; + + private long start; + private long end; + + public RefillStockProcess() + { + this.correlationId = UUID.randomUUID().toString(); + } + + public String getName() + { + return getClass().getSimpleName(); + } + + public long getStarted() + { + return start; + } + + public long getEnded() + { + return end; + } + + public String getInstanceId() + { + return this.correlationId; + } + + public String getActivity() + { + return current.toString(); + } + + public String invoke() + { + Activity next = null; + + switch (current) + { + case None: + start = System.currentTimeMillis(); + next = Activity.CheckStock; + break; + case CheckStock: + next = Activity.PlaceOrder; + break; + case PlaceOrder: + next = Activity.VerifyReceit; + break; + case VerifyReceit: + next = Activity.NotifyWarehouse; + break; + case NotifyWarehouse: + next = Activity.Ended; + end = System.currentTimeMillis(); + break; + default: + throw new IllegalStateException("Unknown state "+ current); + } + + current = next; + return current.toString(); + } + + public boolean isActive() + { + return (current!=Activity.Ended && current!=Activity.None); + } + + public long getExectime() + { + if(0==start) + throw new IllegalArgumentException("No start time recorded"); + + return end - start; + } + + @Override + public String toString() + { + return "RefillStockProcess{" + + "activity=" + current + + '}'; + } +} \ No newline at end of file Modified: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/App.gwt.xml =================================================================== --- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/App.gwt.xml 2010-03-12 14:26:06 UTC (rev 1006) +++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/App.gwt.xml 2010-03-12 15:44:56 UTC (rev 1007) @@ -6,7 +6,7 @@ <inherits name="com.google.gwt.resources.Resources" /> <inherits name='org.timepedia.chronoscope.Chronoscope'/> - + <inherits name="org.jboss.errai.common.ErraiCommon"/> <inherits name="org.jboss.errai.bus.ErraiBus"/> <inherits name="org.jboss.errai.workspaces.ErraiWorkspaces" /> Copied: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DefinitionHistoryView.java (from rev 1006, activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/RecentActivityView.java) =================================================================== --- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DefinitionHistoryView.java (rev 0) +++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DefinitionHistoryView.java 2010-03-12 15:44:56 UTC (rev 1007) @@ -0,0 +1,134 @@ +/* jboss.org */ +package org.jboss.bpm.monitor.gui.client; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.event.dom.client.ChangeEvent; +import com.google.gwt.event.dom.client.ChangeHandler; +import com.google.gwt.user.client.ui.ListBox; +import org.gwt.mosaic.ui.client.layout.BoxLayout; +import org.gwt.mosaic.ui.client.layout.LayoutPanel; +import org.jboss.errai.bus.client.api.RemoteCallback; +import org.jboss.errai.bus.client.api.base.MessageBuilder; +import org.jboss.errai.workspaces.client.api.ProvisioningCallback; +import org.jboss.errai.workspaces.client.api.WidgetProvider; +import org.jboss.errai.workspaces.client.api.annotations.LoadTool; +import org.timepedia.chronoscope.client.Dataset; +import org.timepedia.chronoscope.client.Datasets; +import org.timepedia.chronoscope.client.browser.ChartPanel; +import org.timepedia.chronoscope.client.browser.Chronoscope; +import org.timepedia.chronoscope.client.browser.json.GwtJsonDataset; +import org.timepedia.chronoscope.client.browser.json.JsonDatasetJSO; +import org.timepedia.chronoscope.client.data.tuple.Tuple2D; + +import java.util.List; + +/** + * @author: Heiko Braun <hbraun(a)redhat.com> + * @date: Mar 11, 2010 + */ +@LoadTool(name="Process Activity", group = "History") +public class DefinitionHistoryView implements WidgetProvider +{ + + private static final String TIMEPEDIA_FONTBOOK_SERVICE = "http://api.timepedia.org/fr"; + + private static volatile double GOLDEN__RATIO = 1.618; + + private LayoutPanel panel; + private ListBox listBox; + private ChartPanel chartPanel; + + public void provideWidget(ProvisioningCallback callback) + { + panel = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL)); + + listBox = new ListBox(); + panel.add(listBox); + listBox.addItem("Select a process"); + listBox.addChangeHandler(new ChangeHandler() + { + public void onChange(ChangeEvent changeEvent) + { + ChartData rpcService = MessageBuilder.createCall( + new RemoteCallback<String>() + { + public void callback(String response) + { + renderChart(response); + } + }, + ChartData.class + ); + + if(listBox.getSelectedIndex()>0) + { + String processDefinitionID = listBox.getItemText(listBox.getSelectedIndex()); + rpcService.getDefinitionActivity(processDefinitionID, "Last 7 Days"); + } + } + }); + + loadDefinitions(); + + callback.onSuccess(panel); + } + + + private void loadDefinitions() + { + HistoryRecords rpcService = MessageBuilder.createCall( + new RemoteCallback<List<String>>() + { + + public void callback(List<String> response) + { + for(String s : response) + listBox.addItem(s); + } + }, + HistoryRecords.class + ); + + rpcService.getProcessDefinitionKeys(); + + } + + private void renderChart(String jsonData) + { + try + { + final Datasets<Tuple2D> datasets = new Datasets<Tuple2D>(); + datasets.add(MonitorUI.chronoscope.getDatasetReader().createDatasetFromJson( + new GwtJsonDataset(JSOModel.fromJson(jsonData))) + ); + Dataset[] dsArray = datasets.toArray(); + + // if exists remove. I don't know how to update at this point + if(chartPanel!=null) + panel.remove(chartPanel); + + initChartPanel(dsArray); + + panel.layout(); + } + catch (Exception e) + { + GWT.log("Failed to create chart", e); + } + } + + private void initChartPanel(Dataset[] datasets) + { + int chartWidth = 450; + int chartHeight = (int) (chartWidth / GOLDEN__RATIO); + + chartPanel = Chronoscope + .createTimeseriesChart(datasets, chartWidth, chartHeight); + + panel.add(chartPanel); + } + + private static native JsonDatasetJSO getJson(String varName) /*-{ + return $wnd[varName]; + }-*/; +} Modified: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/MonitorUI.java =================================================================== --- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/MonitorUI.java 2010-03-12 14:26:06 UTC (rev 1006) +++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/MonitorUI.java 2010-03-12 15:44:56 UTC (rev 1007) @@ -29,6 +29,8 @@ import org.jboss.errai.bus.client.ErraiBus; import org.jboss.errai.bus.client.api.base.MessageBuilder; import org.jboss.errai.bus.client.framework.MessageBus; +import org.timepedia.chronoscope.client.ChronoscopeOptions; +import org.timepedia.chronoscope.client.browser.Chronoscope; public class MonitorUI implements EntryPoint { @@ -37,7 +39,18 @@ */ private MessageBus bus = ErraiBus.get(); + public static Chronoscope chronoscope; + public void onModuleLoad() { - + + // Chronoscope.enableHistorySupport(true); + Chronoscope.setFontBookRendering(true); + ChronoscopeOptions.setErrorReporting(true); + Chronoscope.setMicroformatsEnabled(false); + Chronoscope.setShowCredits(false); + Chronoscope.initialize(); + + + chronoscope = Chronoscope.getInstance(); } } Deleted: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/RecentActivityView.java =================================================================== --- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/RecentActivityView.java 2010-03-12 14:26:06 UTC (rev 1006) +++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/RecentActivityView.java 2010-03-12 15:44:56 UTC (rev 1007) @@ -1,92 +0,0 @@ -/* jboss.org */ -package org.jboss.bpm.monitor.gui.client; - -import com.google.gwt.core.client.GWT; -import org.gwt.mosaic.ui.client.layout.LayoutPanel; -import org.jboss.errai.bus.client.api.RemoteCallback; -import org.jboss.errai.bus.client.api.base.MessageBuilder; -import org.jboss.errai.workspaces.client.api.ProvisioningCallback; -import org.jboss.errai.workspaces.client.api.WidgetProvider; -import org.jboss.errai.workspaces.client.api.annotations.LoadTool; -import org.timepedia.chronoscope.client.ChronoscopeOptions; -import org.timepedia.chronoscope.client.Dataset; -import org.timepedia.chronoscope.client.Datasets; -import org.timepedia.chronoscope.client.browser.ChartPanel; -import org.timepedia.chronoscope.client.browser.Chronoscope; -import org.timepedia.chronoscope.client.browser.json.GwtJsonDataset; -import org.timepedia.chronoscope.client.browser.json.JsonDatasetJSO; -import org.timepedia.chronoscope.client.data.tuple.Tuple2D; - -/** - * @author: Heiko Braun <hbraun(a)redhat.com> - * @date: Mar 11, 2010 - */ -@LoadTool(name="Recent Activity", group = "Process History") -public class RecentActivityView implements WidgetProvider -{ - - private static final String TIMEPEDIA_FONTBOOK_SERVICE = "http://api.timepedia.org/fr"; - - private static volatile double GOLDEN__RATIO = 1.618; - - private LayoutPanel panel; - - public void provideWidget(ProvisioningCallback callback) - { - panel = new LayoutPanel(); - - ChartData rpcService = MessageBuilder.createCall( - new RemoteCallback<String>() - { - public void callback(String response) - { - renderChart(response); - } - }, - ChartData.class - ); - - rpcService.getDefinitionActivity("OrderCheckoutProcess", "Last 7 Days"); - - callback.onSuccess(panel); - } - - private void renderChart(String jsonData) - { - // Chronoscope.enableHistorySupport(true); - Chronoscope.setFontBookRendering(true); - ChronoscopeOptions.setErrorReporting(true); - Chronoscope.setMicroformatsEnabled(false); - Chronoscope.setShowCredits(false); - Chronoscope.initialize(); - - Chronoscope chronoscope = Chronoscope.getInstance(); - - try - { - int chartWidth = 450; - int chartHeight = (int) (chartWidth / GOLDEN__RATIO); - - final Datasets<Tuple2D> datasets = new Datasets<Tuple2D>(); - datasets.add(chronoscope.getDatasetReader().createDatasetFromJson( - new GwtJsonDataset(JSOModel.fromJson(jsonData))) - ); - - Dataset[] dsArray = datasets.toArray(); - - final ChartPanel chartPanel = Chronoscope - .createTimeseriesChart(dsArray, chartWidth, chartHeight); - - panel.add(chartPanel); - } - catch (Exception e) - { - GWT.log("Failed to create chart", e); - } - - } - - private static native JsonDatasetJSO getJson(String varName) /*-{ - return $wnd[varName]; - }-*/; -}

14 years, 2 months

1
0
0 / 0

Overlord SVN: r1006 - in activity-monitor/trunk: gui/war/src/main/java/org/jboss/bpm/monitor/gui/client and 2 other directories.

by overlord-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2010-03-12 09:26:06 -0500 (Fri, 12 Mar 2010) New Revision: 1006 Added: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/ChartData.java activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/HistoryRecords.java activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/JSOModel.java activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/server/ChartDataService.java activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/server/HistoryRecordsService.java Removed: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/BPAFDataAccess.java activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/server/BPAFService.java Modified: activity-monitor/trunk/gui/war/pom.xml activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DebugPanel.java activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/RecentActivityView.java activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/metric/Timespan.java Log: First roundtrip chronoscope example Modified: activity-monitor/trunk/gui/war/pom.xml =================================================================== --- activity-monitor/trunk/gui/war/pom.xml 2010-03-12 13:06:43 UTC (rev 1005) +++ activity-monitor/trunk/gui/war/pom.xml 2010-03-12 14:26:06 UTC (rev 1006) @@ -27,7 +27,7 @@ <artifactId>activity-monitor-model</artifactId> <version>1.0.0-SNAPSHOT</version> </dependency> - +  <dependency> <groupId>org.jboss.errai</groupId> Deleted: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/BPAFDataAccess.java =================================================================== --- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/BPAFDataAccess.java 2010-03-12 13:06:43 UTC (rev 1005) +++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/BPAFDataAccess.java 2010-03-12 14:26:06 UTC (rev 1006) @@ -1,20 +0,0 @@ -/* jboss.org */ -package org.jboss.bpm.monitor.gui.client; - -import org.jboss.errai.bus.server.annotations.Remote; - -import java.util.List; - -/** - * @author: Heiko Braun <hbraun(a)redhat.com> - * @date: Mar 11, 2010 - */ -@Remote -public interface BPAFDataAccess -{ - List<String> getProcessDefinitionKeys(); - - List<String> getProcessInstanceKeys(String definitionKey); - - List<String> getActivityKeys(String instanceKey); -} Added: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/ChartData.java =================================================================== --- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/ChartData.java (rev 0) +++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/ChartData.java 2010-03-12 14:26:06 UTC (rev 1006) @@ -0,0 +1,15 @@ +/* jboss.org */ +package org.jboss.bpm.monitor.gui.client; + +import org.jboss.bpm.monitor.model.metric.Timespan; +import org.jboss.errai.bus.server.annotations.Remote; + +/** + * @author: Heiko Braun <hbraun(a)redhat.com> + * @date: Mar 12, 2010 + */ +@Remote +public interface ChartData +{ + String getDefinitionActivity(String processDefiniton, String timespanValue); +} Modified: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DebugPanel.java =================================================================== --- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DebugPanel.java 2010-03-12 13:06:43 UTC (rev 1005) +++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DebugPanel.java 2010-03-12 14:26:06 UTC (rev 1006) @@ -153,7 +153,7 @@ model.clear(); - BPAFDataAccess rpcService = MessageBuilder.createCall( + HistoryRecords rpcService = MessageBuilder.createCall( new RemoteCallback<List<String>>() { @@ -165,7 +165,7 @@ processDefinitions.layout(); } }, - BPAFDataAccess.class + HistoryRecords.class ); rpcService.getProcessDefinitionKeys(); @@ -179,7 +179,7 @@ model.clear(); - BPAFDataAccess rpcService = MessageBuilder.createCall( + HistoryRecords rpcService = MessageBuilder.createCall( new RemoteCallback<List<String>>() { @@ -191,7 +191,7 @@ processInstances.layout(); } }, - BPAFDataAccess.class + HistoryRecords.class ); rpcService.getProcessInstanceKeys( @@ -211,7 +211,7 @@ model.clear(); - BPAFDataAccess rpcService = MessageBuilder.createCall( + HistoryRecords rpcService = MessageBuilder.createCall( new RemoteCallback<List<String>>() { @@ -223,7 +223,7 @@ activities.layout(); } }, - BPAFDataAccess.class + HistoryRecords.class ); rpcService.getActivityKeys( Copied: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/HistoryRecords.java (from rev 1002, activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/BPAFDataAccess.java) =================================================================== --- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/HistoryRecords.java (rev 0) +++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/HistoryRecords.java 2010-03-12 14:26:06 UTC (rev 1006) @@ -0,0 +1,20 @@ +/* jboss.org */ +package org.jboss.bpm.monitor.gui.client; + +import org.jboss.errai.bus.server.annotations.Remote; + +import java.util.List; + +/** + * @author: Heiko Braun <hbraun(a)redhat.com> + * @date: Mar 11, 2010 + */ +@Remote +public interface HistoryRecords +{ + List<String> getProcessDefinitionKeys(); + + List<String> getProcessInstanceKeys(String definitionKey); + + List<String> getActivityKeys(String instanceKey); +} Added: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/JSOModel.java =================================================================== --- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/JSOModel.java (rev 0) +++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/JSOModel.java 2010-03-12 14:26:06 UTC (rev 1006) @@ -0,0 +1,20 @@ +/* jboss.org */ +package org.jboss.bpm.monitor.gui.client; + +import com.google.gwt.core.client.JavaScriptObject; + +/** + * @author: Heiko Braun <hbraun(a)redhat.com> + * @date: Mar 12, 2010 + */ +public class JSOModel extends JavaScriptObject +{ + protected JSOModel() + { + } + + public static native JSOModel fromJson(String jsonString) /*-{ + return eval('(' + jsonString + ')'); + }-*/; + +} Modified: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/RecentActivityView.java =================================================================== --- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/RecentActivityView.java 2010-03-12 13:06:43 UTC (rev 1005) +++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/RecentActivityView.java 2010-03-12 14:26:06 UTC (rev 1006) @@ -3,19 +3,19 @@ import com.google.gwt.core.client.GWT; import org.gwt.mosaic.ui.client.layout.LayoutPanel; +import org.jboss.errai.bus.client.api.RemoteCallback; +import org.jboss.errai.bus.client.api.base.MessageBuilder; import org.jboss.errai.workspaces.client.api.ProvisioningCallback; import org.jboss.errai.workspaces.client.api.WidgetProvider; import org.jboss.errai.workspaces.client.api.annotations.LoadTool; -import org.timepedia.chronoscope.client.*; +import org.timepedia.chronoscope.client.ChronoscopeOptions; +import org.timepedia.chronoscope.client.Dataset; +import org.timepedia.chronoscope.client.Datasets; import org.timepedia.chronoscope.client.browser.ChartPanel; import org.timepedia.chronoscope.client.browser.Chronoscope; import org.timepedia.chronoscope.client.browser.json.GwtJsonDataset; import org.timepedia.chronoscope.client.browser.json.JsonDatasetJSO; -import org.timepedia.chronoscope.client.canvas.View; -import org.timepedia.chronoscope.client.canvas.ViewReadyCallback; import org.timepedia.chronoscope.client.data.tuple.Tuple2D; -import org.timepedia.chronoscope.client.overlays.Marker; -import org.timepedia.chronoscope.client.overlays.OverlayClickListener; /** * @author: Heiko Braun <hbraun(a)redhat.com> @@ -35,64 +35,55 @@ { panel = new LayoutPanel(); + ChartData rpcService = MessageBuilder.createCall( + new RemoteCallback<String>() + { + public void callback(String response) + { + renderChart(response); + } + }, + ChartData.class + ); - try { - // You must specify the chart dimensions for now, rather than have the chart - // grow to fill its container - int chartWidth = 450; - int chartHeight = (int) (chartWidth / GOLDEN__RATIO); + rpcService.getDefinitionActivity("OrderCheckoutProcess", "Last 7 Days"); - // Chronoscope.enableHistorySupport(true); - Chronoscope.setFontBookRendering(true); - ChronoscopeOptions.setErrorReporting(true); - Chronoscope.setMicroformatsEnabled(false); - Chronoscope.setShowCredits(false); - Chronoscope.initialize(); + callback.onSuccess(panel); + } - Chronoscope chronoscope = Chronoscope.getInstance(); + private void renderChart(String jsonData) + { + // Chronoscope.enableHistorySupport(true); + Chronoscope.setFontBookRendering(true); + ChronoscopeOptions.setErrorReporting(true); + Chronoscope.setMicroformatsEnabled(false); + Chronoscope.setShowCredits(false); + Chronoscope.initialize(); + Chronoscope chronoscope = Chronoscope.getInstance(); + + try + { + int chartWidth = 450; + int chartHeight = (int) (chartWidth / GOLDEN__RATIO); + final Datasets<Tuple2D> datasets = new Datasets<Tuple2D>(); datasets.add(chronoscope.getDatasetReader().createDatasetFromJson( - new GwtJsonDataset(getJson("dataset"))) + new GwtJsonDataset(JSOModel.fromJson(jsonData))) ); - -// MockDatasetFactory datasetFactory = new MockDatasetFactory(); -// Dataset mockDataset = datasetFactory.getBasicDataset(); -// datasets.add(mockDataset); - Dataset[] dsArray = datasets.toArray(); final ChartPanel chartPanel = Chronoscope .createTimeseriesChart(dsArray, chartWidth, chartHeight); - - chartPanel.setReadyListener(new ViewReadyCallback() { - public void onViewReady(final View view) { - /*Dataset dataset = datasets.get(0); - final Marker m = new Marker( - dataset.getDomainExtrema().midpoint(), "A", 0); - m.addOverlayClickListener(new OverlayClickListener() { - public void onOverlayClick(Overlay overlay, int x, int y) { - m.openInfoWindow("Hello"); - } - }); - XYPlot plot = view.getChart().getPlot(); - //plot.setDatasetRenderer(1, new BarChartXYRenderer()); - plot.addOverlay(m); - plot.redraw();*/ - } - }); - panel.add(chartPanel); } catch (Exception e) { - GWT.log("Failed to create chart", e); + GWT.log("Failed to create chart", e); } - - callback.onSuccess(panel); } private static native JsonDatasetJSO getJson(String varName) /*-{ Deleted: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/server/BPAFService.java =================================================================== --- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/server/BPAFService.java 2010-03-12 13:06:43 UTC (rev 1005) +++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/server/BPAFService.java 2010-03-12 14:26:06 UTC (rev 1006) @@ -1,58 +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.monitor.gui.server; - -import org.jboss.bpm.monitor.gui.client.BPAFDataAccess; -import org.jboss.bpm.monitor.model.BPAFDataSource; -import org.jboss.bpm.monitor.model.DefaultBPAFDataSource; -import org.jboss.errai.bus.client.api.Message; -import org.jboss.errai.bus.client.api.MessageCallback; -import org.jboss.errai.bus.server.annotations.Service; - -import java.util.ArrayList; -import java.util.List; - -@Service -public class BPAFService implements BPAFDataAccess -{ - BPAFDataSource dataSource; - - public BPAFService() - { - this.dataSource = new DefaultBPAFDataSource(); - } - - public List<String> getProcessDefinitionKeys() - { - return dataSource.getProcessDefinitions(); - } - - public List<String> getProcessInstanceKeys(String definition) - { - return dataSource.getProcessInstances(definition); - } - - public List<String> getActivityKeys(String instance) - { - return dataSource.getActivityDefinitions(instance); - } -} Added: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/server/ChartDataService.java =================================================================== --- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/server/ChartDataService.java (rev 0) +++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/server/ChartDataService.java 2010-03-12 14:26:06 UTC (rev 1006) @@ -0,0 +1,74 @@ +/* jboss.org */ +package org.jboss.bpm.monitor.gui.server; + +import org.jboss.bpm.monitor.gui.client.ChartData; +import org.jboss.bpm.monitor.model.BPAFDataSource; +import org.jboss.bpm.monitor.model.DefaultBPAFDataSource; +import org.jboss.bpm.monitor.model.bpaf.Event; +import org.jboss.bpm.monitor.model.json.XYDataSetJSO; +import org.jboss.bpm.monitor.model.metric.Grouping; +import org.jboss.bpm.monitor.model.metric.Timespan; +import org.jboss.errai.bus.server.annotations.Service; + +import java.util.*; + +/** + * Turn history records into JSON data that can be consumed by the chart renderer. + * @author: Heiko Braun <hbraun(a)redhat.com> + * @date: Mar 12, 2010 + */ +@Service +public class ChartDataService implements ChartData +{ + + BPAFDataSource dataSource; + + public ChartDataService() + { + this.dataSource = new DefaultBPAFDataSource(); + } + + /** + * Delegates to {@link org.jboss.bpm.monitor.model.BPAFDataSource#getDefinitionEvents(String, org.jboss.bpm.monitor.model.metric.Timespan)} + * @param processDefiniton a processDefinitionID + * @param timespanValue a timespan string identifier + * @return JSON data + */ + public String getDefinitionActivity(String processDefiniton, String timespanValue) + { + final Timespan timespan = Timespan.fromValue(timespanValue); + + List<Event> events = dataSource.getDefinitionEvents(processDefiniton, timespan); + + SortedMap<Date, List<Event>> grouped; + + switch (timespan.getUnit()) + { + case DAY: + grouped = Grouping.byDay(events, timespan); + break; + default: + throw new IllegalArgumentException("UNIT not supported: "+timespan.getUnit()); + + } + + XYDataSetJSO dataSet = new XYDataSetJSO( + "Process Instances "+timespan.getTitle(), + UUID.randomUUID().toString() + ); + + List<Long> domainData = new ArrayList<Long>(grouped.size()); + List<Long> rangeData = new ArrayList<Long>(grouped.size()); + for(Date d : grouped.keySet()) + { + domainData.add(d.getTime()); + rangeData.add(new Integer(grouped.get(d).size()).longValue()); + } + + dataSet.getDomain().add(domainData); + dataSet.getRange().add(rangeData); + dataSet.setAxis("date"); + + return dataSet.toJSO(); + } +} Copied: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/server/HistoryRecordsService.java (from rev 1002, activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/server/BPAFService.java) =================================================================== --- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/server/HistoryRecordsService.java (rev 0) +++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/server/HistoryRecordsService.java 2010-03-12 14:26:06 UTC (rev 1006) @@ -0,0 +1,55 @@ +/* + * 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.monitor.gui.server; + +import org.jboss.bpm.monitor.gui.client.HistoryRecords; +import org.jboss.bpm.monitor.model.BPAFDataSource; +import org.jboss.bpm.monitor.model.DefaultBPAFDataSource; +import org.jboss.errai.bus.server.annotations.Service; + +import java.util.List; + +@Service +public class HistoryRecordsService implements HistoryRecords +{ + BPAFDataSource dataSource; + + public HistoryRecordsService() + { + this.dataSource = new DefaultBPAFDataSource(); + } + + public List<String> getProcessDefinitionKeys() + { + return dataSource.getProcessDefinitions(); + } + + public List<String> getProcessInstanceKeys(String definition) + { + return dataSource.getProcessInstances(definition); + } + + public List<String> getActivityKeys(String instance) + { + return dataSource.getActivityDefinitions(instance); + } +} Modified: activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/metric/Timespan.java =================================================================== --- activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/metric/Timespan.java 2010-03-12 13:06:43 UTC (rev 1005) +++ activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/metric/Timespan.java 2010-03-12 14:26:06 UTC (rev 1006) @@ -15,16 +15,30 @@ { private long start; private long end; + + public static final String LAST_24_HOURS = "Last 24 Hours"; + public static final String LAST_DAY = "Last Day"; + public static final String LAST_7_DAYS = "Last 7 Days"; + public static final String LAST_WEEK = "Last Week"; + public static final String LAST_4_WEEKS = "Last 4 Weeks"; + public static final String LAST_MONTH = "Last Month"; + public static final String LAST_3_MONTH = "Last 3 Month"; + public static final String LAST_QUARTER = "Last Quarter"; + public static final String LAST_12_MONTH = "Last 12 Month"; + public static final String LAST_YEAR = "Last Year"; public enum UNIT {HOUR, DAY, WEEK, MONTH, YEAR } private UNIT unit; + + private String title; - public Timespan(long start, long end, UNIT unit) + public Timespan(long start, long end, UNIT unit, String title) { this.start = start; this.end = end; this.unit = unit; + this.title = title; } public long getStart() @@ -42,6 +56,11 @@ return unit; } + public String getTitle() + { + return title; + } + public String toString() { return "Timespan{ "+new Date(start)+" - "+new Date(end)+" }"; @@ -57,7 +76,7 @@ cal.roll(Calendar.DAY_OF_YEAR, -1); long t0 = cal.getTimeInMillis(); - return new Timespan(t0, t1, UNIT.HOUR); + return new Timespan(t0, t1, UNIT.HOUR, LAST_24_HOURS); } public static Timespan lastDay() @@ -75,7 +94,7 @@ cal.set(Calendar.SECOND, 0); long t0 = cal.getTimeInMillis(); - return new Timespan(t0, t1, UNIT.HOUR); + return new Timespan(t0, t1, UNIT.HOUR, LAST_DAY); } public static Timespan last7Days() @@ -86,7 +105,7 @@ cal.roll(Calendar.DAY_OF_YEAR, -7); long t0 = cal.getTimeInMillis(); - return new Timespan(t0, t1, UNIT.DAY); + return new Timespan(t0, t1, UNIT.DAY, LAST_7_DAYS); } public static Timespan lastWeek() @@ -107,7 +126,7 @@ cal.set(Calendar.SECOND, 0); long t0 = cal.getTimeInMillis(); - return new Timespan(t0, t1, UNIT.DAY); + return new Timespan(t0, t1, UNIT.DAY, LAST_WEEK); } public static Timespan last4Weeks() @@ -118,7 +137,7 @@ cal.roll(Calendar.WEEK_OF_YEAR, -4); long t0 = cal.getTimeInMillis(); - return new Timespan(t0, t1, UNIT.DAY); + return new Timespan(t0, t1, UNIT.DAY, LAST_4_WEEKS); } public static Timespan lastMonth() @@ -139,7 +158,7 @@ cal.set(Calendar.SECOND, 0); long t0 = cal.getTimeInMillis(); - return new Timespan(t0, t1, UNIT.DAY); + return new Timespan(t0, t1, UNIT.DAY, LAST_MONTH); } @@ -151,7 +170,7 @@ cal.roll(Calendar.MONTH, -3); long t0 = cal.getTimeInMillis(); - return new Timespan(t0, t1, UNIT.WEEK); + return new Timespan(t0, t1, UNIT.WEEK, LAST_3_MONTH); } public static Timespan lastQuarter() @@ -182,7 +201,7 @@ cal.set(Calendar.SECOND, 0); long t0 = cal.getTimeInMillis(); - return new Timespan(t0, t1, UNIT.WEEK); + return new Timespan(t0, t1, UNIT.WEEK, LAST_QUARTER); } @@ -194,7 +213,7 @@ cal.roll(Calendar.YEAR, -1); long t0 = cal.getTimeInMillis(); - return new Timespan(t0, t1, UNIT.MONTH); + return new Timespan(t0, t1, UNIT.MONTH, LAST_12_MONTH); } public static Timespan lastYear() @@ -217,6 +236,37 @@ cal.set(Calendar.SECOND, 0); long t0 = cal.getTimeInMillis(); - return new Timespan(t0, t1, UNIT.MONTH); + return new Timespan(t0, t1, UNIT.MONTH, LAST_YEAR); } + + public static Timespan fromValue(String value) + { + Timespan t = null; + + if(LAST_24_HOURS.equals(value)) + t = last24Hours(); + else if(LAST_DAY.equals(value)) + t =lastDay(); + else if(LAST_7_DAYS.equals(value)) + t =last7Days(); + else if(LAST_WEEK.equals(value)) + t =lastWeek(); + else if(LAST_4_WEEKS.equals(value)) + t =last4Weeks(); + else if(LAST_MONTH.equals(value)) + t =lastMonth(); + else if(LAST_3_MONTH.equals(value)) + t =last3Month(); + else if(LAST_QUARTER.equals(value)) + t =lastQuarter(); + else if(LAST_12_MONTH.equals(value)) + t =last12Month(); + else if(LAST_YEAR.equals(value)) + t =lastYear(); + + if(null==t) + throw new IllegalArgumentException("Unknown value: "+value); + + return t; + } }

14 years, 2 months

1
0
0 / 0

Overlord SVN: r1005 - in activity-monitor/trunk: gui/war/src/main/java/org/jboss/bpm/monitor/gui/public and 1 other directories.

by overlord-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2010-03-12 08:06:43 -0500 (Fri, 12 Mar 2010) New Revision: 1005 Modified: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/RecentActivityView.java activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/public/dataset.js activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/json/XYDataSetJSO.java Log: fix creation of JSON datasets Modified: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/RecentActivityView.java =================================================================== --- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/RecentActivityView.java 2010-03-12 11:41:27 UTC (rev 1004) +++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/RecentActivityView.java 2010-03-12 13:06:43 UTC (rev 1005) @@ -45,7 +45,8 @@ // Chronoscope.enableHistorySupport(true); Chronoscope.setFontBookRendering(true); ChronoscopeOptions.setErrorReporting(true); - Chronoscope.setMicroformatsEnabled(true); + Chronoscope.setMicroformatsEnabled(false); + Chronoscope.setShowCredits(false); Chronoscope.initialize(); Chronoscope chronoscope = Chronoscope.getInstance(); @@ -64,7 +65,7 @@ final ChartPanel chartPanel = Chronoscope .createTimeseriesChart(dsArray, chartWidth, chartHeight); - + chartPanel.setReadyListener(new ViewReadyCallback() { public void onViewReady(final View view) { /*Dataset dataset = datasets.get(0); Modified: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/public/dataset.js =================================================================== --- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/public/dataset.js 2010-03-12 11:41:27 UTC (rev 1004) +++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/public/dataset.js 2010-03-12 13:06:43 UTC (rev 1005) @@ -1,8 +1 @@ -var dataset = { -"id": "OrderCheckoutProcess", -"preferredRenderer": "line", -"domain": [1267787761970,1267874161970,1267960561970,1268046961970,1268133361970,1268219761970,1268306161970], -"range": [0,0,0,0,8,26,82], -"label": "Process Instances last 7 days", -"axis": "unit" -} +var dataset = {"id":"OrderCheckoutProcess","preferredRenderer": "line","domain": [1267789794540,1267876194540,1267962594540,1268048994540,1268135394540,1268221794540,1268308194540],"range" :[0,0,0,0,8,26,82],"label":"Process Instances last 7 days","axis":"Unit"} Modified: activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/json/XYDataSetJSO.java =================================================================== --- activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/json/XYDataSetJSO.java 2010-03-12 11:41:27 UTC (rev 1004) +++ activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/json/XYDataSetJSO.java 2010-03-12 13:06:43 UTC (rev 1005) @@ -11,17 +11,13 @@ public class XYDataSetJSO { /* - dataset = { - id: "unique id for this dataset", - mipped: true, - domain: [ [level 0 values], [level 1 values], ... ], => [UTCTimeInMilliseconds_1, UTCtimeInMilliseconds_2, ...] - range: [ [level 0 values], [level 1 values], ... ], - rangeBottom: min over level 0 values, - rangeTop: max over level 0 values, + dataset = { + Id: "unique id for this dataset", + domain: [ UTCTimeInMilliseconds_1, UTCtimeInMilliseconds_2, ... ], + range: [ Value_1, Value_2, ... ], label: "default label for this dataset", - axis: "an axis identifier (usually units). Datasets with like axis ids - share the same range Axis" - } + axis: "unit" +} */ String id; @@ -117,58 +113,46 @@ public String toJSO() { - /* - dataset = { - id: "unique id for this dataset", - mipped: true, - domain: [ [level 0 values], [level 1 values], ... ], - range: [ [level 0 values], [level 1 values], ... ], - rangeBottom: min over level 0 values, - rangeTop: max over level 0 values, - label: "default label for this dataset", - axis: "an axis identifier (usually units). Datasets with like axis ids - share the same range Axis" - }*/ - - + StringBuffer sb = new StringBuffer("{"); - sb.append("id:\"").append(id).append("\","); - sb.append("mipped:").append(Boolean.valueOf(mipped).toString()).append(","); + sb.append("\"id\":\"").append(id).append("\","); + sb.append("\"preferredRenderer\": \"line\","); + //sb.append("mipped:").append(Boolean.valueOf(mipped).toString()).append(","); - sb.append("domain:["); + sb.append("\"domain\": ["); int idx = 1; for(List<Long> list : domain) { - sb.append("["); + if(domain.size()>1)sb.append("["); for(Long d : list) { sb.append(d); if(idx<list.size()) sb.append(","); idx++; } - sb.append("]"); + if(domain.size()>1)sb.append("]"); } sb.append("],"); - sb.append("range:["); + sb.append("\"range\" :["); idx = 1; for(List<Long> list : range) { - sb.append("["); + if(range.size()>1)sb.append("["); for(Long d : list) { sb.append(d); if(idx<list.size()) sb.append(","); idx++; } - sb.append("]"); + if(range.size()>1)sb.append("]"); } sb.append("],"); - sb.append("rangeBottom:").append(rangeBottom).append(","); - sb.append("rangeTop:").append(rangeTop).append(","); - sb.append("label:\"").append(label).append("\","); - sb.append("axis:\"").append(label).append("\""); + //sb.append("\"rangeBottom\" :").append(rangeBottom).append(","); + //sb.append("\"rangeTop:\"").append(rangeTop).append(","); + sb.append("\"label\":\"").append(label).append("\","); + sb.append("\"axis\":\"").append("Unit").append("\""); sb.append("}"); return sb.toString(); }

14 years, 2 months

1
0
0 / 0

Overlord SVN: r1004 - in activity-monitor/trunk: gui/war/src/main/java/org/jboss/bpm/monitor/gui/client and 5 other directories.

by overlord-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2010-03-12 06:41:27 -0500 (Fri, 12 Mar 2010) New Revision: 1004 Added: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/public/ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/public/dataset.js activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/public/dataset2.js activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/metric/Grouping.java Modified: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/App.gwt.xml activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/RecentActivityView.java activity-monitor/trunk/gui/war/war/App.html activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/DefaultBPAFDataSource.java activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/json/JsonExport.java activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/json/XYDataSetJSO.java Log: First working chart impl Modified: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/App.gwt.xml =================================================================== --- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/App.gwt.xml 2010-03-12 09:50:59 UTC (rev 1003) +++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/App.gwt.xml 2010-03-12 11:41:27 UTC (rev 1004) @@ -5,12 +5,12 @@ <inherits name="com.google.gwt.uibinder.UiBinder"/> <inherits name="com.google.gwt.resources.Resources" /> + <inherits name='org.timepedia.chronoscope.Chronoscope'/> + <inherits name="org.jboss.errai.common.ErraiCommon"/> <inherits name="org.jboss.errai.bus.ErraiBus"/> <inherits name="org.jboss.errai.workspaces.ErraiWorkspaces" /> - <inherits name='org.timepedia.chronoscope.Chronoscope'/> - <entry-point class='org.jboss.bpm.monitor.gui.client.MonitorUI'/> </module> \ No newline at end of file Modified: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/RecentActivityView.java =================================================================== --- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/RecentActivityView.java 2010-03-12 09:50:59 UTC (rev 1003) +++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/RecentActivityView.java 2010-03-12 11:41:27 UTC (rev 1004) @@ -1,6 +1,7 @@ /* jboss.org */ package org.jboss.bpm.monitor.gui.client; +import com.google.gwt.core.client.GWT; import org.gwt.mosaic.ui.client.layout.LayoutPanel; import org.jboss.errai.workspaces.client.api.ProvisioningCallback; import org.jboss.errai.workspaces.client.api.WidgetProvider; @@ -51,12 +52,10 @@ final Datasets<Tuple2D> datasets = new Datasets<Tuple2D>(); datasets.add(chronoscope.getDatasetReader().createDatasetFromJson( - new GwtJsonDataset(getJson("interestRates01"))) + new GwtJsonDataset(getJson("dataset"))) ); - datasets.add(chronoscope.getDatasetReader().createDatasetFromJson( - new GwtJsonDataset(getJson("interestRates02"))) - ); + // MockDatasetFactory datasetFactory = new MockDatasetFactory(); // Dataset mockDataset = datasetFactory.getBasicDataset(); // datasets.add(mockDataset); @@ -68,7 +67,7 @@ chartPanel.setReadyListener(new ViewReadyCallback() { public void onViewReady(final View view) { - Dataset dataset = datasets.get(0); + /*Dataset dataset = datasets.get(0); final Marker m = new Marker( dataset.getDomainExtrema().midpoint(), "A", 0); m.addOverlayClickListener(new OverlayClickListener() { @@ -80,13 +79,15 @@ XYPlot plot = view.getChart().getPlot(); //plot.setDatasetRenderer(1, new BarChartXYRenderer()); plot.addOverlay(m); - plot.redraw(); + plot.redraw();*/ } }); + panel.add(chartPanel); } catch (Exception e) { + GWT.log("Failed to create chart", e); } Added: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/public/dataset.js =================================================================== --- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/public/dataset.js (rev 0) +++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/public/dataset.js 2010-03-12 11:41:27 UTC (rev 1004) @@ -0,0 +1,8 @@ +var dataset = { +"id": "OrderCheckoutProcess", +"preferredRenderer": "line", +"domain": [1267787761970,1267874161970,1267960561970,1268046961970,1268133361970,1268219761970,1268306161970], +"range": [0,0,0,0,8,26,82], +"label": "Process Instances last 7 days", +"axis": "unit" +} Added: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/public/dataset2.js =================================================================== --- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/public/dataset2.js (rev 0) +++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/public/dataset2.js 2010-03-12 11:41:27 UTC (rev 1004) @@ -0,0 +1,9 @@ +var dataset = { +"id": "unrate", +"domainscale": 1000, +"preferredRenderer": "line", +"domain": [-694306739,-691628339,-689122739,-686444339,-683852339,-681173939,-678581939,-675903539,-673225139,-670633139,-667954739,-665362739,-662684339,-660005939,-657586739,-654908339,-652316339,-649637939,-647045939,-644367539,-641689139,-639097139,-636418739,-633826739,-631148339,-628469939,-626050739,-623372339,-620780339,-618101939,-615509939,-612831539,-610153139,-607561139,-604882739,-602290739,-599612339,-596933939,-594514739,-591836339,-589244339,-586565939,-583973939,-581295539,-578617139,-576025139,-573346739,-570754739,-568076339,-565397939,-562892339,-560213939,-557621939,-554943539,-552351539,-549673139,-546994739,-544402739,-541724339,-539132339,-536453939,-533775539,-531356339,-528677939,-526085939,-523407539,-520815539,-518137139,-515458739,-512866739,-510188339,-507596339,-504917939,-502239539,-499820339,-497141939,-494549939,-491871539,-489279539,-486601139,-483922739,-481330739,-478652339,-476060339,-473381939,-470703539,-468284339,-465605939,-46301393! 9,-460335539,-457743539,-455065139,-452386739,-449794739,-447116339,-444524339,-441845939,-439167539,-436661939,-433983539,-431391539,-428713139,-426121139,-423442739,-420764339,-418172339,-415493939,-412901939,-410223539,-407545139,-405125939,-402447539,-399855539,-397177139,-394585139,-391906739,-389228339,-386636339,-383957939,-381365939,-378687539,-376009139,-373589939,-370911539,-368319539,-365641139,-363049139,-360370739,-357692339,-355100339,-352421939,-349829939,-347151539,-344473139,-342053939,-339375539,-336783539,-334105139,-331513139,-328834739,-326156339,-323564339,-320885939,-318293939,-315615539,-312937139,-310431539,-307753139,-305161139,-302482739,-299890739,-297212339,-294533939,-291941939,-289263539,-286671539,-283993139,-281314739,-278895539,-276217139,-273625139,-270946739,-268354739,-265676339,-262997939,-260405939,-257727539,-255135539,-252457139,-249778739,-247359539,-244681139,-242089139,-239410739,-236818739,-234140339,-231461939,-228869939,-226191! 539,-223599539,-220921139,-218242739,-215823539,-213145139,-21! 0553139, -207874739,-205282739,-202604339,-199925939,-197333939,-194655539,-192063539,-189385139,-186706739,-184201139,-181522739,-178930739,-176252339,-173660339,-170981939,-168303539,-165711539,-163033139,-160441139,-157762739,-155084339,-152665139,-149986739,-147394739,-144716339,-142124339,-139445939,-136767539,-134175539,-131497139,-128905139,-126226739,-123548339,-121129139,-118450739,-115858739,-113180339,-110588339,-107909939,-105231539,-102639539,-99961139,-97369139,-94690739,-92012339,-89593139,-86914739,-84322739,-81644339,-79052339,-76373939,-73695539,-71103539,-68425139,-65833139,-63154739,-60476339,-57970739,-55292339,-52700339,-50021939,-47429939,-44751539,-42073139,-39481139,-36802739,-34210739,-31532339,-28853939,-26434739,-23756339,-21164339,-18485939,-15893939,-13215539,-10537139,-7945139,-5266739,-2674739,3661,2682061,5101261,7779661,10371661,13050061,15642061,18320461,20998861,23590861,26269261,28861261,31539661,34218061,36637261,39315661,41907661,44586061,471780! 61,49856461,52534861,55126861,57805261,60397261,63075661,65754061,68259661,70938061,73530061,76208461,78800461,81478861,84157261,86749261,89427661,92019661,94698061,97376461,99795661,102474061,105066061,107744461,110336461,113014861,115693261,118285261,120963661,123555661,126234061,128912461,131331661,134010061,136602061,139280461,141872461,144550861,147229261,149821261,152499661,155091661,157770061,160448461,162867661,165546061,168138061,170816461,173408461,176086861,178765261,181357261,184035661,186627661,189306061,191984461,194490061,197168461,199760461,202438861,205030861,207709261,210387661,212979661,215658061,218250061,220928461,223606861,226026061,228704461,231296461,233974861,236566861,239245261,241923661,244515661,247194061,249786061,252464461,255142861,257562061,260240461,262832461,265510861,268102861,270781261,273459661,276051661,278730061,281322061,284000461,286678861,289098061,291776461,294368461,297046861,299638861,302317261,304995661,307587661,310266061,31285! 8061,315536461,318214861,320720461,323398861,325990861,3286692! 61,33126 1261,333939661,336618061,339210061,341888461,344480461,347158861,349837261,352256461,354934861,357526861,360205261,362797261,365475661,368154061,370746061,373424461,376016461,378694861,381373261,383792461,386470861,389062861,391741261,394333261,397011661,399690061,402282061,404960461,407552461,410230861,412909261,415328461,418006861,420598861,423277261,425869261,428547661,431226061,433818061,436496461,439088461,441766861,444445261,446950861,449629261,452221261,454899661,457491661,460170061,462848461,465440461,468118861,470710861,473389261,476067661,478486861,481165261,483757261,486435661,489027661,491706061,494384461,496976461,499654861,502246861,504925261,507603661,510022861,512701261,515293261,517971661,520563661,523242061,525920461,528512461,531190861,533782861,536461261,539139661,541558861,544237261,546829261,549507661,552099661,554778061,557456461,560048461,562726861,565318861,567997261,570675661,573181261,575859661,578451661,581130061,583722061,586400461,589078861,5916! 70861,594349261,596941261,599619661,602298061,604717261,607395661,609987661,612666061,615258061,617936461,620614861,623206861,625885261,628477261,631155661,633834061,636253261,638931661,641523661,644202061,646794061,649472461,652150861,654742861,657421261,660013261,662691661,665370061,667789261,670467661,673059661,675738061,678330061,681008461,683686861,686278861,688957261,691549261,694227661,696906061,699411661,702090061,704682061,707360461,709952461,712630861,715309261,717901261,720579661,723171661,725850061,728528461,730947661,733626061,736218061,738896461,741488461,744166861,746845261,749437261,752115661,754707661,757386061,760064461,762483661,765162061,767754061,770432461,773024461,775702861,778381261,780973261,783651661,786243661,788922061,791600461,794019661,796698061,799290061,801968461,804560461,807238861,809917261,812509261,815187661,817779661,820458061,823136461,825642061,828320461,830912461,833590861,836182861,838861261,841539661,844131661,846810061,849402061,85! 2080461,854758861,857178061,859856461,862448461,865126861,8677! 18861,87 0397261,873075661,875667661,878346061,880938061,883616461,886294861,888714061,891392461,893984461,896662861,899254861,901933261,904611661,907203661,909882061,912474061,915152461,917830861,920250061,922928461,925520461,928198861,930790861,933469261,936147661,938739661,941418061,944010061,946688461,949366861,951872461,954550861,957142861,959821261,962413261,965091661,967770061,970362061,973040461,975632461,978310861,980989261,983408461,986086861,988678861,991357261,993949261,996627661,999306061,1001898061,1004576461,1007168461,1009846861,1012525261,1014944461,1017622861,1020214861,1022893261,1025485261,1028163661,1030842061,1033434061,1036112461,1038704461,1041382861,1044061261,1046480461,1049158861,1051750861,1054429261,1057021261,1059699661,1062378061,1064970061,1067648461,1070240461,1072918861,1075597261,1078102861,1080781261,1083373261,1086051661,1088643661,1091322061,1094000461,1096592461,1099270861,1101862861,1104541261,1107219661,1109638861,1112317261,1114909261,1117587! 661,1120179661,1122858061,1125536461,1128128461,1130806861,1133398861,1136077261,1138755661,1141174861], +"range": [3.4,3.8,4.0,3.9,3.5,3.6,3.6,3.9,3.8,3.7,3.8,4.0,4.3,4.7,5.0,5.3,6.1,6.2,6.7,6.8,6.6,7.9,6.4,6.6,6.5,6.4,6.3,5.8,5.5,5.4,5.0,4.5,4.4,4.2,4.2,4.3,3.7,3.4,3.4,3.1,3.0,3.2,3.1,3.1,3.3,3.5,3.5,3.1,3.2,3.1,2.9,2.9,3.0,3.0,3.2,3.4,3.1,3.0,2.8,2.7,2.9,2.6,2.6,2.7,2.5,2.5,2.6,2.7,2.9,3.1,3.5,4.5,4.9,5.2,5.7,5.9,5.9,5.6,5.8,6.0,6.1,5.7,5.3,5.0,4.9,4.7,4.6,4.7,4.3,4.2,4.0,4.2,4.1,4.3,4.2,4.2,4.0,3.9,4.2,4.0,4.3,4.3,4.4,4.1,3.9,3.9,4.3,4.2,4.2,3.9,3.7,3.9,4.1,4.3,4.2,4.1,4.4,4.5,5.1,5.2,5.8,6.4,6.7,7.4,7.4,7.3,7.5,7.4,7.1,6.7,6.2,6.2,6.0,5.9,5.6,5.2,5.1,5.0,5.1,5.2,5.5,5.7,5.8,5.3,5.2,4.8,5.4,5.2,5.1,5.4,5.5,5.6,5.5,6.1,6.1,6.6,6.6,6.9,6.9,7.0,7.1,6.9,7.0,6.6,6.7,6.5,6.1,6.0,5.8,5.5,5.6,5.6,5.5,5.5,5.4,5.7,5.6,5.4,5.7,5.5,5.7,5.9,5.7,5.7,5.9,5.6,5.6,5.4,5.5,5.5,5.7,5.5,5.6,5.4,5.4,5.3,5.1,5.2,4.9,5.0,5.1,5.1,4.8,5.0,4.9,5.1,4.7,4.8,4.6,4.6,4.4,4.4,4.3,4.2,4.1,4.0,4.0,3.8,3.8,3.8,3.9,3.8,3.8,3.8,3.7,3.7,3.6,3.8,3.9,3.8,3.8,3.8,3.8,3.9,3.8,3.8,3.8,4.0,3.9,3.8,3.7,3.8,3.7,3.5,3.! 5,3.7,3.7,3.5,3.4,3.4,3.4,3.4,3.4,3.4,3.4,3.4,3.4,3.5,3.5,3.5,3.7,3.7,3.5,3.5,3.9,4.2,4.4,4.6,4.8,4.9,5.0,5.1,5.4,5.5,5.9,6.1,5.9,5.9,6.0,5.9,5.9,5.9,6.0,6.1,6.0,5.8,6.0,6.0,5.8,5.7,5.8,5.7,5.7,5.7,5.6,5.6,5.5,5.6,5.3,5.2,4.9,5.0,4.9,5.0,4.9,4.9,4.8,4.8,4.8,4.6,4.8,4.9,5.1,5.2,5.1,5.1,5.1,5.4,5.5,5.5,5.9,6.0,6.6,7.2,8.1,8.1,8.6,8.8,9.0,8.8,8.6,8.4,8.4,8.4,8.3,8.2,7.9,7.7,7.6,7.7,7.4,7.6,7.8,7.8,7.6,7.7,7.8,7.8,7.5,7.6,7.4,7.2,7.0,7.2,6.9,7.0,6.8,6.8,6.8,6.4,6.4,6.3,6.3,6.1,6.0,5.9,6.2,5.9,6.0,5.8,5.9,6.0,5.9,5.9,5.8,5.8,5.6,5.7,5.7,6.0,5.9,6.0,5.9,6.0,6.3,6.3,6.3,6.9,7.5,7.6,7.8,7.7,7.5,7.5,7.5,7.2,7.5,7.4,7.4,7.2,7.5,7.5,7.2,7.4,7.6,7.9,8.3,8.5,8.6,8.9,9.0,9.3,9.4,9.6,9.8,9.8,10.1,10.4,10.8,10.8,10.4,10.4,10.3,10.2,10.1,10.1,9.4,9.5,9.2,8.8,8.5,8.3,8.0,7.8,7.8,7.7,7.4,7.2,7.5,7.5,7.3,7.4,7.2,7.3,7.3,7.2,7.2,7.3,7.2,7.4,7.4,7.1,7.1,7.1,7.0,7.0,6.7,7.2,7.2,7.1,7.2,7.2,7.0,6.9,7.0,7.0,6.9,6.6,6.6,6.6,6.6,6.3,6.3,6.2,6.1,6.0,5.9,6.0,5.8,5.7,5.7,5.7,5.7,5.4,5.6,5.4,5.4,5.6,5.4,! 5.4,5.3,5.3,5.4,5.2,5.0,5.2,5.2,5.3,5.2,5.2,5.3,5.3,5.4,5.4,5.! 4,5.3,5. 2,5.4,5.4,5.2,5.5,5.7,5.9,5.9,6.2,6.3,6.4,6.6,6.8,6.7,6.9,6.9,6.8,6.9,6.9,7.0,7.0,7.3,7.3,7.4,7.4,7.4,7.6,7.8,7.7,7.6,7.6,7.3,7.4,7.4,7.3,7.1,7.0,7.1,7.1,7.0,6.9,6.8,6.7,6.8,6.6,6.5,6.6,6.6,6.5,6.4,6.1,6.1,6.1,6.0,5.9,5.8,5.6,5.5,5.6,5.4,5.4,5.8,5.6,5.6,5.7,5.7,5.6,5.5,5.6,5.6,5.6,5.5,5.5,5.6,5.6,5.3,5.5,5.1,5.2,5.2,5.4,5.4,5.3,5.2,5.2,5.1,4.9,5.0,4.9,4.8,4.9,4.7,4.6,4.7,4.6,4.6,4.7,4.3,4.4,4.5,4.5,4.5,4.6,4.5,4.4,4.4,4.3,4.4,4.2,4.3,4.2,4.3,4.3,4.2,4.2,4.1,4.1,4.0,4.0,4.1,4.0,3.8,4.0,4.0,4.0,4.1,3.9,3.9,3.9,3.9,4.2,4.2,4.3,4.4,4.3,4.5,4.6,4.9,5.0,5.3,5.5,5.7,5.7,5.7,5.7,5.9,5.8,5.8,5.8,5.7,5.7,5.7,5.9,6.0,5.8,5.9,5.9,6.0,6.1,6.3,6.2,6.1,6.1,6.0,5.9,5.7,5.7,5.6,5.7,5.5,5.6,5.6,5.5,5.4,5.4,5.4,5.4,5.4,5.2,5.4,5.1,5.1,5.1,5.0,5.0,4.9,5.1,4.9,5.0,4.9,4.7,4.8,4.7], +"label": "Unemployment", +"axis": "percent" +} Modified: activity-monitor/trunk/gui/war/war/App.html =================================================================== --- activity-monitor/trunk/gui/war/war/App.html 2010-03-12 09:50:59 UTC (rev 1003) +++ activity-monitor/trunk/gui/war/war/App.html 2010-03-12 11:41:27 UTC (rev 1004) @@ -1,7 +1,8 @@ <html> <head> <title>Errai Application</title> - <link rel="stylesheet" type="text/css" href="App.css"> + <link rel="stylesheet" type="text/css" href="App.css"> + <script language='javascript' src='app/dataset.js'></script> <script type="text/javascript" language="javascript" src="app/app.nocache.js"></script> </head> <body> Modified: activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/DefaultBPAFDataSource.java =================================================================== --- activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/DefaultBPAFDataSource.java 2010-03-12 09:50:59 UTC (rev 1003) +++ activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/DefaultBPAFDataSource.java 2010-03-12 11:41:27 UTC (rev 1004) @@ -133,7 +133,7 @@ "and e1.processDefinitionID='"+processDefinition+"' "+ "and e1.timeStamp>="+timespan.getStart()+" "+ "and e2.timeStamp<="+timespan.getEnd()+" "+ - "order by e1.timeStamp;"); + "order by e1.eventID;"); query.addEntity(Event.class); Modified: activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/json/JsonExport.java =================================================================== --- activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/json/JsonExport.java 2010-03-12 09:50:59 UTC (rev 1003) +++ activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/json/JsonExport.java 2010-03-12 11:41:27 UTC (rev 1004) @@ -4,8 +4,8 @@ import org.jboss.bpm.monitor.model.BPAFDataSource; import org.jboss.bpm.monitor.model.DefaultBPAFDataSource; import org.jboss.bpm.monitor.model.bpaf.Event; -import org.jboss.bpm.monitor.model.bpaf.State; import org.jboss.bpm.monitor.model.metric.Average; +import org.jboss.bpm.monitor.model.metric.Grouping; import org.jboss.bpm.monitor.model.metric.Metrics; import org.jboss.bpm.monitor.model.metric.Timespan; @@ -35,81 +35,48 @@ System.out.println("Instances events for: "+timespan + ": "+events.size()); Average avg = Metrics.getInstanceAverage(events); + + + SortedMap<Date, List<Event>> grouped = groupEventsByUnit(events, timespan); + + /*System.out.println("--"); + for(Date d : grouped.keySet()) + System.out.println(d+": "+grouped.get(d).size());*/ + + // ---------- + + XYDataSetJSO dataSet = new XYDataSetJSO("Process Instances last 7 days", s0); - Map<Date, Long> sorted = sortEventsByUnit(events, timespan); - - for(Date d : sorted.keySet()) - System.out.println(d+": "+sorted.get(d)); - + List<Long> domainData = new ArrayList<Long>(grouped.size()); + List<Long> rangeData = new ArrayList<Long>(grouped.size()); + for(Date d : grouped.keySet()) + { + domainData.add(d.getTime()); + rangeData.add(new Integer(grouped.get(d).size()).longValue()); + } + + dataSet.getDomain().add(domainData); + dataSet.getRange().add(rangeData); dataSet.setAxis("time"); dataSet.setRangeBottom(avg.getMin()); dataSet.setRangeTop(avg.getMax()); + System.out.println(dataSet.toJSO()); } - private static Map<Date, Long> sortEventsByUnit(List<Event> events, Timespan timespan) + private static SortedMap<Date, List<Event>> groupEventsByUnit(List<Event> events, Timespan timespan) { - Map<Date, Long> result = null; + SortedMap<Date, List<Event>> result = null; switch (timespan.getUnit() ) { case DAY: - result = groupByDay(events, timespan); + result = Grouping.byDay(events, timespan); break; } return result; } - private static Map<Date, Long> groupByDay(List<Event> events, Timespan timespan) - { - Map<Date, Long> slotCount = new HashMap<Date, Long>(); - // create daily slots first - Calendar cal = Calendar.getInstance(); - cal.setTimeInMillis(timespan.getStart()); - while(cal.getTimeInMillis()<timespan.getEnd()) - { - slotCount.put(new Date(cal.getTimeInMillis()), 0l); // left inclusive - cal.roll(Calendar.DAY_OF_YEAR, 1); - } - - // sort events according to slots - for(Event e : events) - { - State state = e.getEventDetails().getCurrentState(); - - // only State.Open events matter in this case - if(State.Open.equals(state)) - { - for(Date from : slotCount.keySet()) - { - cal.setTime(from); - cal.roll(Calendar.DAY_OF_YEAR, 1); - Date to = cal.getTime(); - - Date actual = new Date(e.getTimestamp()); - - if(actual.after(from) && actual.before(to)) - { - // matching slot - if(null==slotCount.get(from)) - { - slotCount.put(from, 1l); - } - else - { - Long aLong = slotCount.get(from); - slotCount.put(from, ++aLong); - } - - break; - } - } - } - } - - return slotCount; - } - } Modified: activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/json/XYDataSetJSO.java =================================================================== --- activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/json/XYDataSetJSO.java 2010-03-12 09:50:59 UTC (rev 1003) +++ activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/json/XYDataSetJSO.java 2010-03-12 11:41:27 UTC (rev 1004) @@ -14,7 +14,7 @@ dataset = { id: "unique id for this dataset", mipped: true, - domain: [ [level 0 values], [level 1 values], ... ], + domain: [ [level 0 values], [level 1 values], ... ], => [UTCTimeInMilliseconds_1, UTCtimeInMilliseconds_2, ...] range: [ [level 0 values], [level 1 values], ... ], rangeBottom: min over level 0 values, rangeTop: max over level 0 values, @@ -27,8 +27,8 @@ String id; boolean mipped = true; - List<List<Double>> domain = new ArrayList<List<Double>>(); - List<List<Double>> range = new ArrayList<List<Double>>(); + List<List<Long>> domain = new ArrayList<List<Long>>(); + List<List<Long>> range = new ArrayList<List<Long>>(); double rangeBottom, rangeTop; @@ -65,12 +65,12 @@ this.mipped = mipped; } - public List<List<Double>> getDomain() + public List<List<Long>> getDomain() { return domain; } - public List<List<Double>> getRange() + public List<List<Long>> getRange() { return range; } @@ -137,27 +137,31 @@ sb.append("domain:["); int idx = 1; - for(List<Double> list : domain) + for(List<Long> list : domain) { - for(Double d : list) + sb.append("["); + for(Long d : list) { - sb.append("[").append(d).append("]"); + sb.append(d); if(idx<list.size()) sb.append(","); idx++; } + sb.append("]"); } sb.append("],"); sb.append("range:["); idx = 1; - for(List<Double> list : domain) + for(List<Long> list : range) { - for(Double d : list) + sb.append("["); + for(Long d : list) { - sb.append("[").append(d).append("]"); + sb.append(d); if(idx<list.size()) sb.append(","); idx++; } + sb.append("]"); } sb.append("],"); Added: activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/metric/Grouping.java =================================================================== --- activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/metric/Grouping.java (rev 0) +++ activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/metric/Grouping.java 2010-03-12 11:41:27 UTC (rev 1004) @@ -0,0 +1,58 @@ +/* jboss.org */ +package org.jboss.bpm.monitor.model.metric; + +import org.jboss.bpm.monitor.model.bpaf.Event; + +import java.util.*; + +/** + * Grouping algorithms. Non-optimized.<br> + * These may show bad execution times when being used on large scale data sets. + * + * @author: Heiko Braun <hbraun(a)redhat.com> + * @date: Mar 12, 2010 + */ +public class Grouping +{ + public static SortedMap<Date, List<Event>> byDay(List<Event> events, Timespan timespan) + { + long s0 = System.currentTimeMillis(); + SortedMap<Date, List<Event>> slotCount = new TreeMap<Date, List<Event>>(); + + // create daily slots first + final Calendar cal = Calendar.getInstance(); + cal.setTimeInMillis(timespan.getStart()); + while(cal.getTimeInMillis()<timespan.getEnd()) + { + slotCount.put(new Date(cal.getTimeInMillis()), new ArrayList<Event>()); // left inclusive + cal.roll(Calendar.DAY_OF_YEAR, 1); + } + + // sort events according to slots + final Set<Date> startingDates = slotCount.keySet(); + Iterator<Date> it = startingDates.iterator(); + while(it.hasNext()) + { + Date from = it.next(); + + for(Event e : events) + { + cal.setTime(from); + cal.roll(Calendar.DAY_OF_YEAR, 1); + Date to = cal.getTime(); + + Date actual = new Date(e.getTimestamp()); + + if(actual.after(from) && actual.before(to)) + { + slotCount.get(from).add(e); + } + + } + } + + //System.out.println("exectime: "+(System.currentTimeMillis()-s0)+ " ms"); + return slotCount; + } + +}

14 years, 2 months

1
0
0 / 0

Overlord SVN: r1003 - in activity-monitor/trunk: gui/war/src/main/java/org/jboss/bpm/monitor/gui and 4 other directories.

by overlord-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2010-03-12 04:50:59 -0500 (Fri, 12 Mar 2010) New Revision: 1003 Added: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/RecentActivityView.java activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/json/ activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/json/JsonExport.java activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/json/XYDataSetJSO.java Modified: activity-monitor/trunk/gui/war/pom.xml activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/App.gwt.xml activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DebugPanel.java activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/metric/Timespan.java Log: interim commit Modified: activity-monitor/trunk/gui/war/pom.xml =================================================================== --- activity-monitor/trunk/gui/war/pom.xml 2010-03-11 12:01:28 UTC (rev 1002) +++ activity-monitor/trunk/gui/war/pom.xml 2010-03-12 09:50:59 UTC (rev 1003) @@ -71,6 +71,12 @@ <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> </dependency> + + <dependency> + <groupId>org.timepedia.chronoscope</groupId> + <artifactId>chronoscope</artifactId> + <version>1.0</version> + </dependency> </dependencies> <build> Modified: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/App.gwt.xml =================================================================== --- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/App.gwt.xml 2010-03-11 12:01:28 UTC (rev 1002) +++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/App.gwt.xml 2010-03-12 09:50:59 UTC (rev 1003) @@ -8,6 +8,8 @@ <inherits name="org.jboss.errai.common.ErraiCommon"/> <inherits name="org.jboss.errai.bus.ErraiBus"/> <inherits name="org.jboss.errai.workspaces.ErraiWorkspaces" /> + + <inherits name='org.timepedia.chronoscope.Chronoscope'/> <entry-point class='org.jboss.bpm.monitor.gui.client.MonitorUI'/> Modified: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DebugPanel.java =================================================================== --- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DebugPanel.java 2010-03-11 12:01:28 UTC (rev 1002) +++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DebugPanel.java 2010-03-12 09:50:59 UTC (rev 1003) @@ -232,8 +232,6 @@ ) ); - - } } Added: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/RecentActivityView.java =================================================================== --- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/RecentActivityView.java (rev 0) +++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/RecentActivityView.java 2010-03-12 09:50:59 UTC (rev 1003) @@ -0,0 +1,99 @@ +/* jboss.org */ +package org.jboss.bpm.monitor.gui.client; + +import org.gwt.mosaic.ui.client.layout.LayoutPanel; +import org.jboss.errai.workspaces.client.api.ProvisioningCallback; +import org.jboss.errai.workspaces.client.api.WidgetProvider; +import org.jboss.errai.workspaces.client.api.annotations.LoadTool; +import org.timepedia.chronoscope.client.*; +import org.timepedia.chronoscope.client.browser.ChartPanel; +import org.timepedia.chronoscope.client.browser.Chronoscope; +import org.timepedia.chronoscope.client.browser.json.GwtJsonDataset; +import org.timepedia.chronoscope.client.browser.json.JsonDatasetJSO; +import org.timepedia.chronoscope.client.canvas.View; +import org.timepedia.chronoscope.client.canvas.ViewReadyCallback; +import org.timepedia.chronoscope.client.data.tuple.Tuple2D; +import org.timepedia.chronoscope.client.overlays.Marker; +import org.timepedia.chronoscope.client.overlays.OverlayClickListener; + +/** + * @author: Heiko Braun <hbraun(a)redhat.com> + * @date: Mar 11, 2010 + */ +@LoadTool(name="Recent Activity", group = "Process History") +public class RecentActivityView implements WidgetProvider +{ + + private static final String TIMEPEDIA_FONTBOOK_SERVICE = "http://api.timepedia.org/fr"; + + private static volatile double GOLDEN__RATIO = 1.618; + + private LayoutPanel panel; + + public void provideWidget(ProvisioningCallback callback) + { + panel = new LayoutPanel(); + + + try { + // You must specify the chart dimensions for now, rather than have the chart + // grow to fill its container + int chartWidth = 450; + int chartHeight = (int) (chartWidth / GOLDEN__RATIO); + + // Chronoscope.enableHistorySupport(true); + Chronoscope.setFontBookRendering(true); + ChronoscopeOptions.setErrorReporting(true); + Chronoscope.setMicroformatsEnabled(true); + Chronoscope.initialize(); + + Chronoscope chronoscope = Chronoscope.getInstance(); + + final Datasets<Tuple2D> datasets = new Datasets<Tuple2D>(); + datasets.add(chronoscope.getDatasetReader().createDatasetFromJson( + new GwtJsonDataset(getJson("interestRates01"))) + ); + datasets.add(chronoscope.getDatasetReader().createDatasetFromJson( + new GwtJsonDataset(getJson("interestRates02"))) + ); + +// MockDatasetFactory datasetFactory = new MockDatasetFactory(); +// Dataset mockDataset = datasetFactory.getBasicDataset(); +// datasets.add(mockDataset); + + Dataset[] dsArray = datasets.toArray(); + + final ChartPanel chartPanel = Chronoscope + .createTimeseriesChart(dsArray, chartWidth, chartHeight); + + chartPanel.setReadyListener(new ViewReadyCallback() { + public void onViewReady(final View view) { + Dataset dataset = datasets.get(0); + final Marker m = new Marker( + dataset.getDomainExtrema().midpoint(), "A", 0); + m.addOverlayClickListener(new OverlayClickListener() { + public void onOverlayClick(Overlay overlay, int x, int y) { + m.openInfoWindow("Hello"); + } + }); + + XYPlot plot = view.getChart().getPlot(); + //plot.setDatasetRenderer(1, new BarChartXYRenderer()); + plot.addOverlay(m); + plot.redraw(); + } + }); + + } + catch (Exception e) + { + } + + + callback.onSuccess(panel); + } + + private static native JsonDatasetJSO getJson(String varName) /*-{ + return $wnd[varName]; + }-*/; +} Added: activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/json/JsonExport.java =================================================================== --- activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/json/JsonExport.java (rev 0) +++ activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/json/JsonExport.java 2010-03-12 09:50:59 UTC (rev 1003) @@ -0,0 +1,115 @@ +/* jboss.org */ +package org.jboss.bpm.monitor.model.json; + +import org.jboss.bpm.monitor.model.BPAFDataSource; +import org.jboss.bpm.monitor.model.DefaultBPAFDataSource; +import org.jboss.bpm.monitor.model.bpaf.Event; +import org.jboss.bpm.monitor.model.bpaf.State; +import org.jboss.bpm.monitor.model.metric.Average; +import org.jboss.bpm.monitor.model.metric.Metrics; +import org.jboss.bpm.monitor.model.metric.Timespan; + +import java.util.*; + +/** + * @author: Heiko Braun <hbraun(a)redhat.com> + * @date: Mar 11, 2010 + */ +public class JsonExport +{ + public static void main(String[] args) + { + BPAFDataSource ds = new DefaultBPAFDataSource(); + + // definitions + List<String> definitions = ds.getProcessDefinitions(); + System.out.println("Definitions: " +definitions); + + // instances + String s0 = definitions.get(0); + + Timespan timespan = Timespan.last7Days(); + + List<Event> events = ds.getDefinitionEvents(s0, timespan); + + System.out.println("Instances events for: "+timespan + ": "+events.size()); + + Average avg = Metrics.getInstanceAverage(events); + XYDataSetJSO dataSet = new XYDataSetJSO("Process Instances last 7 days", s0); + + Map<Date, Long> sorted = sortEventsByUnit(events, timespan); + + for(Date d : sorted.keySet()) + System.out.println(d+": "+sorted.get(d)); + + dataSet.setAxis("time"); + dataSet.setRangeBottom(avg.getMin()); + dataSet.setRangeTop(avg.getMax()); + + } + + private static Map<Date, Long> sortEventsByUnit(List<Event> events, Timespan timespan) + { + Map<Date, Long> result = null; + switch (timespan.getUnit() ) + { + case DAY: + result = groupByDay(events, timespan); + break; + } + + return result; + } + + private static Map<Date, Long> groupByDay(List<Event> events, Timespan timespan) + { + Map<Date, Long> slotCount = new HashMap<Date, Long>(); + + // create daily slots first + Calendar cal = Calendar.getInstance(); + cal.setTimeInMillis(timespan.getStart()); + while(cal.getTimeInMillis()<timespan.getEnd()) + { + slotCount.put(new Date(cal.getTimeInMillis()), 0l); // left inclusive + cal.roll(Calendar.DAY_OF_YEAR, 1); + } + + // sort events according to slots + for(Event e : events) + { + State state = e.getEventDetails().getCurrentState(); + + // only State.Open events matter in this case + if(State.Open.equals(state)) + { + for(Date from : slotCount.keySet()) + { + cal.setTime(from); + cal.roll(Calendar.DAY_OF_YEAR, 1); + Date to = cal.getTime(); + + Date actual = new Date(e.getTimestamp()); + + if(actual.after(from) && actual.before(to)) + { + // matching slot + if(null==slotCount.get(from)) + { + slotCount.put(from, 1l); + } + else + { + Long aLong = slotCount.get(from); + slotCount.put(from, ++aLong); + } + + break; + } + } + } + } + + return slotCount; + } + +} Added: activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/json/XYDataSetJSO.java =================================================================== --- activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/json/XYDataSetJSO.java (rev 0) +++ activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/json/XYDataSetJSO.java 2010-03-12 09:50:59 UTC (rev 1003) @@ -0,0 +1,171 @@ +/* jboss.org */ +package org.jboss.bpm.monitor.model.json; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author: Heiko Braun <hbraun(a)redhat.com> + * @date: Mar 11, 2010 + */ +public class XYDataSetJSO +{ + /* + dataset = { + id: "unique id for this dataset", + mipped: true, + domain: [ [level 0 values], [level 1 values], ... ], + range: [ [level 0 values], [level 1 values], ... ], + rangeBottom: min over level 0 values, + rangeTop: max over level 0 values, + label: "default label for this dataset", + axis: "an axis identifier (usually units). Datasets with like axis ids + share the same range Axis" + } + */ + + String id; + boolean mipped = true; + + List<List<Double>> domain = new ArrayList<List<Double>>(); + List<List<Double>> range = new ArrayList<List<Double>>(); + + double rangeBottom, rangeTop; + + String label; + String axis; + + public XYDataSetJSO() + { + } + + public XYDataSetJSO(String label, String id) + { + this.label = label; + this.id = id; + } + + public String getId() + { + return id; + } + + public void setId(String id) + { + this.id = id; + } + + public boolean isMipped() + { + return mipped; + } + + public void setMipped(boolean mipped) + { + this.mipped = mipped; + } + + public List<List<Double>> getDomain() + { + return domain; + } + + public List<List<Double>> getRange() + { + return range; + } + + public double getRangeBottom() + { + return rangeBottom; + } + + public void setRangeBottom(double rangeBottom) + { + this.rangeBottom = rangeBottom; + } + + public double getRangeTop() + { + return rangeTop; + } + + public void setRangeTop(double rangeTop) + { + this.rangeTop = rangeTop; + } + + public String getLabel() + { + return label; + } + + public void setLabel(String label) + { + this.label = label; + } + + public String getAxis() + { + return axis; + } + + public void setAxis(String axis) + { + this.axis = axis; + } + + public String toJSO() + { + /* + dataset = { + id: "unique id for this dataset", + mipped: true, + domain: [ [level 0 values], [level 1 values], ... ], + range: [ [level 0 values], [level 1 values], ... ], + rangeBottom: min over level 0 values, + rangeTop: max over level 0 values, + label: "default label for this dataset", + axis: "an axis identifier (usually units). Datasets with like axis ids + share the same range Axis" + }*/ + + + StringBuffer sb = new StringBuffer("{"); + sb.append("id:\"").append(id).append("\","); + sb.append("mipped:").append(Boolean.valueOf(mipped).toString()).append(","); + + sb.append("domain:["); + int idx = 1; + for(List<Double> list : domain) + { + for(Double d : list) + { + sb.append("[").append(d).append("]"); + if(idx<list.size()) sb.append(","); + idx++; + } + } + sb.append("],"); + + sb.append("range:["); + idx = 1; + for(List<Double> list : domain) + { + for(Double d : list) + { + sb.append("[").append(d).append("]"); + if(idx<list.size()) sb.append(","); + idx++; + } + } + sb.append("],"); + + sb.append("rangeBottom:").append(rangeBottom).append(","); + sb.append("rangeTop:").append(rangeTop).append(","); + sb.append("label:\"").append(label).append("\","); + sb.append("axis:\"").append(label).append("\""); + sb.append("}"); + return sb.toString(); + } +} Modified: activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/metric/Timespan.java =================================================================== --- activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/metric/Timespan.java 2010-03-11 12:01:28 UTC (rev 1002) +++ activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/metric/Timespan.java 2010-03-12 09:50:59 UTC (rev 1003) @@ -13,13 +13,18 @@ */ public final class Timespan { - long start; - long end; + private long start; + private long end; - public Timespan(long start, long end) + public enum UNIT {HOUR, DAY, WEEK, MONTH, YEAR } + + private UNIT unit; + + public Timespan(long start, long end, UNIT unit) { this.start = start; this.end = end; + this.unit = unit; } public long getStart() @@ -32,6 +37,11 @@ return end; } + public UNIT getUnit() + { + return unit; + } + public String toString() { return "Timespan{ "+new Date(start)+" - "+new Date(end)+" }"; @@ -47,7 +57,7 @@ cal.roll(Calendar.DAY_OF_YEAR, -1); long t0 = cal.getTimeInMillis(); - return new Timespan(t0, t1); + return new Timespan(t0, t1, UNIT.HOUR); } public static Timespan lastDay() @@ -65,7 +75,7 @@ cal.set(Calendar.SECOND, 0); long t0 = cal.getTimeInMillis(); - return new Timespan(t0, t1); + return new Timespan(t0, t1, UNIT.HOUR); } public static Timespan last7Days() @@ -76,7 +86,7 @@ cal.roll(Calendar.DAY_OF_YEAR, -7); long t0 = cal.getTimeInMillis(); - return new Timespan(t0, t1); + return new Timespan(t0, t1, UNIT.DAY); } public static Timespan lastWeek() @@ -97,7 +107,7 @@ cal.set(Calendar.SECOND, 0); long t0 = cal.getTimeInMillis(); - return new Timespan(t0, t1); + return new Timespan(t0, t1, UNIT.DAY); } public static Timespan last4Weeks() @@ -108,7 +118,7 @@ cal.roll(Calendar.WEEK_OF_YEAR, -4); long t0 = cal.getTimeInMillis(); - return new Timespan(t0, t1); + return new Timespan(t0, t1, UNIT.DAY); } public static Timespan lastMonth() @@ -129,7 +139,7 @@ cal.set(Calendar.SECOND, 0); long t0 = cal.getTimeInMillis(); - return new Timespan(t0, t1); + return new Timespan(t0, t1, UNIT.DAY); } @@ -141,7 +151,7 @@ cal.roll(Calendar.MONTH, -3); long t0 = cal.getTimeInMillis(); - return new Timespan(t0, t1); + return new Timespan(t0, t1, UNIT.WEEK); } public static Timespan lastQuarter() @@ -172,7 +182,7 @@ cal.set(Calendar.SECOND, 0); long t0 = cal.getTimeInMillis(); - return new Timespan(t0, t1); + return new Timespan(t0, t1, UNIT.WEEK); } @@ -184,7 +194,7 @@ cal.roll(Calendar.YEAR, -1); long t0 = cal.getTimeInMillis(); - return new Timespan(t0, t1); + return new Timespan(t0, t1, UNIT.MONTH); } public static Timespan lastYear() @@ -207,6 +217,6 @@ cal.set(Calendar.SECOND, 0); long t0 = cal.getTimeInMillis(); - return new Timespan(t0, t1); + return new Timespan(t0, t1, UNIT.MONTH); } }

14 years, 2 months

1
0
0 / 0

Overlord SVN: r1002 - in activity-monitor/trunk: gui and 14 other directories.

by overlord-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2010-03-11 07:01:28 -0500 (Thu, 11 Mar 2010) New Revision: 1002 Added: activity-monitor/trunk/gui/war/ activity-monitor/trunk/gui/war/pom.xml activity-monitor/trunk/gui/war/src/ activity-monitor/trunk/gui/war/src/main/ activity-monitor/trunk/gui/war/src/main/java/ activity-monitor/trunk/gui/war/src/main/java/ErraiApp.properties activity-monitor/trunk/gui/war/src/main/java/ErraiService.properties activity-monitor/trunk/gui/war/src/main/java/login.config activity-monitor/trunk/gui/war/src/main/java/org/ activity-monitor/trunk/gui/war/src/main/java/org/jboss/ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/App.gwt.xml activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/BPAFDataAccess.java activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DebugPanel.java activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/MonitorUI.java activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/server/ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/server/BPAFService.java activity-monitor/trunk/gui/war/src/main/java/roles.properties activity-monitor/trunk/gui/war/src/main/java/users.properties activity-monitor/trunk/gui/war/war/ activity-monitor/trunk/gui/war/war/App.css activity-monitor/trunk/gui/war/war/App.html activity-monitor/trunk/gui/war/war/META-INF/ activity-monitor/trunk/gui/war/war/WEB-INF/ activity-monitor/trunk/gui/war/war/WEB-INF/web.xml Modified: activity-monitor/trunk/model/pom.xml activity-monitor/trunk/pom.xml Log: Added GUI module Added: activity-monitor/trunk/gui/war/pom.xml =================================================================== --- activity-monitor/trunk/gui/war/pom.xml (rev 0) +++ activity-monitor/trunk/gui/war/pom.xml 2010-03-11 12:01:28 UTC (rev 1002) @@ -0,0 +1,263 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <name>JBoss BPM - ActivityMonitor:GUI</name> + <groupId>org.jboss.bpm</groupId> + <artifactId>activity-monitor-gui</artifactId> + <packaging>war</packaging> + <version>1.0-SNAPSHOT</version> + +  + <parent> + <groupId>org.jboss.bpm</groupId> + <artifactId>activity-monitor-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + + <properties> + <gwt.maven.version>1.2.0-11137</gwt.maven.version> + </properties> + + <dependencies> + +  + <dependency> + <groupId>org.jboss.bpm</groupId> + <artifactId>activity-monitor-model</artifactId> + <version>1.0.0-SNAPSHOT</version> + </dependency> + +  + <dependency> + <groupId>org.jboss.errai</groupId> + <artifactId>errai-common</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.errai</groupId> + <artifactId>errai-bus</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.errai</groupId> + <artifactId>errai-workspaces</artifactId> + </dependency> + + +  + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-servlet</artifactId> + <scope>provided</scope> + <version>${gwt.version}</version> + </dependency> + + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-user</artifactId> + <scope>provided</scope> + <version>${gwt.version}</version> + </dependency> + + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-dev</artifactId> + <scope>provided</scope> + <version>${gwt.version}</version> + </dependency> + + <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + </dependency> + </dependencies> + + <build> + <outputDirectory>war/WEB-INF/classes</outputDirectory> + + <resources> + <resource> + <directory>src/main/java</directory> + </resource> + </resources> + + <plugins> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>gwt-maven-plugin</artifactId> + <version>${gwt.maven.version}</version> + <configuration> + <inplace>true</inplace> + <logLevel>DEBUG</logLevel> + <runTarget>App.html</runTarget> + <warSourceDirectory>war</warSourceDirectory> + <extraJvmArgs>-Xmx512m</extraJvmArgs> + <treeLogger>true</treeLogger> + <gen>${project.build.directory}/generated</gen> + <generateDirectory>${project.build.directory}/generated</generateDirectory> + <disableCastChecking>true</disableCastChecking> + <disableClassMetadata>true</disableClassMetadata> + </configuration> + <executions> + <execution> + <goals> + <goal>resources</goal> +  + <goal>compile</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + <showDeprecation>true</showDeprecation> + <showWarnings>true</showWarnings> + <optimize>true</optimize> + </configuration> + </plugin> + + <plugin> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <warSourceDirectory>war</warSourceDirectory> + <webappDirectory>war</webappDirectory> + </configuration> + </plugin> + <plugin> + <artifactId>maven-clean-plugin</artifactId> + <version>2.2</version> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.2</version> + <executions> + <execution> + <id>clean.war</id> + <phase>clean</phase> + <configuration> + <tasks> +  + <delete dir="war/WEB-INF/classes" /> + <delete dir="war/WEB-INF/lib" /> + <delete dir="war/app" /> + <delete dir="target" /> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + </build> + + <reporting> + <excludeDefaults>true</excludeDefaults> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>gwt-maven-plugin</artifactId> + <reportSets> + <reportSet> + <reports> + <report>soyc</report> + </reports> + </reportSet> + </reportSets> + </plugin> + </plugins> + </reporting> + +  + <repositories> + <repository> + <id>repository.jboss.org</id> + <url>http://repository.jboss.org/maven2</url> + </repository> + <repository> + <id>snapshots.jboss.org</id> + <name>JBoss Snapshot Repository</name> + <url>http://snapshots.jboss.org/maven2</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + </snapshots> + </repository> + <repository> + <id>maven2.java.net</id> + <name>Java.net Repository for Maven 2</name> + <url>http://download.java.net/maven/2/</url> + </repository> + <repository> + <id>maven1.java.net</id> + <url>http://download.java.net/maven/1/</url> + <layout>legacy</layout> + </repository> + <repository> + <id>repository.codehaus.org</id> + <url>http://repository.codehaus.org</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + <repository> + <id>codehaus-snapshot</id> + <url>http://snapshots.repository.codehaus.org</url> + <snapshots> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + </repository> + <repository> + <id>gwt-maven</id> + <url>http://gwt-maven.googlecode.com/svn/trunk/mavenrepo/</url> + </repository> + </repositories> + + <pluginRepositories> + <pluginRepository> + <id>maven2.java.net</id> + <name>Java.net Repository for Maven 2</name> + <url>http://download.java.net/maven/2/</url> + </pluginRepository> + <pluginRepository> + <id>repository.jboss.org</id> + <url>http://repository.jboss.org/maven2</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + </pluginRepository> + <pluginRepository> + <id>snapshots.jboss.org</id> + <url>http://snapshots.jboss.org/maven2</url> + <snapshots> + </snapshots> + </pluginRepository> + <pluginRepository> + <id>gwt-maven</id> + <url>http://gwt-maven.googlecode.com/svn/trunk/mavenrepo/</url> + </pluginRepository> + + </pluginRepositories> + +</project> Added: activity-monitor/trunk/gui/war/src/main/java/ErraiApp.properties =================================================================== --- activity-monitor/trunk/gui/war/src/main/java/ErraiApp.properties (rev 0) +++ activity-monitor/trunk/gui/war/src/main/java/ErraiApp.properties 2010-03-11 12:01:28 UTC (rev 1002) @@ -0,0 +1,18 @@ + +# +# Copyright 2009 JBoss, a divison Red Hat, Inc +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# required marker interface Added: activity-monitor/trunk/gui/war/src/main/java/ErraiService.properties =================================================================== --- activity-monitor/trunk/gui/war/src/main/java/ErraiService.properties (rev 0) +++ activity-monitor/trunk/gui/war/src/main/java/ErraiService.properties 2010-03-11 12:01:28 UTC (rev 1002) @@ -0,0 +1,65 @@ + +# +# Copyright 2009 JBoss, a divison Red Hat, Inc +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# +# Request dispatcher implementation (default is SimpleDispatcher) +# +#errai.dispatcher_implementation=org.jboss.errai.bus.server.SimpleDispatcher +errai.dispatcher_implementation=org.jboss.errai.bus.server.AsyncDispatcher + + +# +# Worker pool size. This is the number of threads the asynchronous worker pool should provide for processing +# incoming messages. This option is only valid when using the AsyncDispatcher implementation. +# +errai.async.thread_pool_size=5 + +# +# Worker timeout (in seconds). This defines the time that a single asychronous process may run, before the worker pool +# terminates it and reclaims the thread. This option is only valid when using the AsyncDispatcher implementation. +# +errai.async.worker.timeout=5 + +# +# Specify the Authentication/Authorization Adapter sendNowWith use +# +#errai.authentication_adapter=org.jboss.errai.persistence.server.security.HibernateAuthenticationAdapter +errai.authentication_adapter=org.jboss.errai.bus.server.security.auth.JAASAdapter + +## +## This property indicates whether or not authentication is required for all communication with the bus. Set this +## to 'true' if all access to your application should be secure. +## +errai.require_authentication_for_all=true + +# +# (Optional) A Login MOTD sendNowWith be sent sendNowWith the client upon successful login. +# +errai.login_motd=UNAUTHORIZED ACCESS IS PROHIBITED! + + +# +# This is for prototyping the persistence service and will be replaced with a more standardized mechanism +# in the near future. +# +errai.prototyping.persistence.dialect=org.hibernate.dialect.HSQLDialect +errai.prototyping.persistence.connection.driver_class=org.hsqldb.jdbcDriver +errai.prototyping.persistence.connection.url=jdbc:hsqldb:file:target/db/QuickstartDB +errai.prototyping.persistence.connection.username=sa +errai.prototyping.persistence.connection.password= +errai.prototyping.persistence.connection.pool_size=1 + Added: activity-monitor/trunk/gui/war/src/main/java/login.config =================================================================== --- activity-monitor/trunk/gui/war/src/main/java/login.config (rev 0) +++ activity-monitor/trunk/gui/war/src/main/java/login.config 2010-03-11 12:01:28 UTC (rev 1002) @@ -0,0 +1,4 @@ + Login { + org.jboss.errai.bus.server.security.auth.PropertyFileLoginModule sufficient; + }; + \ No newline at end of file Added: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/App.gwt.xml =================================================================== --- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/App.gwt.xml (rev 0) +++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/App.gwt.xml 2010-03-11 12:01:28 UTC (rev 1002) @@ -0,0 +1,14 @@ +<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 1.6//EN" + "http://google-web-toolkit.googlecode.com/svn/releases/1.6/distro-source/c..."> +<module rename-to="app"> + <inherits name='com.google.gwt.user.User'/> + <inherits name="com.google.gwt.uibinder.UiBinder"/> + <inherits name="com.google.gwt.resources.Resources" /> + + <inherits name="org.jboss.errai.common.ErraiCommon"/> + <inherits name="org.jboss.errai.bus.ErraiBus"/> + <inherits name="org.jboss.errai.workspaces.ErraiWorkspaces" /> + + <entry-point class='org.jboss.bpm.monitor.gui.client.MonitorUI'/> + +</module> \ No newline at end of file Added: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/BPAFDataAccess.java =================================================================== --- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/BPAFDataAccess.java (rev 0) +++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/BPAFDataAccess.java 2010-03-11 12:01:28 UTC (rev 1002) @@ -0,0 +1,20 @@ +/* jboss.org */ +package org.jboss.bpm.monitor.gui.client; + +import org.jboss.errai.bus.server.annotations.Remote; + +import java.util.List; + +/** + * @author: Heiko Braun <hbraun(a)redhat.com> + * @date: Mar 11, 2010 + */ +@Remote +public interface BPAFDataAccess +{ + List<String> getProcessDefinitionKeys(); + + List<String> getProcessInstanceKeys(String definitionKey); + + List<String> getActivityKeys(String instanceKey); +} Added: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DebugPanel.java =================================================================== --- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DebugPanel.java (rev 0) +++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/DebugPanel.java 2010-03-11 12:01:28 UTC (rev 1002) @@ -0,0 +1,239 @@ +/* jboss.org */ +package org.jboss.bpm.monitor.gui.client; + +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.gen2.table.event.client.RowSelectionEvent; +import com.google.gwt.gen2.table.event.client.RowSelectionHandler; +import com.google.gwt.user.client.ui.Button; +import org.gwt.mosaic.ui.client.CaptionLayoutPanel; +import org.gwt.mosaic.ui.client.ListBox; +import org.gwt.mosaic.ui.client.layout.BoxLayout; +import org.gwt.mosaic.ui.client.layout.BoxLayoutData; +import org.gwt.mosaic.ui.client.layout.ColumnLayout; +import org.gwt.mosaic.ui.client.layout.LayoutPanel; +import org.gwt.mosaic.ui.client.list.DefaultListModel; +import org.jboss.errai.bus.client.api.RemoteCallback; +import org.jboss.errai.bus.client.api.base.MessageBuilder; +import org.jboss.errai.workspaces.client.api.ProvisioningCallback; +import org.jboss.errai.workspaces.client.api.WidgetProvider; +import org.jboss.errai.workspaces.client.api.annotations.LoadTool; + +import java.util.List; + +/** + * @author: Heiko Braun <hbraun(a)redhat.com> + * @date: Mar 11, 2010 + */ +@LoadTool(name = "Key Sets", group = "Storage") +public class DebugPanel implements WidgetProvider +{ + + private LayoutPanel panel; + private ListBox<String> processDefinitions; + private ListBox<String> processInstances; + private ListBox<String> activities; + + public void provideWidget(ProvisioningCallback callback) + { + panel = new LayoutPanel(); + + CaptionLayoutPanel wrapper = new CaptionLayoutPanel("BPAF Data Keys"); + wrapper.setLayout(new ColumnLayout()); + + LayoutPanel leftPanel = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL)); + + wrapper.getHeader().add(new Button("Reload", + new ClickHandler() + { + public void onClick(ClickEvent clickEvent) + { + loadDefinitions(); + } + }) + ); + + processDefinitions = new ListBox<String>(new String[] {"processDefinitionID"}); + processDefinitions.setMinimumColumnWidth(0, 190); + processDefinitions.setCellRenderer( + new ListBox.CellRenderer<String>() + { + public void renderCell(ListBox<String> stringListBox, int row, int column, String item) + { + switch (column) + { + case 0: + processDefinitions.setText(row, column, item); + break; + default: + throw new IllegalArgumentException("unknown column"); + } + } + } + ); + processDefinitions.addRowSelectionHandler( + new RowSelectionHandler() + { + public void onRowSelection(RowSelectionEvent rowSelectionEvent) + { + loadInstances(); + } + } + ); + + leftPanel.add(processDefinitions, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH)); + + // ----- + LayoutPanel rightPanel = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL)); + + processInstances = new ListBox<String>(new String[] {"processInstanceID"}); + processInstances.setMinimumColumnWidth(0, 190); + processInstances.setCellRenderer( + new ListBox.CellRenderer<String>() + { + public void renderCell(ListBox<String> stringListBox, int row, int column, String item) + { + switch (column) + { + case 0: + processInstances.setText(row, column, item); + break; + default: + throw new IllegalArgumentException("unknown column"); + } + } + } + ); + processInstances.addRowSelectionHandler( + new RowSelectionHandler() + { + public void onRowSelection(RowSelectionEvent rowSelectionEvent) + { + loadActivities(); + } + } + ); + + activities = new ListBox<String>(new String[] {"activityDefinitionID"}); + activities.setMinimumColumnWidth(0, 190); + activities.setCellRenderer( + new ListBox.CellRenderer<String>() + { + public void renderCell(ListBox<String> stringListBox, int row, int column, String item) + { + switch (column) + { + case 0: + activities.setText(row, column, item); + break; + default: + throw new IllegalArgumentException("unknown column"); + } + } + } + ); + + + rightPanel.add(processInstances, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH)); + rightPanel.add(activities, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH)); + + // ----- + wrapper.add(leftPanel); + wrapper.add(rightPanel); + + panel.add(wrapper); + callback.onSuccess(panel); + + } + + private void loadDefinitions() + { + final DefaultListModel<String> model = + (DefaultListModel<String>) processDefinitions.getModel(); + + model.clear(); + + BPAFDataAccess rpcService = MessageBuilder.createCall( + new RemoteCallback<List<String>>() + { + + public void callback(List<String> response) + { + for (String id : response) + model.add(id); + + processDefinitions.layout(); + } + }, + BPAFDataAccess.class + ); + + rpcService.getProcessDefinitionKeys(); + + } + + private void loadInstances() + { + final DefaultListModel<String> model = + (DefaultListModel<String>) processInstances.getModel(); + + model.clear(); + + BPAFDataAccess rpcService = MessageBuilder.createCall( + new RemoteCallback<List<String>>() + { + + public void callback(List<String> response) + { + for (String id : response) + model.add(id); + + processInstances.layout(); + } + }, + BPAFDataAccess.class + ); + + rpcService.getProcessInstanceKeys( + processDefinitions.getItem( + processDefinitions.getSelectedIndex() + ) + ); + + + + } + + private void loadActivities() + { + final DefaultListModel<String> model = + (DefaultListModel<String>) activities.getModel(); + + model.clear(); + + BPAFDataAccess rpcService = MessageBuilder.createCall( + new RemoteCallback<List<String>>() + { + + public void callback(List<String> response) + { + for (String id : response) + model.add(id); + + activities.layout(); + } + }, + BPAFDataAccess.class + ); + + rpcService.getActivityKeys( + processInstances.getItem( + processInstances.getSelectedIndex() + ) + ); + + + + } + +} Added: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/MonitorUI.java =================================================================== --- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/MonitorUI.java (rev 0) +++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/MonitorUI.java 2010-03-11 12:01:28 UTC (rev 1002) @@ -0,0 +1,43 @@ +/* + * 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.monitor.gui.client; + +import com.google.gwt.core.client.EntryPoint; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.user.client.ui.Button; +import com.google.gwt.user.client.ui.RootPanel; +import org.jboss.errai.bus.client.ErraiBus; +import org.jboss.errai.bus.client.api.base.MessageBuilder; +import org.jboss.errai.bus.client.framework.MessageBus; + +public class MonitorUI implements EntryPoint +{ + /** + * Get an instance of the MessageBus + */ + private MessageBus bus = ErraiBus.get(); + + public void onModuleLoad() { + + } +} Added: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/server/BPAFService.java =================================================================== --- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/server/BPAFService.java (rev 0) +++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/server/BPAFService.java 2010-03-11 12:01:28 UTC (rev 1002) @@ -0,0 +1,58 @@ +/* + * 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.monitor.gui.server; + +import org.jboss.bpm.monitor.gui.client.BPAFDataAccess; +import org.jboss.bpm.monitor.model.BPAFDataSource; +import org.jboss.bpm.monitor.model.DefaultBPAFDataSource; +import org.jboss.errai.bus.client.api.Message; +import org.jboss.errai.bus.client.api.MessageCallback; +import org.jboss.errai.bus.server.annotations.Service; + +import java.util.ArrayList; +import java.util.List; + +@Service +public class BPAFService implements BPAFDataAccess +{ + BPAFDataSource dataSource; + + public BPAFService() + { + this.dataSource = new DefaultBPAFDataSource(); + } + + public List<String> getProcessDefinitionKeys() + { + return dataSource.getProcessDefinitions(); + } + + public List<String> getProcessInstanceKeys(String definition) + { + return dataSource.getProcessInstances(definition); + } + + public List<String> getActivityKeys(String instance) + { + return dataSource.getActivityDefinitions(instance); + } +} Added: activity-monitor/trunk/gui/war/src/main/java/roles.properties =================================================================== --- activity-monitor/trunk/gui/war/src/main/java/roles.properties (rev 0) +++ activity-monitor/trunk/gui/war/src/main/java/roles.properties 2010-03-11 12:01:28 UTC (rev 1002) @@ -0,0 +1,3 @@ +admin=admin +user=user +chatty=ChatAccess \ No newline at end of file Added: activity-monitor/trunk/gui/war/src/main/java/users.properties =================================================================== --- activity-monitor/trunk/gui/war/src/main/java/users.properties (rev 0) +++ activity-monitor/trunk/gui/war/src/main/java/users.properties 2010-03-11 12:01:28 UTC (rev 1002) @@ -0,0 +1,3 @@ +admin=admin +user=user +chatty=chat \ No newline at end of file Added: activity-monitor/trunk/gui/war/war/App.css =================================================================== --- activity-monitor/trunk/gui/war/war/App.css (rev 0) +++ activity-monitor/trunk/gui/war/war/App.css 2010-03-11 12:01:28 UTC (rev 1002) @@ -0,0 +1,7 @@ +body { + background-color: #ffffff; + color: black; + font-family: Arial, sans-serif; + font-size: small; + margin: 8px; +} Added: activity-monitor/trunk/gui/war/war/App.html =================================================================== --- activity-monitor/trunk/gui/war/war/App.html (rev 0) +++ activity-monitor/trunk/gui/war/war/App.html 2010-03-11 12:01:28 UTC (rev 1002) @@ -0,0 +1,12 @@ +<html> +<head> + <title>Errai Application</title> + <link rel="stylesheet" type="text/css" href="App.css"> + <script type="text/javascript" language="javascript" src="app/app.nocache.js"></script> +</head> +<body> + +<div id="rootPanel"></div> + +</body> +</html> Added: activity-monitor/trunk/gui/war/war/WEB-INF/web.xml =================================================================== --- activity-monitor/trunk/gui/war/war/WEB-INF/web.xml (rev 0) +++ activity-monitor/trunk/gui/war/war/WEB-INF/web.xml 2010-03-11 12:01:28 UTC (rev 1002) @@ -0,0 +1,33 @@ +<web-app xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee + http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" + version="2.5"> + + <servlet> + <servlet-name>ErraiServlet</servlet-name> + <servlet-class>org.jboss.errai.bus.server.servlet.DefaultBlockingServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + + <servlet-mapping> + <servlet-name>ErraiServlet</servlet-name> + <url-pattern>*.erraiBus</url-pattern> + </servlet-mapping> + + <context-param> + <param-name>errai.properties</param-name> + <param-value>/WEB-INF/errai.properties</param-value> + </context-param> + + <context-param> + <param-name>login.config</param-name> + <param-value>/WEB-INF/login.config</param-value> + </context-param> + + <context-param> + <param-name>users.properties</param-name> + <param-value>/WEB-INF/users.properties</param-value> + </context-param> + +</web-app> \ No newline at end of file Modified: activity-monitor/trunk/model/pom.xml =================================================================== --- activity-monitor/trunk/model/pom.xml 2010-03-11 09:37:39 UTC (rev 1001) +++ activity-monitor/trunk/model/pom.xml 2010-03-11 12:01:28 UTC (rev 1002) @@ -41,8 +41,7 @@ <dependency> <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - <version>5.1.12</version> + <artifactId>mysql-connector-java</artifactId> <scope>provided</scope> </dependency> </dependencies> Modified: activity-monitor/trunk/pom.xml =================================================================== --- activity-monitor/trunk/pom.xml 2010-03-11 09:37:39 UTC (rev 1001) +++ activity-monitor/trunk/pom.xml 2010-03-11 12:01:28 UTC (rev 1002) @@ -48,12 +48,12 @@ <stax-api.version>1.0-2</stax-api.version> <errai.version>1.1-SNAPSHOT</errai.version> <hibernate.version>3.3.1.GA</hibernate.version> - + </properties> - <modules> -  + <modules> +  + <module>gui/war</module> <module>model</module> <module>emu</module> </modules> @@ -67,8 +67,8 @@ <artifactId>commons-logging</artifactId> <version>${commons.logging.version}</version> </dependency> - -  + +  <dependency> <groupId>org.jboss.errai</groupId> <artifactId>errai-workspaces</artifactId> @@ -144,13 +144,20 @@ <artifactId>javassist</artifactId> <version>3.4.GA</version> </dependency> - + + <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>5.1.12</version> + <scope>provided</scope> + </dependency> + </dependencies> </dependencyManagement> <build> <plugins> - + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId>

14 years, 2 months

1
0
0 / 0

Overlord SVN: r1001 - activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model.

by overlord-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2010-03-11 04:37:39 -0500 (Thu, 11 Mar 2010) New Revision: 1001 Modified: activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/Runner.java Log: Modified: activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/Runner.java =================================================================== --- activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/Runner.java 2010-03-11 09:31:25 UTC (rev 1000) +++ activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/Runner.java 2010-03-11 09:37:39 UTC (rev 1001) @@ -60,9 +60,7 @@ System.out.println(Metrics.getInstanceAverage(instanceHistory)); // instance events - String instance1 = instances.get(0); - String instance2 = instances.get(1); - List<Event> activityHistory = ds.getInstanceEvents(instance1, instance2); + List<Event> activityHistory = ds.getInstanceEvents(instances.toArray(new String[] {})); System.out.println("Instance events: "+activityHistory.size()); for(String s : activities)

14 years, 2 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

overlord-commits March 2010