JBoss JBPM SVN: r3274 - in jbpm4/trunk/modules: api/src/main/resources and 12 other directories.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2008-12-08 11:53:26 -0500 (Mon, 08 Dec 2008)
New Revision: 3274
Added:
jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/
jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/xml/
jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/xml/JpdlXmlTest.java
jbpm4/trunk/modules/jpdl/src/test/resources/org/
jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/
jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/
jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/
jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/extended.jpdl.xml
jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/invalid.jpdl.xml
jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/valid.jpdl.xml
Modified:
jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskService.java
jbpm4/trunk/modules/api/src/main/resources/jpdl.xsd
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parser.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemList.java
jbpm4/trunk/modules/userguide/.settings/attachedFile.properties
jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch04-Jpdl.xml
Log:
starting jpdl schema docs and validation
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskService.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskService.java 2008-12-08 16:04:25 UTC (rev 3273)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskService.java 2008-12-08 16:53:26 UTC (rev 3274)
@@ -32,8 +32,7 @@
*/
public interface TaskService {
- /** Creates a task with the given identifier.
- * The returned task will be transient.
+ /** Creates a not-yet-persisted task with the given identifier.
* Use {@link #saveTask(Task)} to persist the task. */
Task newTask(String taskId);
Modified: jbpm4/trunk/modules/api/src/main/resources/jpdl.xsd
===================================================================
--- jbpm4/trunk/modules/api/src/main/resources/jpdl.xsd 2008-12-08 16:04:25 UTC (rev 3273)
+++ jbpm4/trunk/modules/api/src/main/resources/jpdl.xsd 2008-12-08 16:53:26 UTC (rev 3274)
@@ -4,8 +4,9 @@
targetNamespace="http://jbpm.org/4/jpdl"
xmlns:tns="http://jbpm.org/4/jpdl"
elementFormDefault="qualified"
- attributeFormDefault="qualified">
+ attributeFormDefault="unqualified">
+
<annotation>
<documentation>Schema for jPDL 4 process descriptions;
element process is the top level element.
@@ -40,36 +41,42 @@
is the top level element in a jPDL process file.</documentation></annotation>
<complexType>
<sequence minOccurs="0" maxOccurs="unbounded">
- <group ref="tns:activityGroup" minOccurs="0" maxOccurs="unbounded"/>
+ <group ref="tns:activityGroup" minOccurs="0" maxOccurs="unbounded" />
<!--
- <element ref="tns:on" minOccurs="0" maxOccurs="unbounded">
+ <element ref="tns:on" minOccurs="0" maxOccurs="unbounded">
<annotation><documentation>Events on which listeners can be registered.</documentation></annotation>
- </element>
- <element ref="tns:timer" minOccurs="0" maxOccurs="unbounded"/>
- -->
+ </element>
+ <element ref="tns:timer" minOccurs="0" maxOccurs="unbounded"/>
+ -->
</sequence>
<attribute name="name" use="required" type="string">
- <annotation><documentation>The process name. Multiple processes can
- be deployed with the same name, as long as they have a different
- version.</documentation></annotation>
+ <annotation>
+ <documentation>
+ The process name. Multiple processes can be deployed with the same name, as long as they have a different
+ version.
+ </documentation>
+ </annotation>
</attribute>
<attribute name="key" type="string">
- <annotation><documentation>The key can be used to provide a short
- acronym that will replace the name as the basis for the generated
- process definition id
- </documentation></annotation>
+ <annotation>
+ <documentation>
+ The key can be used to provide a short acronym that will replace the name as the basis for the generated
+ process definition id
+ </documentation>
+ </annotation>
</attribute>
<attribute name="version" type="int">
- <annotation><documentation>Indicates the sequence number of this
- version for all processes with the same name. By specifying a version
- automatic deployment can figure out if this process is already deployed
- or not.
- </documentation></annotation>
+ <annotation>
+ <documentation>
+ Indicates the sequence number of this version for all processes with the same name. By specifying a version
+ automatic deployment can figure out if this process is already deployed or not.
+ </documentation>
+ </annotation>
</attribute>
- <attribute name="g" type="string">
- <annotation><documentation>Graphical information used by designer tool.
+ <anyAttribute processContents="skip">
+ <annotation><documentation>for extensibility
</documentation></annotation>
- </attribute>
+ </anyAttribute>
</complexType>
</element>
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java 2008-12-08 16:04:25 UTC (rev 3273)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java 2008-12-08 16:53:26 UTC (rev 3274)
@@ -21,7 +21,6 @@
*/
package org.jbpm.jpdl.xml;
-import java.io.InputStream;
import java.net.URL;
import java.util.ArrayList;
import java.util.Enumeration;
Added: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/xml/JpdlXmlTest.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/xml/JpdlXmlTest.java (rev 0)
+++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/xml/JpdlXmlTest.java 2008-12-08 16:53:26 UTC (rev 3274)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jbpm.test.xml;
+
+import java.util.List;
+
+import org.jbpm.Problem;
+import org.jbpm.jpdl.xml.JpdlParser;
+import org.jbpm.test.JbpmTestCase;
+
+/**
+ * @author Tom Baeyens
+ */
+public class JpdlXmlTest extends JbpmTestCase {
+
+ public void testValidXml() {
+ List<Problem> problems = new JpdlParser()
+ .createParse()
+ .setResource("org/jbpm/test/xml/valid.jpdl.xml")
+ .execute()
+ .getProblems();
+
+ assertEquals(problems.toString(), 0, problems.size());
+ }
+
+ public void testInvalidXml() {
+ List<Problem> problems = new JpdlParser()
+ .createParse()
+ .setResource("org/jbpm/test/xml/invalid.jpdl.xml")
+ .execute()
+ .getProblems();
+
+ assertEquals(problems.toString(), 1, problems.size());
+ }
+}
Property changes on: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/xml/JpdlXmlTest.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/extended.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/extended.jpdl.xml (rev 0)
+++ jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/extended.jpdl.xml 2008-12-08 16:53:26 UTC (rev 3274)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<process name="Purchase order" xmlns="http://jbpm.org/4/jpdl"
+ xmlns:ext="http://jbpm.org/customextensions">
+
+ <start>
+ <flow to="a"/>
+ </start>
+
+ <customactivity name="a" customattrib="xxx">
+ <customconfigelement a="yyy" />
+ <flow to="end"/>
+ </customactivity>
+
+ <end name="end" />
+
+</process>
Property changes on: jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/extended.jpdl.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/invalid.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/invalid.jpdl.xml (rev 0)
+++ jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/invalid.jpdl.xml 2008-12-08 16:53:26 UTC (rev 3274)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<process name="Purchase order" xmlns="http://jbpm.org/4/jpdl">
+
+ <start />
+
+ <buzzz>
+
+ </buzzz>
+
+</process>
Property changes on: jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/invalid.jpdl.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/valid.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/valid.jpdl.xml (rev 0)
+++ jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/valid.jpdl.xml 2008-12-08 16:53:26 UTC (rev 3274)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<process name="Purchase order" xmlns="http://jbpm.org/4/jpdl">
+
+ <start>
+ <flow to="a" />
+ </start>
+
+ <state name="a">
+ <flow name="Supplier ok" to="b" />
+ </state>
+
+ <state name="b">
+ <flow name="nok" to="Error" />
+ <flow name="ok" to="Completed" />
+ </state >
+
+ <end name="Completed" />
+
+ <end name="Error" />
+
+</process>
Property changes on: jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/valid.jpdl.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parser.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parser.java 2008-12-08 16:04:25 UTC (rev 3273)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parser.java 2008-12-08 16:53:26 UTC (rev 3274)
@@ -21,13 +21,17 @@
*/
package org.jbpm.pvm.internal.xml;
+import java.io.File;
import java.util.HashMap;
import java.util.Map;
+import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.Source;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
-import org.jbpm.JbpmException;
import org.jbpm.log.Log;
import org.jbpm.pvm.internal.stream.StreamSource;
import org.jbpm.pvm.internal.util.UrlEntity;
@@ -243,6 +247,15 @@
private static Log log = Log.getLog(Parser.class.getName());
protected DocumentBuilderFactory documentBuilderFactory = null;
+
+ /* TODO add schema's
+Source schemaSource = new StreamSource(inputStream);
+SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+Schema schema = schemaFactory.newSchema(schemaSource);
+// Instead of explicitly validating, assign the Schema to the factory
+factory.setSchema(schema);
+ */
+
protected Map<String, Entity> entities = null;
protected Bindings bindings = null;
protected ClassLoader classLoader = null;
@@ -286,7 +299,8 @@
* of the documentBuilderFactory. Can be overridden by subclasses to change
* the DocumentBuilderFactory implementation or to apply specific configurations. */
protected DocumentBuilderFactory newDocumentBuilderFactory() {
- return DocumentBuilderFactory.newInstance();
+ DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ return factory;
}
// entities /////////////////////////////////////////////////////////////////
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemList.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemList.java 2008-12-08 16:04:25 UTC (rev 3273)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemList.java 2008-12-08 16:53:26 UTC (rev 3274)
@@ -23,6 +23,7 @@
import java.io.Serializable;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import org.jbpm.Problem;
@@ -47,6 +48,9 @@
/** all problems encountered */
public List<Problem> getProblems() {
+ if (problems==null) {
+ return Collections.EMPTY_LIST;
+ }
return (List) problems;
}
Modified: jbpm4/trunk/modules/userguide/.settings/attachedFile.properties
===================================================================
--- jbpm4/trunk/modules/userguide/.settings/attachedFile.properties 2008-12-08 16:04:25 UTC (rev 3273)
+++ jbpm4/trunk/modules/userguide/.settings/attachedFile.properties 2008-12-08 16:53:26 UTC (rev 3274)
@@ -1,2 +1,2 @@
## index of importer -> set(imports)
-#Thu Dec 04 15:25:44 CET 2008
+#Mon Dec 08 10:14:36 CET 2008
Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch04-Jpdl.xml
===================================================================
--- jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch04-Jpdl.xml 2008-12-08 16:04:25 UTC (rev 3273)
+++ jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch04-Jpdl.xml 2008-12-08 16:53:26 UTC (rev 3274)
@@ -2,36 +2,188 @@
<title>jPDL</title>
<para>This chapter will explain the jPDL file format for describing
- process definitions.
+ process definitions. The schemadocs can also serve as a quick reference for this
+ information.
</para>
+ <para>An example jPDL process file looks like this:
+ </para>
+ <programlisting><?xml version="1.0" encoding="UTF-8"?>
+
+<process name="Purchase order" xmlns="http://jbpm.org/4/jpdl">
+
+ <start>
+ <flow to="Verify supplier" />
+ </start>
+
+ <state name="Verify supplier">
+ <flow name="Supplier ok" to="Check supplier data" />
+ <flow name="Supplier not ok" to="Error" />
+ </state>
+
+ <exclusive name="Check supplier data">
+ <flow name="nok" to="Error" />
+ <flow name="ok" to="Completed" />
+ </exclusive>
+
+ <end name="Completed" />
+
+ <end name="Error" />
+
+</process></programlisting>
<section id="process">
<title><literal>process</literal></title>
- <para></para>
+ <para>The top level element representing one process definition.
+ </para>
+ <table><title><literal>process</literal> attributes:</title>
+ <tgroup cols="5" rowsep="1" colsep="1">
+ <thead>
+ <row>
+ <entry>Attribute</entry>
+ <entry>Type</entry>
+ <entry>Default</entry>
+ <entry>Required?</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry><literal>name</literal></entry>
+ <entry>any text</entry>
+ <entry></entry>
+ <entry><emphasis role="bold">required</emphasis></entry>
+ <entry>name or label of the process used to display to the process
+ name in user interactions.
+ </entry>
+ </row>
+ <row>
+ <entry><literal>key</literal></entry>
+ <entry>alpha numeric characters and underscores</entry>
+ <entry>if omitted, the key will be generated based on the name by replacing
+ all non-alpha-numeric characters with underscores</entry>
+ <entry>optional</entry>
+ <entry>identification to distinct different process definitions.
+ Multiple versions of a process with the same key can be deployed.
+ The key:name combination must remain exactly the same for all
+ deployed versions.
+ </entry>
+ </row>
+ <row>
+ <entry><literal>version</literal></entry>
+ <entry>integer</entry>
+ <entry>one higher then highest version number starting with 1 if no other process
+ is deployed with the same name/key.
+ </entry>
+ <entry>optional</entry>
+ <entry>version number of this process</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <table><title><literal>process</literal> elements:</title>
+ <tgroup cols="3" rowsep="1" colsep="1">
+ <thead>
+ <row>
+ <entry>Element</entry>
+ <entry>Multiplicity</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry><literal>description</literal></entry>
+ <entry>0..1</entry>
+ <entry>description text</entry>
+ </row>
+ <row>
+ <entry><link linkend="activities">activities</link></entry>
+ <entry>1..*</entry>
+ <entry>a list of any activity type can be placed here. At least
+ one <literal>start</literal> activity must be present.
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
</section>
<section id="activities">
<title>Activities</title>
- <para>Diff between node and activity?</para>
-
+ <para>(BPMN note: when we mention activities here, we are not only refering to BPMN
+ activities, but also to BPMN events and BPMN gateways.)
+ </para>
+
<section id="start">
<title><literal>start</literal></title>
- <para>TODO</para>
+ <para>Indicates where an execution for this process starts. Typically there is
+ exactly one start activity in a process. A process has to have at least one start
+ activity. A start activity must have exactly one outgoing flow and that flow
+ is taken when a process execution starts.
+ </para>
+ <table><title><literal>start</literal> attributes:</title>
+ <tgroup cols="5" rowsep="1" colsep="1">
+ <thead>
+ <row>
+ <entry>Attribute</entry>
+ <entry>Type</entry>
+ <entry>Default</entry>
+ <entry>Required?</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry><literal>name</literal></entry>
+ <entry>any text</entry>
+ <entry></entry>
+ <entry>optional</entry>
+ <entry>name of the start activity. Since a start activity
+ cannot have incoming flows, the name is optional.
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ <table><title><literal>start</literal> elements:</title>
+ <tgroup cols="3" rowsep="1" colsep="1">
+ <thead>
+ <row>
+ <entry>Element</entry>
+ <entry>Multiplicity</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry><literal>flow</literal></entry>
+ <entry>1</entry>
+ <entry>the outgoing flow</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
</section>
<section id="state">
<title><literal>state</literal></title>
- <para>TODO</para>
+ <para>A wait state. Process execution will wait until an external trigger is
+ provided through the API.
+ </para>
</section>
<section id="exclusive">
<title><literal>exclusive</literal></title>
- <para>TODO</para>
+ <para>Takes one path of many alternatives. Also known as a decision. An exclusive
+ activity has multiple outgoing flows and when an execution arrives in an exclusive
+ activity, an automatic evaluation will decide which outgoing flow is taken.
+ </para>
</section>
<section id="end">
<title><literal>end</literal></title>
- <para>TODO</para>
+ <para>Ends the execution.
+ </para>
</section>
</section>
17 years, 4 months
- 1
- 0
JBoss JBPM SVN: r3273 - projects/gwt-console/trunk/war.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-12-08 11:04:25 -0500 (Mon, 08 Dec 2008)
New Revision: 3273
Modified:
projects/gwt-console/trunk/war/README.txt
projects/gwt-console/trunk/war/pom.xml
Log:
Updte readme regarding the codehaus mojo fuckup
Modified: projects/gwt-console/trunk/war/README.txt
===================================================================
--- projects/gwt-console/trunk/war/README.txt 2008-12-08 14:38:05 UTC (rev 3272)
+++ projects/gwt-console/trunk/war/README.txt 2008-12-08 16:04:25 UTC (rev 3273)
@@ -1,7 +1,8 @@
Running in hosted mode:
----------------------
-mvn compile gwt:gwt
+mvn compile gwt:gwt (doesn't work anymore, because the plugins get merged)
+IMPORTANT: http://code.google.com/p/gwt-maven/wiki/M2FAQ
When the hosted browser is started, simple hit the 'refresh' button to recompile
and verfiy changes.
Modified: projects/gwt-console/trunk/war/pom.xml
===================================================================
--- projects/gwt-console/trunk/war/pom.xml 2008-12-08 14:38:05 UTC (rev 3272)
+++ projects/gwt-console/trunk/war/pom.xml 2008-12-08 16:04:25 UTC (rev 3273)
@@ -14,6 +14,10 @@
<relativePath>../pom.xml</relativePath>
</parent>
+ <properties>
+ <gwt-maven.version>2.0-beta24</gwt-maven.version>
+ </properties>
+
<!-- Dependencies -->
<dependencies>
@@ -82,10 +86,12 @@
<plugin>
<groupId>com.totsp.gwt</groupId>
<artifactId>maven-googlewebtoolkit2-plugin</artifactId>
- <version>2.0-beta24</version>
+ <version>${gwt-maven.version}</version>
<configuration>
<logLevel>INFO</logLevel>
- <compileTargets><value>org.jboss.bpm.console.Application</value></compileTargets>
+ <compileTargets>
+ <value>org.jboss.bpm.console.Application</value>
+ </compileTargets>
<runTarget>org.jboss.bpm.console.Application/Application.html</runTarget>
<style>DETAILED</style>
<noServer>false</noServer>
@@ -206,13 +212,14 @@
</activation>
</profile>
- <profile>
+ <!--profile>
<id>alltests</id>
<build>
<plugins>
<plugin>
<groupId>com.totsp.gwt</groupId>
<artifactId>maven-googlewebtoolkit2-plugin</artifactId>
+ <version>${gwt-maven.version}</version>
<executions>
<execution>
<goals>
@@ -226,6 +233,6 @@
</plugin>
</plugins>
</build>
- </profile>
+ </profile-->
</profiles>
</project>
17 years, 4 months
- 1
- 0
JBoss JBPM SVN: r3272 - in jbpm3/trunk/modules/integration/jboss42: src/main/etc and 1 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-12-08 09:38:05 -0500 (Mon, 08 Dec 2008)
New Revision: 3272
Added:
jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/PARDeployerInterceptorEJB3.java
jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/PARDeployerInterceptorEJB3MBean.java
Removed:
jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/ProcessArchiveDeployerInterceptorEJB3.java
jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/ProcessArchiveDeployerInterceptorEJB3MBean.java
Modified:
jbpm3/trunk/modules/integration/jboss42/.classpath
jbpm3/trunk/modules/integration/jboss42/src/main/etc/bpm-process-deployer.xml
Log:
Update PARDeployerInterceptor
Modified: jbpm3/trunk/modules/integration/jboss42/.classpath
===================================================================
--- jbpm3/trunk/modules/integration/jboss42/.classpath 2008-12-08 14:27:35 UTC (rev 3271)
+++ jbpm3/trunk/modules/integration/jboss42/.classpath 2008-12-08 14:38:05 UTC (rev 3272)
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
Modified: jbpm3/trunk/modules/integration/jboss42/src/main/etc/bpm-process-deployer.xml
===================================================================
--- jbpm3/trunk/modules/integration/jboss42/src/main/etc/bpm-process-deployer.xml 2008-12-08 14:27:35 UTC (rev 3271)
+++ jbpm3/trunk/modules/integration/jboss42/src/main/etc/bpm-process-deployer.xml 2008-12-08 14:38:05 UTC (rev 3272)
@@ -7,13 +7,11 @@
-->
<server>
- <!--
- <mbean code="org.jbpm.integration.jboss42.ProcessArchiveDeployerInterceptorEJB3" name="jboss.bpm:service=ProcessArchiveDeployerInterceptorEJB3">
+ <mbean code="org.jbpm.integration.jboss42.PARDeployerInterceptorEJB3" name="jboss.bpm:service=PARDeployerEJB3">
<depends-list optional-attribute-name="Interceptables">
<depends-list-element>jboss.ejb3:service=EJB3Deployer</depends-list-element>
</depends-list>
</mbean>
- -->
<mbean code="org.jbpm.integration.jboss42.ProcessXMLSubDeployer" name="jboss.bpm:service=ProcessXMLDeployer">
</mbean>
Copied: jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/PARDeployerInterceptorEJB3.java (from rev 3271, jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/ProcessArchiveDeployerInterceptorEJB3.java)
===================================================================
--- jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/PARDeployerInterceptorEJB3.java (rev 0)
+++ jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/PARDeployerInterceptorEJB3.java 2008-12-08 14:38:05 UTC (rev 3272)
@@ -0,0 +1,100 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jbpm.integration.jboss42;
+
+//$Id$
+
+import org.jboss.deployment.DeploymentInfo;
+import org.jboss.deployment.MainDeployerMBean;
+import org.jboss.deployment.SubDeployerInterceptorSupport;
+import org.jboss.mx.server.Invocation;
+import org.jboss.mx.util.MBeanProxy;
+
+/**
+ * A deployer service that manages BPM Process Deployments
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 08-Dec-2008
+ */
+public class PARDeployerInterceptorEJB3 extends SubDeployerInterceptorSupport implements PARDeployerInterceptorEJB3MBean
+{
+ // The main deployer
+ private MainDeployerMBean mainDeployer;
+
+ @Override
+ protected final Object create(Invocation invocation, DeploymentInfo di) throws Throwable
+ {
+ Object retn = invokeNext(invocation);
+
+ ProcessDeploymentHelper depHelper = new ProcessDeploymentHelper();
+ depHelper.create(di);
+
+ return retn;
+ }
+
+ @Override
+ protected final Object destroy(Invocation invocation, DeploymentInfo di) throws Throwable
+ {
+ Object retn = invokeNext(invocation);
+
+ ProcessDeploymentHelper depHelper = new ProcessDeploymentHelper();
+ depHelper.destroy(di);
+
+ return retn;
+ }
+
+ /**
+ * Create the deployer service
+ */
+ protected void createService() throws Exception
+ {
+ mainDeployer = (MainDeployerMBean)MBeanProxy.get(MainDeployerMBean.class, MainDeployerMBean.OBJECT_NAME, server);
+ super.attach();
+ }
+
+ /**
+ * Destroy the deployer service
+ */
+ protected void destroyService()
+ {
+ super.detach();
+ }
+
+ /**
+ * Handle all process deployment exceptions.
+ * You can either simply log the problem and keep the EJB/WAR module alive or undeploy properly.
+ */
+ protected void handleStartupException(DeploymentInfo di, Throwable th)
+ {
+ log.error("Cannot startup process for: " + di.shortName, th);
+ mainDeployer.undeploy(di);
+ }
+
+ /**
+ * Handle all process deployment exceptions.
+ * You can either simply logs the problem and keep the EJB/WAR module alive or undeploy properly.
+ */
+ protected void handleShutdownException(String moduleName, Throwable th)
+ {
+ log.error("Cannot shutdown process for: " + moduleName, th);
+ }
+}
\ No newline at end of file
Copied: jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/PARDeployerInterceptorEJB3MBean.java (from rev 3271, jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/ProcessArchiveDeployerInterceptorEJB3MBean.java)
===================================================================
--- jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/PARDeployerInterceptorEJB3MBean.java (rev 0)
+++ jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/PARDeployerInterceptorEJB3MBean.java 2008-12-08 14:38:05 UTC (rev 3272)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jbpm.integration.jboss42;
+
+//$Id$
+
+import javax.management.ObjectName;
+
+import org.jboss.bpm.api.model.builder.ObjectNameFactory;
+import org.jboss.deployment.SubDeployerInterceptorMBean;
+
+/**
+ * A deployer service that manages BPM Process Deployments
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 08-Dec-2008
+ */
+public interface PARDeployerInterceptorEJB3MBean extends SubDeployerInterceptorMBean
+{
+ // default object name
+ public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.bpm:service=BPMDeployerEJB3");
+}
\ No newline at end of file
Deleted: jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/ProcessArchiveDeployerInterceptorEJB3.java
===================================================================
--- jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/ProcessArchiveDeployerInterceptorEJB3.java 2008-12-08 14:27:35 UTC (rev 3271)
+++ jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/ProcessArchiveDeployerInterceptorEJB3.java 2008-12-08 14:38:05 UTC (rev 3272)
@@ -1,100 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.jbpm.integration.jboss42;
-
-//$Id$
-
-import org.jboss.deployment.DeploymentInfo;
-import org.jboss.deployment.MainDeployerMBean;
-import org.jboss.deployment.SubDeployerInterceptorSupport;
-import org.jboss.mx.server.Invocation;
-import org.jboss.mx.util.MBeanProxy;
-
-/**
- * A deployer service that manages BPM Process Deployments
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 08-Dec-2008
- */
-public class ProcessArchiveDeployerInterceptorEJB3 extends SubDeployerInterceptorSupport implements ProcessArchiveDeployerInterceptorEJB3MBean
-{
- // The main deployer
- private MainDeployerMBean mainDeployer;
-
- @Override
- protected final Object create(Invocation invocation, DeploymentInfo di) throws Throwable
- {
- Object retn = invokeNext(invocation);
-
- ProcessDeploymentHelper depHelper = new ProcessDeploymentHelper();
- depHelper.create(di);
-
- return retn;
- }
-
- @Override
- protected final Object destroy(Invocation invocation, DeploymentInfo di) throws Throwable
- {
- Object retn = invokeNext(invocation);
-
- ProcessDeploymentHelper depHelper = new ProcessDeploymentHelper();
- depHelper.destroy(di);
-
- return retn;
- }
-
- /**
- * Create the deployer service
- */
- protected void createService() throws Exception
- {
- mainDeployer = (MainDeployerMBean)MBeanProxy.get(MainDeployerMBean.class, MainDeployerMBean.OBJECT_NAME, server);
- super.attach();
- }
-
- /**
- * Destroy the deployer service
- */
- protected void destroyService()
- {
- super.detach();
- }
-
- /**
- * Handle all process deployment exceptions.
- * You can either simply log the problem and keep the EJB/WAR module alive or undeploy properly.
- */
- protected void handleStartupException(DeploymentInfo di, Throwable th)
- {
- log.error("Cannot startup process for: " + di.shortName, th);
- mainDeployer.undeploy(di);
- }
-
- /**
- * Handle all process deployment exceptions.
- * You can either simply logs the problem and keep the EJB/WAR module alive or undeploy properly.
- */
- protected void handleShutdownException(String moduleName, Throwable th)
- {
- log.error("Cannot shutdown process for: " + moduleName, th);
- }
-}
\ No newline at end of file
Deleted: jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/ProcessArchiveDeployerInterceptorEJB3MBean.java
===================================================================
--- jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/ProcessArchiveDeployerInterceptorEJB3MBean.java 2008-12-08 14:27:35 UTC (rev 3271)
+++ jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/ProcessArchiveDeployerInterceptorEJB3MBean.java 2008-12-08 14:38:05 UTC (rev 3272)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.jbpm.integration.jboss42;
-
-//$Id$
-
-import javax.management.ObjectName;
-
-import org.jboss.bpm.api.model.builder.ObjectNameFactory;
-import org.jboss.deployment.SubDeployerInterceptorMBean;
-
-/**
- * A deployer service that manages BPM Process Deployments
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 08-Dec-2008
- */
-public interface ProcessArchiveDeployerInterceptorEJB3MBean extends SubDeployerInterceptorMBean
-{
- // default object name
- public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.bpm:service=BPMDeployerEJB3");
-}
\ No newline at end of file
17 years, 4 months
- 1
- 0
JBoss JBPM SVN: r3271 - in jbpm3/trunk: modules/distribution and 7 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-12-08 09:27:35 -0500 (Mon, 08 Dec 2008)
New Revision: 3271
Added:
jbpm3/trunk/modules/integration/jboss42/src/main/etc/bpm-process-deployer.xml
jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/ProcessArchiveDeployerInterceptorEJB3.java
jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/ProcessArchiveDeployerInterceptorEJB3MBean.java
jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/ProcessDeploymentHelper.java
jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/ProcessXMLSubDeployer.java
jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/ProcessXMLSubDeployerMBean.java
Removed:
jbpm3/trunk/modules/integration/jboss42/src/main/etc/par-deployer.xml
jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/PARSubDeployer.java
jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/PARSubDeployerMBean.java
jbpm3/trunk/modules/integration/jboss42/src/main/resources/
Modified:
jbpm3/trunk/modules/distribution/pom.xml
jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml
jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml
jbpm3/trunk/modules/distribution/src/main/resources/installer/user-input-spec.xml
jbpm3/trunk/modules/integration/jboss42/deploy.sh
jbpm3/trunk/modules/integration/jboss42/pom.xml
jbpm3/trunk/modules/integration/jboss42/scripts/assembly-config.xml
jbpm3/trunk/profiles.xml.example
Log:
Add ProcessArchiveDeployerInterceptorEJB3
Modified: jbpm3/trunk/modules/distribution/pom.xml
===================================================================
--- jbpm3/trunk/modules/distribution/pom.xml 2008-12-08 13:14:54 UTC (rev 3270)
+++ jbpm3/trunk/modules/distribution/pom.xml 2008-12-08 14:27:35 UTC (rev 3271)
@@ -30,72 +30,73 @@
<dependencies>
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jbpm-db</artifactId>
+ <artifactId>bpm-spec-integration-jboss42</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jbpm-enterprise-beans</artifactId>
+ <artifactId>bpm-spec-integration-jboss42</artifactId>
+ <classifier>config</classifier>
<version>${version}</version>
- <type>ejb</type>
</dependency>
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jbpm-enterprise-beans</artifactId>
- <classifier>config</classifier>
+ <artifactId>bpm-spec-integration-jbpm3</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jbpm-enterprise-bundle</artifactId>
+ <artifactId>bpm-spec-integration-jbpm3</artifactId>
+ <classifier>config</classifier>
<version>${version}</version>
- <type>ear</type>
</dependency>
+
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jbpm-examples</artifactId>
- <classifier>examples</classifier>
+ <artifactId>jbpm-db</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jbpm-identity</artifactId>
+ <artifactId>jbpm-enterprise-beans</artifactId>
<version>${version}</version>
+ <type>ejb</type>
</dependency>
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jbpm-identity</artifactId>
+ <artifactId>jbpm-enterprise-beans</artifactId>
<classifier>config</classifier>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jbpm-identity</artifactId>
- <classifier>service</classifier>
+ <artifactId>jbpm-enterprise-bundle</artifactId>
<version>${version}</version>
- <type>zip</type>
+ <type>ear</type>
</dependency>
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jbpm-integration-jboss42</artifactId>
+ <artifactId>jbpm-examples</artifactId>
+ <classifier>examples</classifier>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
- <artifactId>bpm-spec-integration-jbpm3</artifactId>
+ <artifactId>jbpm-identity</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
- <artifactId>bpm-spec-integration-jbpm3</artifactId>
+ <artifactId>jbpm-identity</artifactId>
<classifier>config</classifier>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jbpm-integration-jboss42</artifactId>
- <classifier>config</classifier>
+ <artifactId>jbpm-identity</artifactId>
+ <classifier>service</classifier>
<version>${version}</version>
+ <type>zip</type>
</dependency>
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
Modified: jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml
===================================================================
--- jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml 2008-12-08 13:14:54 UTC (rev 3270)
+++ jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml 2008-12-08 14:27:35 UTC (rev 3271)
@@ -55,7 +55,7 @@
<useStrictFiltering>true</useStrictFiltering>
<includes>
<include>*:bpm-spec-integration-jbpm3:jar:config</include>
- <include>*:jbpm-integration-jboss42:jar:config</include>
+ <include>*:bpm-spec-integration-jboss42:jar:config</include>
</includes>
<unpack>true</unpack>
</dependencySet>
Modified: jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml 2008-12-08 13:14:54 UTC (rev 3270)
+++ jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml 2008-12-08 14:27:35 UTC (rev 3271)
@@ -145,6 +145,8 @@
<include name="activation.jar" />
<include name="antlr.jar" />
<include name="asm.jar" />
+ <include name="bpm-spec-integration-jbpm3" />
+ <include name="bpm-spec-integration-jboss42.jar" />
<include name="bsh.jar" />
<include name="cglib.jar" />
<include name="commons-collections.jar" />
@@ -155,8 +157,6 @@
<include name="jbpm-enterprise-bundle.ear" />
<include name="jbpm-jpdl.jar" />
<include name="jbpm-identity.jar" />
- <include name="bpm-spec-integration-jbpm3" />
- <include name="jbpm-integration-jboss42.jar" />
<include name="junit.jar" />
<include name="jsf-console.war" />
<include name="slf4j-api.jar" />
@@ -175,11 +175,19 @@
<!-- jBPM3 Server Components -->
<pack name="jBPM3 Server Components" required="yes" preselected="yes">
+
<description>The jBPM3 Server Components</description>
+ <!-- server/lib -->
+ <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${installPath}/server/${jbossTargetServer}/lib" override="true">
+ <include name="bpm-spec-api.jar" />
+ <include name="bpm-spec-integration-jboss42.jar" />
+ <include name="slf4j-api.jar" />
+ <include name="slf4j-log4j12.jar" />
+ </fileset>
+
<!-- jbpm/jbpm-integration.beans -->
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-integration.beans" override="true">
- <include name="bpm-spec-api.jar" />
<include name="bpm-spec-dialect-api10.jar" />
<include name="bpm-spec-integration-jbpm3.jar" />
</fileset>
@@ -193,14 +201,11 @@
<include name="hibernate.extra.hbm.xml" />
</fileset>
<fileset dir="@{deploy.artifacts.dir}/resources/jbpm-integration-config" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true">
- <include name="par-deployer.xml" />
+ <include name="bpm-process-deployer.xml" />
</fileset>
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true">
<include name="jbpm-jpdl.jar" />
<include name="jbpm-identity.jar" />
- <include name="jbpm-integration-jboss42.jar" />
- <include name="slf4j-api.jar" />
- <include name="slf4j-log4j12.jar" />
</fileset>
<file src="@{deploy.artifacts.dir}/lib/jbpm-identity-service.zip" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"
unpack="true" override="true" />
@@ -216,6 +221,14 @@
<!-- jbpm-destinations-service -->
<file src="@{resources.dir}/destination/jbpm-destinations-service.xml" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm" />
+ <!--
+ ********************************
+ * *
+ * Database Configuration *
+ * *
+ ********************************
+ -->
+
<!-- database configs to docs/examples/jbpm -->
<fileset dir="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config" targetdir="${installPath}/docs/examples/jbpm" override="true">
<include name="hibernate.cfg.hsqldb.xml"/>
Modified: jbpm3/trunk/modules/distribution/src/main/resources/installer/user-input-spec.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/installer/user-input-spec.xml 2008-12-08 13:14:54 UTC (rev 3270)
+++ jbpm3/trunk/modules/distribution/src/main/resources/installer/user-input-spec.xml 2008-12-08 14:27:35 UTC (rev 3271)
@@ -4,9 +4,10 @@
<field type="radio" variable="jbossSelection">
<description align="left" txt="Please choose your target server" />
<spec>
- <choice txt="JBoss-4.2.2" value="jboss422" set="true" />
- <choice txt="JBoss-4.2.3" value="jboss423" />
- <choice txt="JBoss-5.0.0" value="jboss500" />
+ <choice txt="JBoss-5.0.0" value="jboss500" set="true"/>
+ <choice txt="JBoss-4.2.3" value="jboss423"/>
+ <choice txt="JBoss-4.2.2" value="jboss422"/>
+ <choice txt="None" value="noserver"/>
</spec>
</field>
<field type="text" variable="jbossTargetServer">
Modified: jbpm3/trunk/modules/integration/jboss42/deploy.sh
===================================================================
--- jbpm3/trunk/modules/integration/jboss42/deploy.sh 2008-12-08 13:14:54 UTC (rev 3270)
+++ jbpm3/trunk/modules/integration/jboss42/deploy.sh 2008-12-08 14:27:35 UTC (rev 3271)
@@ -1,5 +1,7 @@
#! /bin/bash
+mvn -o install
+
rm $JBOSS422/server/default/deploy/jbpm/jbpm-service.sar/jbpm-integration-jboss42*.jar
cp target/jbpm-integration-jboss42-3.3.1-SNAPSHOT.jar $JBOSS422/server/default/deploy/jbpm/jbpm-service.sar
-cp src/main/etc/par-deployer.xml $JBOSS422/server/default/deploy/jbpm/jbpm-service.sar
+cp src/main/etc/bpm-process-deployer.xml $JBOSS422/server/default/deploy/jbpm/jbpm-service.sar
Modified: jbpm3/trunk/modules/integration/jboss42/pom.xml
===================================================================
--- jbpm3/trunk/modules/integration/jboss42/pom.xml 2008-12-08 13:14:54 UTC (rev 3270)
+++ jbpm3/trunk/modules/integration/jboss42/pom.xml 2008-12-08 14:27:35 UTC (rev 3271)
@@ -17,7 +17,7 @@
<name>JBoss jBPM3 - Integration JBoss42</name>
<groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jbpm-integration-jboss42</artifactId>
+ <artifactId>bpm-spec-integration-jboss42</artifactId>
<packaging>jar</packaging>
<!-- Parent -->
@@ -38,11 +38,6 @@
<dependencies>
<!-- BPM Dependencies -->
<dependency>
- <groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jbpm-jpdl</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
<groupId>org.jboss.bpm</groupId>
<artifactId>bpm-spec-api</artifactId>
</dependency>
@@ -59,6 +54,16 @@
</dependency>
<dependency>
<groupId>jboss</groupId>
+ <artifactId>jboss-ejb3</artifactId>
+ <version>${jboss.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-ejb3x</artifactId>
+ <version>${jboss.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
<artifactId>jboss-jmx</artifactId>
<version>${jboss.version}</version>
</dependency>
Modified: jbpm3/trunk/modules/integration/jboss42/scripts/assembly-config.xml
===================================================================
--- jbpm3/trunk/modules/integration/jboss42/scripts/assembly-config.xml 2008-12-08 13:14:54 UTC (rev 3270)
+++ jbpm3/trunk/modules/integration/jboss42/scripts/assembly-config.xml 2008-12-08 14:27:35 UTC (rev 3271)
@@ -11,7 +11,7 @@
<outputDirectory>/</outputDirectory>
<includes>
<include>jboss-beans.xml</include>
- <include>par-deployer.xml</include>
+ <include>bpm-process-deployer.xml</include>
</includes>
</fileSet>
</fileSets>
Added: jbpm3/trunk/modules/integration/jboss42/src/main/etc/bpm-process-deployer.xml
===================================================================
--- jbpm3/trunk/modules/integration/jboss42/src/main/etc/bpm-process-deployer.xml (rev 0)
+++ jbpm3/trunk/modules/integration/jboss42/src/main/etc/bpm-process-deployer.xml 2008-12-08 14:27:35 UTC (rev 3271)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ The JBoss service configuration file for the PAR deployer service.
+
+ $Id$
+-->
+<server>
+
+ <!--
+ <mbean code="org.jbpm.integration.jboss42.ProcessArchiveDeployerInterceptorEJB3" name="jboss.bpm:service=ProcessArchiveDeployerInterceptorEJB3">
+ <depends-list optional-attribute-name="Interceptables">
+ <depends-list-element>jboss.ejb3:service=EJB3Deployer</depends-list-element>
+ </depends-list>
+ </mbean>
+ -->
+
+ <mbean code="org.jbpm.integration.jboss42.ProcessXMLSubDeployer" name="jboss.bpm:service=ProcessXMLDeployer">
+ </mbean>
+
+</server>
\ No newline at end of file
Property changes on: jbpm3/trunk/modules/integration/jboss42/src/main/etc/bpm-process-deployer.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: jbpm3/trunk/modules/integration/jboss42/src/main/etc/par-deployer.xml
===================================================================
--- jbpm3/trunk/modules/integration/jboss42/src/main/etc/par-deployer.xml 2008-12-08 13:14:54 UTC (rev 3270)
+++ jbpm3/trunk/modules/integration/jboss42/src/main/etc/par-deployer.xml 2008-12-08 14:27:35 UTC (rev 3271)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- The JBoss service configuration file for the PAR deployer service.
-
- $Id$
--->
-<server>
- <mbean code="org.jbpm.integration.jboss42.PARSubDeployer" name="jboss.deployer:service=PARDeployer">
- <depends>jboss.ejb:service=EJBDeployer</depends>
- </mbean>
-</server>
\ No newline at end of file
Deleted: jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/PARSubDeployer.java
===================================================================
--- jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/PARSubDeployer.java 2008-12-08 13:14:54 UTC (rev 3270)
+++ jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/PARSubDeployer.java 2008-12-08 14:27:35 UTC (rev 3271)
@@ -1,127 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.jbpm.integration.jboss42;
-
-//$Id$
-
-import java.net.URL;
-
-import org.jboss.bpm.api.config.Configuration;
-import org.jboss.bpm.api.deployment.Deployment;
-import org.jboss.bpm.api.service.DeploymentService;
-import org.jboss.bpm.api.service.ProcessEngine;
-import org.jboss.deployment.DeploymentException;
-import org.jboss.deployment.DeploymentInfo;
-import org.jboss.deployment.SubDeployerSupport;
-
-/**
- * A deployer service that manages jBPM Process Archive Deployments
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 03-May-2007
- */
-public class PARSubDeployer extends SubDeployerSupport implements PARSubDeployerMBean
-{
- /** The suffixes we accept, along with their relative order */
- private static final String[] DEFAULT_ENHANCED_SUFFIXES = new String[] { "900:-process.xml", "900:.par" };
-
- private DeploymentService depService;
-
- public PARSubDeployer()
- {
- setEnhancedSuffixes(DEFAULT_ENHANCED_SUFFIXES);
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public void create(DeploymentInfo di) throws DeploymentException
- {
- super.create(di);
-
- URL pdURL = getProcessDefinitionURL(di);
- log.info("Deploy ProcessDefinition: " + pdURL);
-
- try
- {
- DeploymentService depService = getDeploymentService();
- Deployment dep = depService.createDeployment(pdURL);
- depService.deploy(dep);
-
- // Remember the procDefID
- di.context.put(Deployment.class.getName(), dep);
- }
- catch (RuntimeException rte)
- {
- throw rte;
- }
- catch (Exception ex)
- {
- throw new DeploymentException("Cannot deploy: " + pdURL, ex);
- }
- }
-
- @Override
- public void destroy(DeploymentInfo di) throws DeploymentException
- {
- URL pdURL = getProcessDefinitionURL(di);
- log.info("Undeploy ProcessDefinition: " + pdURL);
-
- Deployment dep = (Deployment)di.context.get(Deployment.class.getName());
- if (dep != null)
- {
- try
- {
- DeploymentService depService = getDeploymentService();
- depService.undeploy(dep);
- }
- catch (RuntimeException rte)
- {
- throw rte;
- }
- catch (Exception ex)
- {
- throw new DeploymentException("Cannot deploy: " + pdURL, ex);
- }
- }
- super.destroy(di);
- }
-
- private URL getProcessDefinitionURL(DeploymentInfo di)
- {
- URL pdURL = di.localUrl != null ? di.localUrl : di.url;
- if (pdURL == null)
- throw new IllegalStateException("Cannot obtain process definition URL");
-
- return pdURL;
- }
-
- private DeploymentService getDeploymentService()
- {
- // This is done lazily because the deployers become available before MC beans
- if (depService == null)
- {
- ProcessEngine engine = Configuration.getProcessEngine();
- depService = engine.getService(DeploymentService.class);
- }
- return depService;
- }
-}
\ No newline at end of file
Deleted: jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/PARSubDeployerMBean.java
===================================================================
--- jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/PARSubDeployerMBean.java 2008-12-08 13:14:54 UTC (rev 3270)
+++ jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/PARSubDeployerMBean.java 2008-12-08 14:27:35 UTC (rev 3271)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.jbpm.integration.jboss42;
-
-//$Id$
-
-import org.jboss.deployment.SubDeployerExtMBean;
-
-/**
- * A deployer service that manages jBPM Process Archive Deployments
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 03-May-2007
- */
-public interface PARSubDeployerMBean extends SubDeployerExtMBean
-{
-}
\ No newline at end of file
Added: jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/ProcessArchiveDeployerInterceptorEJB3.java
===================================================================
--- jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/ProcessArchiveDeployerInterceptorEJB3.java (rev 0)
+++ jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/ProcessArchiveDeployerInterceptorEJB3.java 2008-12-08 14:27:35 UTC (rev 3271)
@@ -0,0 +1,100 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jbpm.integration.jboss42;
+
+//$Id$
+
+import org.jboss.deployment.DeploymentInfo;
+import org.jboss.deployment.MainDeployerMBean;
+import org.jboss.deployment.SubDeployerInterceptorSupport;
+import org.jboss.mx.server.Invocation;
+import org.jboss.mx.util.MBeanProxy;
+
+/**
+ * A deployer service that manages BPM Process Deployments
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 08-Dec-2008
+ */
+public class ProcessArchiveDeployerInterceptorEJB3 extends SubDeployerInterceptorSupport implements ProcessArchiveDeployerInterceptorEJB3MBean
+{
+ // The main deployer
+ private MainDeployerMBean mainDeployer;
+
+ @Override
+ protected final Object create(Invocation invocation, DeploymentInfo di) throws Throwable
+ {
+ Object retn = invokeNext(invocation);
+
+ ProcessDeploymentHelper depHelper = new ProcessDeploymentHelper();
+ depHelper.create(di);
+
+ return retn;
+ }
+
+ @Override
+ protected final Object destroy(Invocation invocation, DeploymentInfo di) throws Throwable
+ {
+ Object retn = invokeNext(invocation);
+
+ ProcessDeploymentHelper depHelper = new ProcessDeploymentHelper();
+ depHelper.destroy(di);
+
+ return retn;
+ }
+
+ /**
+ * Create the deployer service
+ */
+ protected void createService() throws Exception
+ {
+ mainDeployer = (MainDeployerMBean)MBeanProxy.get(MainDeployerMBean.class, MainDeployerMBean.OBJECT_NAME, server);
+ super.attach();
+ }
+
+ /**
+ * Destroy the deployer service
+ */
+ protected void destroyService()
+ {
+ super.detach();
+ }
+
+ /**
+ * Handle all process deployment exceptions.
+ * You can either simply log the problem and keep the EJB/WAR module alive or undeploy properly.
+ */
+ protected void handleStartupException(DeploymentInfo di, Throwable th)
+ {
+ log.error("Cannot startup process for: " + di.shortName, th);
+ mainDeployer.undeploy(di);
+ }
+
+ /**
+ * Handle all process deployment exceptions.
+ * You can either simply logs the problem and keep the EJB/WAR module alive or undeploy properly.
+ */
+ protected void handleShutdownException(String moduleName, Throwable th)
+ {
+ log.error("Cannot shutdown process for: " + moduleName, th);
+ }
+}
\ No newline at end of file
Property changes on: jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/ProcessArchiveDeployerInterceptorEJB3.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/ProcessArchiveDeployerInterceptorEJB3MBean.java
===================================================================
--- jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/ProcessArchiveDeployerInterceptorEJB3MBean.java (rev 0)
+++ jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/ProcessArchiveDeployerInterceptorEJB3MBean.java 2008-12-08 14:27:35 UTC (rev 3271)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jbpm.integration.jboss42;
+
+//$Id$
+
+import javax.management.ObjectName;
+
+import org.jboss.bpm.api.model.builder.ObjectNameFactory;
+import org.jboss.deployment.SubDeployerInterceptorMBean;
+
+/**
+ * A deployer service that manages BPM Process Deployments
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 08-Dec-2008
+ */
+public interface ProcessArchiveDeployerInterceptorEJB3MBean extends SubDeployerInterceptorMBean
+{
+ // default object name
+ public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.bpm:service=BPMDeployerEJB3");
+}
\ No newline at end of file
Property changes on: jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/ProcessArchiveDeployerInterceptorEJB3MBean.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/ProcessDeploymentHelper.java
===================================================================
--- jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/ProcessDeploymentHelper.java (rev 0)
+++ jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/ProcessDeploymentHelper.java 2008-12-08 14:27:35 UTC (rev 3271)
@@ -0,0 +1,117 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jbpm.integration.jboss42;
+
+//$Id$
+
+import java.net.URL;
+
+import org.jboss.bpm.api.config.Configuration;
+import org.jboss.bpm.api.deployment.Deployment;
+import org.jboss.bpm.api.service.DeploymentService;
+import org.jboss.bpm.api.service.ProcessEngine;
+import org.jboss.deployment.DeploymentException;
+import org.jboss.deployment.DeploymentInfo;
+import org.jboss.logging.Logger;
+
+/**
+ * A deployer helper that manages BPM Process Deployments
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 08-Dec-2008
+ */
+class ProcessDeploymentHelper
+{
+ // provide logging
+ private static Logger log = Logger.getLogger(ProcessDeploymentHelper.class);
+
+ private DeploymentService depService;
+
+ @SuppressWarnings("unchecked")
+ public void create(DeploymentInfo di) throws DeploymentException
+ {
+ URL pdURL = getProcessDefinitionURL(di);
+ log.info("Deploy ProcessDefinition: " + pdURL);
+
+ try
+ {
+ DeploymentService depService = getDeploymentService();
+ Deployment dep = depService.createDeployment(pdURL);
+ depService.deploy(dep);
+
+ // Remember the procDefID
+ di.context.put(Deployment.class.getName(), dep);
+ }
+ catch (RuntimeException rte)
+ {
+ throw rte;
+ }
+ catch (Exception ex)
+ {
+ throw new DeploymentException("Cannot deploy: " + pdURL, ex);
+ }
+ }
+
+ public void destroy(DeploymentInfo di) throws DeploymentException
+ {
+ URL pdURL = getProcessDefinitionURL(di);
+ log.info("Undeploy ProcessDefinition: " + pdURL);
+
+ Deployment dep = (Deployment)di.context.get(Deployment.class.getName());
+ if (dep != null)
+ {
+ try
+ {
+ DeploymentService depService = getDeploymentService();
+ depService.undeploy(dep);
+ }
+ catch (RuntimeException rte)
+ {
+ throw rte;
+ }
+ catch (Exception ex)
+ {
+ throw new DeploymentException("Cannot deploy: " + pdURL, ex);
+ }
+ }
+ }
+
+ private URL getProcessDefinitionURL(DeploymentInfo di)
+ {
+ URL pdURL = di.localUrl != null ? di.localUrl : di.url;
+ if (pdURL == null)
+ throw new IllegalStateException("Cannot obtain process definition URL");
+
+ return pdURL;
+ }
+
+ private DeploymentService getDeploymentService()
+ {
+ // This is done lazily because the deployers become available before MC beans
+ if (depService == null)
+ {
+ ProcessEngine engine = Configuration.getProcessEngine();
+ depService = engine.getService(DeploymentService.class);
+ }
+ return depService;
+ }
+}
\ No newline at end of file
Property changes on: jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/ProcessDeploymentHelper.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/ProcessXMLSubDeployer.java
===================================================================
--- jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/ProcessXMLSubDeployer.java (rev 0)
+++ jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/ProcessXMLSubDeployer.java 2008-12-08 14:27:35 UTC (rev 3271)
@@ -0,0 +1,62 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jbpm.integration.jboss42;
+
+//$Id$
+
+import org.jboss.deployment.DeploymentException;
+import org.jboss.deployment.DeploymentInfo;
+import org.jboss.deployment.SubDeployerSupport;
+
+/**
+ * A deployer service that manages BPM Process Deployments
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 08-Dec-2008
+ */
+public class ProcessXMLSubDeployer extends SubDeployerSupport implements ProcessXMLSubDeployerMBean
+{
+ /* The suffixes we accept, along with their relative order */
+ private static final String[] DEFAULT_ENHANCED_SUFFIXES = new String[] { "900:-process.xml" };
+
+ private ProcessDeploymentHelper depHelper;
+
+ public ProcessXMLSubDeployer()
+ {
+ depHelper = new ProcessDeploymentHelper();
+ setEnhancedSuffixes(DEFAULT_ENHANCED_SUFFIXES);
+ }
+
+ @Override
+ public void create(DeploymentInfo di) throws DeploymentException
+ {
+ super.create(di);
+ depHelper.create(di);
+ }
+
+ @Override
+ public void destroy(DeploymentInfo di) throws DeploymentException
+ {
+ depHelper.destroy(di);
+ super.destroy(di);
+ }
+}
\ No newline at end of file
Property changes on: jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/ProcessXMLSubDeployer.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/ProcessXMLSubDeployerMBean.java
===================================================================
--- jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/ProcessXMLSubDeployerMBean.java (rev 0)
+++ jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/ProcessXMLSubDeployerMBean.java 2008-12-08 14:27:35 UTC (rev 3271)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jbpm.integration.jboss42;
+
+//$Id$
+
+import org.jboss.deployment.SubDeployerExtMBean;
+
+/**
+ * A deployer service that manages jBPM Process Archive Deployments
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 03-May-2007
+ */
+public interface ProcessXMLSubDeployerMBean extends SubDeployerExtMBean
+{
+}
\ No newline at end of file
Property changes on: jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/ProcessXMLSubDeployerMBean.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbpm3/trunk/profiles.xml.example
===================================================================
--- jbpm3/trunk/profiles.xml.example 2008-12-08 13:14:54 UTC (rev 3270)
+++ jbpm3/trunk/profiles.xml.example 2008-12-08 14:27:35 UTC (rev 3271)
@@ -13,7 +13,7 @@
<properties>
<jboss422.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home>
<jboss423.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_3_GA/build/output/jboss-4.2.3.GA</jboss423.home>
- <jboss500.home>/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_CR2/build/output/jboss-5.0.0.CR2</jboss500.home>
+ <jboss500.home>/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_GA/build/output/jboss-5.0.0.GA</jboss500.home>
<!--
<jdbc.mysql.url>jdbc:mysql://localhost:3306/jbpmtest</jdbc.mysql.url>
17 years, 4 months
- 1
- 0
JBoss JBPM SVN: r3270 - projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-12-08 08:14:54 -0500 (Mon, 08 Dec 2008)
New Revision: 3270
Modified:
projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/AbstractConsoleTC.java
projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/GwtTestProcessManagement.java
Log:
Fix refactoring errors
Modified: projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/AbstractConsoleTC.java
===================================================================
--- projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/AbstractConsoleTC.java 2008-12-08 13:05:48 UTC (rev 3269)
+++ projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/AbstractConsoleTC.java 2008-12-08 13:14:54 UTC (rev 3270)
@@ -54,7 +54,8 @@
application.onModuleLoad2();
}
- ConsoleConfig config = new ConsoleConfig(GWT.getModuleBaseURL()+"xhp");
+ String proxyUrl = GWT.getModuleBaseURL() + "xhp";
+ ConsoleConfig config = new ConsoleConfig(proxyUrl, proxyUrl);
urlBuilder = new URLBuilder(config);
}
Modified: projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/GwtTestProcessManagement.java
===================================================================
--- projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/GwtTestProcessManagement.java 2008-12-08 13:05:48 UTC (rev 3269)
+++ projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/GwtTestProcessManagement.java 2008-12-08 13:14:54 UTC (rev 3270)
@@ -254,7 +254,7 @@
public void run()
{
- String inRoleURL = urlBuilder.getUserInRoleURL(MainView.KNOWN_ROLES);
+ String inRoleURL = urlBuilder.getUserInRoleURL(Application.KNOWN_ROLES);
final Authentication auth = new Authentication(inRoleURL);
auth.setCallback(
new Authentication.AuthCallback() {
17 years, 4 months
- 1
- 0
JBoss JBPM SVN: r3269 - in projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client: report and 1 other directory.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-12-08 08:05:48 -0500 (Mon, 08 Dec 2008)
New Revision: 3269
Added:
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/WelcomeEditor.java
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/report/OverviewReportEditor.java
Removed:
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/report/ReportOverviewEditor.java
Modified:
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Application.java
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/ConsoleConfig.java
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/MainView.java
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Menu.java
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Workspace.java
Log:
Decouple authentication from main view assembly
Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Application.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Application.java 2008-12-08 12:02:07 UTC (rev 3268)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Application.java 2008-12-08 13:05:48 UTC (rev 3269)
@@ -1,17 +1,39 @@
package org.jboss.bpm.console.client;
import com.google.gwt.core.client.EntryPoint;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.DeferredCommand;
+import com.google.gwt.user.client.ui.HTML;
+import com.google.gwt.http.client.Request;
+import com.google.gwt.http.client.Response;
+import com.gwtext.client.widgets.Panel;
+import com.gwtext.client.widgets.Window;
+import com.gwtext.client.widgets.Button;
+import com.gwtext.client.widgets.event.ButtonListenerAdapter;
+import com.gwtext.client.widgets.form.FormPanel;
+import com.gwtext.client.widgets.form.TextField;
+import com.gwtext.client.widgets.layout.VerticalLayout;
+import com.gwtext.client.widgets.layout.BorderLayout;
+import com.gwtext.client.widgets.layout.BorderLayoutData;
+import com.gwtext.client.core.EventObject;
+import com.gwtext.client.core.RegionPosition;
import org.jboss.bpm.console.client.util.ConsoleLog;
/**
* Entry point classes define <code>onModuleLoad()</code>.
+ * Does the authentication and reads the comfiguration before launching
+ * the {@link org.jboss.bpm.console.client.MainView}
*/
public class Application implements EntryPoint
{
private MainView mainView;
+ private Authentication auth;
+ private ConsoleConfig config;
+ private URLBuilder urlBuilder;
+ public final static String[] KNOWN_ROLES = {"admin", "manager", "user"};
+
/**
* Note, we defer all application initialization code to
* {@link #onModuleLoad2()} so that the UncaughtExceptionHandler
@@ -20,7 +42,7 @@
public void onModuleLoad() {
ConsoleLog.setEnabled(true);
-
+
/* Install an UncaughtExceptionHandler which will
* produce <code>FATAL</code> log messages
*/
@@ -41,11 +63,104 @@
*/
public void onModuleLoad2()
{
- mainView = new MainView();
+ config = new ConsoleConfig();
+
+ // setup
+
+ if(!GWT.isScript())
+ {
+ String proxyUrl = GWT.getModuleBaseURL() + "xhp";
+ config.setConsoleServerUrl(proxyUrl);
+ }
+
+ ConsoleLog.debug("Console server: " + config.getConsoleServerUrl());
+ ConsoleLog.debug("Report server: " + config.getReportServerUrl());
+
+ urlBuilder = new URLBuilder(config);
+
+ // authentiction
+
+ forceLogin();
}
public MainView getConsoleView()
{
return mainView;
}
+
+ private void forceLogin()
+ {
+ Panel panel = new Panel();
+ panel.setPaddings(20);
+ panel.setStyleName("login-panel-content");
+ panel.setLayout(new VerticalLayout(10));
+ panel.add( new HTML("Welcome, please login.") );
+
+ final Window window = new Window();
+ window.setTitle("GWT-Console");
+ window.setClosable(false);
+ window.setResizable(false);
+ window.setWidth(300);
+ window.setHeight(180);
+ window.setLayout(new BorderLayout());
+ window.setCloseAction(Window.CLOSE);
+
+ final FormPanel loginForm = new FormPanel();
+ loginForm.setBorder(false);
+ loginForm.add(new TextField("Username", "user"));
+ TextField passwordField = new TextField("Password", "pass");
+ passwordField.setPassword(true);
+ loginForm.add(passwordField);
+
+ final Button submitBtn = new Button("Login",
+ new ButtonListenerAdapter()
+ {
+ public void onClick(Button button, EventObject e)
+ {
+ String user = loginForm.getForm().findField("user").getValueAsString();
+ String pass = loginForm.getForm().findField("pass").getValueAsString();
+
+ String url = urlBuilder.getUserInRoleURL(KNOWN_ROLES);
+ auth = new Authentication(url);
+ auth.setCallback(
+ new Authentication.AuthCallback()
+ {
+
+ public void onLoginSuccess(Request request, Response response)
+ {
+ // clear the form
+ loginForm.getForm().reset();
+
+ // display main console
+ window.close();
+
+ // assemble main view
+ mainView = new MainView(auth, urlBuilder, config);
+ }
+
+ public void onLoginFailed(Request request, Throwable t)
+ {
+ // auth failed
+ ConsoleLog.error("Authentication failed.", t);
+ }
+ }
+ );
+
+ auth.doLogin(user,pass);
+
+ }
+ });
+
+ loginForm.addButton(submitBtn);
+ panel.add(loginForm);
+
+ BorderLayoutData centerData = new BorderLayoutData(RegionPosition.CENTER);
+ centerData.setMargins(3, 0, 3, 3);
+
+ window.add(panel, centerData);
+ // ------------------------------------------
+
+ window.show();
+ }
+
}
Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/ConsoleConfig.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/ConsoleConfig.java 2008-12-08 12:02:07 UTC (rev 3268)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/ConsoleConfig.java 2008-12-08 13:05:48 UTC (rev 3269)
@@ -47,9 +47,10 @@
private String instanceReportFile;
- public ConsoleConfig(String consoleServerUrl)
+ public ConsoleConfig(String consoleServerUrl, String reportServerUrl)
{
this.consoleServerUrl = consoleServerUrl;
+ this.reportServerUrl = reportServerUrl;
}
public ConsoleConfig()
Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/MainView.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/MainView.java 2008-12-08 12:02:07 UTC (rev 3268)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/MainView.java 2008-12-08 13:05:48 UTC (rev 3269)
@@ -21,26 +21,21 @@
*/
package org.jboss.bpm.console.client;
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.http.client.Request;
-import com.google.gwt.http.client.Response;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.HTML;
-import com.gwtext.client.core.EventObject;
import com.gwtext.client.core.Margins;
import com.gwtext.client.core.RegionPosition;
-import com.gwtext.client.widgets.*;
-import com.gwtext.client.widgets.event.ButtonListenerAdapter;
-import com.gwtext.client.widgets.form.FormPanel;
-import com.gwtext.client.widgets.form.TextField;
+import com.gwtext.client.widgets.MessageBox;
+import com.gwtext.client.widgets.MessageBoxConfig;
+import com.gwtext.client.widgets.Panel;
+import com.gwtext.client.widgets.Viewport;
import com.gwtext.client.widgets.layout.BorderLayout;
import com.gwtext.client.widgets.layout.BorderLayoutData;
import com.gwtext.client.widgets.layout.FitLayout;
-import com.gwtext.client.widgets.layout.VerticalLayout;
import org.jboss.bpm.console.client.process.ProcessDefinitionListEditor;
+import org.jboss.bpm.console.client.report.OverviewReportEditor;
import org.jboss.bpm.console.client.task.TaskListEditor;
import org.jboss.bpm.console.client.util.ConsoleLog;
-import org.jboss.bpm.console.client.report.ReportOverviewEditor;
import java.util.List;
@@ -55,39 +50,29 @@
private Header header;
private Menu menu;
private Workspace workspace;
- private URLBuilder urlBuilder;
- public final static String[] KNOWN_ROLES = {"admin", "manager", "user"};
-
+ private URLBuilder urlBuilder;
private Viewport viewport;
-
private Authentication auth;
+ private ConsoleConfig config;
+
public boolean isAttached()
{
return super.isAttached(); //To change body of overridden methods use File | Settings | File Templates.
}
- public MainView()
+ public MainView(Authentication auth, URLBuilder urlBuilder, ConsoleConfig config)
{
- ConsoleConfig config = null;
+ this.auth = auth;
+ this.config = config;
+ this.urlBuilder = urlBuilder;
- if(GWT.isScript())
- {
- config = new ConsoleConfig();
- }
- else
- {
- config = new ConsoleConfig(GWT.getModuleBaseURL()+"xhp");
- }
-
- ConsoleLog.debug("Console server: " + config.getConsoleServerUrl());
- ConsoleLog.debug("Report server: " + config.getReportServerUrl());
-
- urlBuilder = new URLBuilder(config);
Panel mainPanel = createMainPanel();
assembleMainApplication(mainPanel);
- forceLogin(mainPanel);
+ mainPanel.show();
+ mainPanel.doLayout();
+
viewport = new Viewport(mainPanel);
}
@@ -132,94 +117,16 @@
borderPanel.add(workspace, new BorderLayoutData(RegionPosition.CENTER));
// ------------------------------------------
- // TODO: these don't initialze correctly when ordered differently or launched form Menu
+ // TODO: these don't initialze correctly when ordered differently or launched from Menu
workspace.addEditor( new ProcessDefinitionListEditor(this), false );
workspace.addEditor( new TaskListEditor(this), false );
- workspace.addEditor( new ReportOverviewEditor(this), false);
+ workspace.addEditor( new OverviewReportEditor(this), false);
// ------------------------------------------
mainPanel.add(borderPanel);
}
- private void forceLogin(final Panel mainPanel)
- {
- Panel panel = new Panel();
- panel.setPaddings(20);
- panel.setStyleName("login-panel-content");
- panel.setLayout(new VerticalLayout(10));
- panel.add( new HTML("Welcome, please login.") );
-
- final Window window = new Window();
- window.setTitle("GWT-Console");
- window.setClosable(false);
- window.setResizable(false);
- window.setWidth(300);
- window.setHeight(180);
- window.setLayout(new BorderLayout());
- window.setCloseAction(Window.CLOSE);
-
- final FormPanel loginForm = new FormPanel();
- loginForm.setBorder(false);
- loginForm.add(new TextField("Username", "user"));
- TextField passwordField = new TextField("Password", "pass");
- passwordField.setPassword(true);
- loginForm.add(passwordField);
-
- final Button submitBtn = new Button("Login",
- new ButtonListenerAdapter()
- {
- public void onClick(Button button, EventObject e)
- {
- String user = loginForm.getForm().findField("user").getValueAsString();
- String pass = loginForm.getForm().findField("pass").getValueAsString();
-
- String url = getUrlBuilder().getUserInRoleURL(KNOWN_ROLES);
- auth = new Authentication(url);
- auth.setCallback(
- new Authentication.AuthCallback()
- {
-
- public void onLoginSuccess(Request request, Response response)
- {
- // clear the form
- loginForm.getForm().reset();
-
- // display main console
- window.close();
- mainPanel.show();
- mainPanel.doLayout();
-
- // update header
- header.setUserInfo(auth.getUsername(), auth.getRolesAssigned());
- }
-
- public void onLoginFailed(Request request, Throwable t)
- {
- // auth failed
- ConsoleLog.error("Authentication failed.", t);
- }
- }
- );
-
- auth.doLogin(user,pass);
-
- }
- });
-
- loginForm.addButton(submitBtn);
- panel.add(loginForm);
-
- BorderLayoutData centerData = new BorderLayoutData(RegionPosition.CENTER);
- centerData.setMargins(3, 0, 3, 3);
-
- window.add(panel, centerData);
- // ------------------------------------------
-
- window.show();
- }
-
-
public void addEditor(Editor editor)
{
ConsoleLog.debug("Add editor " + editor.getEditorId());
Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Menu.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Menu.java 2008-12-08 12:02:07 UTC (rev 3268)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Menu.java 2008-12-08 13:05:48 UTC (rev 3269)
@@ -28,7 +28,7 @@
import com.gwtext.client.widgets.tree.TreeNode;
import com.gwtext.client.widgets.tree.TreePanel;
import com.gwtext.client.widgets.tree.event.TreeNodeListenerAdapter;
-import org.jboss.bpm.console.client.report.ReportOverviewEditor;
+import org.jboss.bpm.console.client.report.OverviewReportEditor;
import org.jboss.bpm.console.client.process.ProcessDefinitionListEditor;
import org.jboss.bpm.console.client.task.TaskListEditor;
@@ -127,13 +127,13 @@
{
public void onClick(Node node, EventObject eventObject)
{
- if(view.hasEditor(ReportOverviewEditor.ID))
+ if(view.hasEditor(OverviewReportEditor.ID))
{
- view.showEditor(ReportOverviewEditor.ID);
+ view.showEditor(OverviewReportEditor.ID);
}
else
{
- view.addEditor( new ReportOverviewEditor(view) );
+ view.addEditor( new OverviewReportEditor(view) );
}
}
Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java 2008-12-08 12:02:07 UTC (rev 3268)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java 2008-12-08 13:05:48 UTC (rev 3269)
@@ -22,6 +22,7 @@
package org.jboss.bpm.console.client;
import com.google.gwt.http.client.URL;
+import com.google.gwt.core.client.GWT;
import org.jboss.bpm.console.client.model.ProcessInstanceRef;
import org.jboss.bpm.console.client.model.jbpm3.TokenReference;
@@ -159,12 +160,20 @@
public String getOverviewReportUrl()
{
- return config.getReportServerUrl()+"/preview?__report="+config.getOverviewReportFile();
+ String name = URL.encode(config.getOverviewReportFile());
+ String url = config.getReportServerUrl() + "/rs/report/view/" + name;
+ if(!GWT.isScript())
+ url += "&id=birt";
+ return url;
}
public String getDefinitionReportUrl(String name)
{
- String encodedName = URL.encode(name);
- return config.getReportServerUrl()+"/preview?__report="+config.getDefinitionReportFile()+"&name="+encodedName;
+ String reportName = URL.encode(name);
+ String reportFileName = URL.encode(config.getDefinitionReportFile());
+ String url = config.getReportServerUrl() + "/rs/report/view/" + reportFileName + "&name=" + reportName;
+ if(!GWT.isScript())
+ url += "&id=birt";
+ return url;
}
}
Added: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/WelcomeEditor.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/WelcomeEditor.java (rev 0)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/WelcomeEditor.java 2008-12-08 13:05:48 UTC (rev 3269)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.console.client;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class WelcomeEditor extends Editor
+{
+
+ public String getEditorId()
+ {
+ return "org.jboss.bpm.console.welcome";
+ }
+
+ public String getTitle()
+ {
+ return "GWT-Console";
+ }
+
+ public String getIconCSS()
+ {
+ return "";
+ }
+}
Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Workspace.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Workspace.java 2008-12-08 12:02:07 UTC (rev 3268)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Workspace.java 2008-12-08 13:05:48 UTC (rev 3269)
@@ -44,7 +44,7 @@
this.setTabWidth(135);
this.setEnableTabScroll(true);
this.setAutoScroll(true);
- this.setActiveTab(0);
+ this.setActiveTab(0);
}
private Panel addTab(Editor editor, boolean closeable) {
Copied: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/report/OverviewReportEditor.java (from rev 3266, projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/report/ReportOverviewEditor.java)
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/report/OverviewReportEditor.java (rev 0)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/report/OverviewReportEditor.java 2008-12-08 13:05:48 UTC (rev 3269)
@@ -0,0 +1,183 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.console.client.report;
+
+import com.gwtext.client.core.EventObject;
+import com.gwtext.client.data.*;
+import com.gwtext.client.widgets.Button;
+import com.gwtext.client.widgets.Component;
+import com.gwtext.client.widgets.Panel;
+import com.gwtext.client.widgets.MessageBox;
+import com.gwtext.client.widgets.event.ButtonListenerAdapter;
+import com.gwtext.client.widgets.event.PanelListenerAdapter;
+import com.gwtext.client.widgets.form.ComboBox;
+import com.gwtext.client.widgets.form.Label;
+import com.gwtext.client.widgets.layout.HorizontalLayout;
+import com.gwtext.client.widgets.layout.VerticalLayout;
+import com.gwtext.client.widgets.menu.Separator;
+import org.jboss.bpm.console.client.Editor;
+import org.jboss.bpm.console.client.MainView;
+import org.jboss.bpm.console.client.util.ConsoleLog;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class OverviewReportEditor extends Editor
+{
+ public final static String ID = "org.jboss.bpm.metric.ProcessMetricOverview";
+ private MainView view;
+
+ public OverviewReportEditor(final MainView view)
+ {
+ super();
+ this.view = view;
+ this.setId(ID);
+ this.setPaddings(10);
+
+ // -------------------------------------
+ this.setLayout(new VerticalLayout(10) );
+
+ this.addListener(
+ new PanelListenerAdapter()
+ {
+ public void onRender(Component component)
+ {
+ Panel panel = new Panel("Metric overview");
+ panel.setPaddings(10);
+
+ final String reportUrl= view.getUrlBuilder().getOverviewReportUrl();
+ ConsoleLog.debug("Report resource:" + reportUrl);
+
+ final ComboBox comboBox = buildProcessSelection();
+
+ final BirtPanel birtPanel = new BirtPanel();
+ birtPanel.setUrl(reportUrl);
+
+ // --
+
+ Button refreshBtn = new Button("Refresh", new ButtonListenerAdapter()
+ {
+
+ public void onClick(Button button, EventObject eventObject)
+ {
+ birtPanel.setUrl(reportUrl);
+ }
+ });
+
+ Button viewBtn = new Button("Examine", new ButtonListenerAdapter()
+ {
+
+ public void onClick(Button button, EventObject eventObject)
+ {
+ String rawValue = comboBox.getRawValue();
+ if(rawValue==null || rawValue.equals(""))
+ MessageBox.alert("Please enter a process definition name!");
+ else
+ onExamine(rawValue);
+ }
+ });
+
+ // --
+
+ Panel toolsPanel = new Panel();
+ toolsPanel.setLayout( new HorizontalLayout(10) );
+ Label label = new Label("Process definition");
+ label.setStyleName("bpm-label");
+ toolsPanel.add(label);
+ toolsPanel.add(comboBox);
+ toolsPanel.add( viewBtn );
+ toolsPanel.add( new Separator() );
+ toolsPanel.add( refreshBtn );
+
+ panel.add(toolsPanel);
+ panel.add(birtPanel);
+
+ add(panel);
+ }
+ }
+ );
+ }
+
+
+ private void onExamine(String definitionName)
+ {
+ String editorId = ProcessReportEditor.createWidgetID(definitionName);
+
+ if(view.hasEditor(editorId))
+ view.showEditor(editorId);
+ else
+ view.addEditor( new ProcessReportEditor(definitionName, view) );
+ }
+
+ private ComboBox buildProcessSelection()
+ {
+
+ final RecordDef recordDef = new RecordDef(
+ new FieldDef[]{
+ new IntegerFieldDef("processId"),
+ new StringFieldDef("name"),
+ new StringFieldDef("version")
+ }
+ );
+
+ final JsonReader reader = new JsonReader(recordDef);
+ reader.setRoot("definitions");
+ reader.setTotalProperty("totalCount");
+ reader.setId("processId");
+
+ DataProxy dataProxy = new ScriptTagProxy(
+ view.getUrlBuilder().getProcessDefinitionsURL(), 1000*10);
+
+ final Store store = new Store(dataProxy, reader, false);
+ store.load();
+
+ ComboBox cb = new ComboBox();
+ cb.setMinChars(1);
+ cb.setFieldLabel("Process definition");
+ cb.setStore(store);
+ cb.setDisplayField("name");
+ cb.setMode(ComboBox.LOCAL);
+ cb.setTriggerAction(ComboBox.ALL);
+ cb.setEmptyText("Please enter a name");
+ cb.setLoadingText("Searching...");
+ cb.setTypeAhead(true);
+ cb.setSelectOnFocus(true);
+ cb.setWidth(180);
+
+ return cb;
+ }
+
+ public String getEditorId()
+ {
+ return ID;
+ }
+
+ public String getTitle()
+ {
+ return "Metrics and Stats";
+ }
+
+ public String getIconCSS()
+ {
+ return "bpm-report-icon";
+ }
+}
Deleted: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/report/ReportOverviewEditor.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/report/ReportOverviewEditor.java 2008-12-08 12:02:07 UTC (rev 3268)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/report/ReportOverviewEditor.java 2008-12-08 13:05:48 UTC (rev 3269)
@@ -1,185 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.console.client.report;
-
-import com.gwtext.client.core.EventObject;
-import com.gwtext.client.data.*;
-import com.gwtext.client.widgets.Button;
-import com.gwtext.client.widgets.Component;
-import com.gwtext.client.widgets.Panel;
-import com.gwtext.client.widgets.MessageBox;
-import com.gwtext.client.widgets.event.ButtonListenerAdapter;
-import com.gwtext.client.widgets.event.PanelListenerAdapter;
-import com.gwtext.client.widgets.form.ComboBox;
-import com.gwtext.client.widgets.form.Label;
-import com.gwtext.client.widgets.layout.HorizontalLayout;
-import com.gwtext.client.widgets.layout.VerticalLayout;
-import com.gwtext.client.widgets.menu.Separator;
-import org.jboss.bpm.console.client.Editor;
-import org.jboss.bpm.console.client.MainView;
-import org.jboss.bpm.console.client.util.ConsoleLog;
-
-/**
- * @author Heiko.Braun <heiko.braun(a)jboss.com>
- */
-public class ReportOverviewEditor extends Editor
-{
- public final static String ID = "org.jboss.bpm.metric.ProcessMetricOverview";
- private MainView view;
-
- public ReportOverviewEditor(final MainView view)
- {
- super();
- this.view = view;
- this.setId(ID);
- this.setPaddings(10);
-
- // -------------------------------------
- this.setLayout(new VerticalLayout(10) );
-
- this.addListener(
- new PanelListenerAdapter()
- {
-
- public void onRender(Component component)
- {
-
- Panel panel = new Panel("Metric overview");
- panel.setPaddings(10);
-
- final String reportUrl= view.getUrlBuilder().getOverviewReportUrl();
- ConsoleLog.debug("Report resource:" + reportUrl);
-
- final ComboBox comboBox = buildProcessSelection();
-
- final BirtPanel birtPanel = new BirtPanel();
- birtPanel.setUrl(reportUrl);
-
- // --
-
- Button refreshBtn = new Button("Refresh", new ButtonListenerAdapter()
- {
-
- public void onClick(Button button, EventObject eventObject)
- {
- birtPanel.setUrl(reportUrl);
- }
- });
-
- Button viewBtn = new Button("Examine", new ButtonListenerAdapter()
- {
-
- public void onClick(Button button, EventObject eventObject)
- {
- String rawValue = comboBox.getRawValue();
- if(rawValue==null || rawValue.equals(""))
- MessageBox.alert("Please enter a process definition name!");
- else
- onExamine(rawValue);
- }
- });
-
- // --
-
- Panel toolsPanel = new Panel();
- toolsPanel.setLayout( new HorizontalLayout(10) );
- Label label = new Label("Process definition");
- label.setStyleName("bpm-label");
- toolsPanel.add(label);
- toolsPanel.add(comboBox);
- toolsPanel.add( viewBtn );
- toolsPanel.add( new Separator() );
- toolsPanel.add( refreshBtn );
-
- panel.add(toolsPanel);
- panel.add(birtPanel);
-
- add(panel);
- }
- }
- );
- }
-
-
- private void onExamine(String definitionName)
- {
- String editorId = ProcessReportEditor.createWidgetID(definitionName);
-
- if(view.hasEditor(editorId))
- view.showEditor(editorId);
- else
- view.addEditor( new ProcessReportEditor(definitionName, view) );
- }
-
- private ComboBox buildProcessSelection()
- {
-
- final RecordDef recordDef = new RecordDef(
- new FieldDef[]{
- new IntegerFieldDef("processId"),
- new StringFieldDef("name"),
- new StringFieldDef("version")
- }
- );
-
- final JsonReader reader = new JsonReader(recordDef);
- reader.setRoot("definitions");
- reader.setTotalProperty("totalCount");
- reader.setId("processId");
-
- DataProxy dataProxy = new ScriptTagProxy(
- view.getUrlBuilder().getProcessDefinitionsURL(), 1000*10);
-
- final Store store = new Store(dataProxy, reader, false);
- store.load();
-
- ComboBox cb = new ComboBox();
- cb.setMinChars(1);
- cb.setFieldLabel("Process definition");
- cb.setStore(store);
- cb.setDisplayField("name");
- cb.setMode(ComboBox.LOCAL);
- cb.setTriggerAction(ComboBox.ALL);
- cb.setEmptyText("Please enter a name");
- cb.setLoadingText("Searching...");
- cb.setTypeAhead(true);
- cb.setSelectOnFocus(true);
- cb.setWidth(180);
-
- return cb;
- }
-
- public String getEditorId()
- {
- return ID;
- }
-
- public String getTitle()
- {
- return "Metrics and Stats";
- }
-
- public String getIconCSS()
- {
- return "bpm-report-icon";
- }
-}
17 years, 4 months
- 1
- 0
JBoss JBPM SVN: r3268 - jbpm3/trunk/modules/core/src/test/java/org/jbpm/mail.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-12-08 07:02:07 -0500 (Mon, 08 Dec 2008)
New Revision: 3268
Modified:
jbpm3/trunk/modules/core/src/test/java/org/jbpm/mail/TaskMailTest.java
Log:
Remove email after read
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/mail/TaskMailTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/mail/TaskMailTest.java 2008-12-08 12:01:52 UTC (rev 3267)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/mail/TaskMailTest.java 2008-12-08 12:02:07 UTC (rev 3268)
@@ -107,6 +107,8 @@
assertTrue(server.getReceivedEmailSize() == 1);
Iterator emailIter = server.getReceivedEmail();
SmtpMessage email = (SmtpMessage) emailIter.next();
+ emailIter.remove();
+
assertEquals("you(a)example.domain", email.getHeaderValue("To"));
assertEquals("Task 'laundry'", email.getHeaderValue("Subject"));
assertEquals(-1, email.getBody().indexOf("#{")); // just to make sure that all expressions were resolved
@@ -193,6 +195,8 @@
assertTrue(server.getReceivedEmailSize() == 1);
Iterator emailIter = server.getReceivedEmail();
SmtpMessage email = (SmtpMessage) emailIter.next();
+ emailIter.remove();
+
assertEquals("you(a)example.domain", email.getHeaderValue("To"));
assertEquals("Task 'laundry' !", email.getHeaderValue("Subject"));
assertEquals(-1, email.getBody().indexOf("#{")); // just to make sure that all expressions were resolved
17 years, 4 months
- 1
- 0
JBoss JBPM SVN: r3267 - in projects/gwt-console/trunk: war and 3 other directories.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-12-08 07:01:52 -0500 (Mon, 08 Dec 2008)
New Revision: 3267
Removed:
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/BarChart.java
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/LineChart.java
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/PieChart.java
Modified:
projects/gwt-console/trunk/gwt-parent.iml
projects/gwt-console/trunk/pom.xml
projects/gwt-console/trunk/war/pom.xml
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/MainView.java
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Menu.java
projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml
Log:
Finish refactoring. Remove dependency on gchart
Modified: projects/gwt-console/trunk/gwt-parent.iml
===================================================================
--- projects/gwt-console/trunk/gwt-parent.iml 2008-12-08 11:57:31 UTC (rev 3266)
+++ projects/gwt-console/trunk/gwt-parent.iml 2008-12-08 12:01:52 UTC (rev 3267)
@@ -14,9 +14,8 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="jbpm3-identity" exported="" />
<orderEntry type="module" module-name="jbpm3-enterprise" exported="" />
- <orderEntry type="module" module-name="Balalaika" exported="" />
+ <orderEntry type="module" module-name="jbpm3-identity" exported="" />
<orderEntry type="module" module-name="jbpm3-core" exported="" />
<orderEntry type="module-library" exported="">
<library name="M2 Dep: org.slf4j:slf4j-simple:jar:1.5.2:compile">
@@ -91,15 +90,6 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.google.gwt:gchart:jar:2.2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/gwt/gchart/2.2/gchart-2.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.jboss:jboss-common-core:jar:2.2.7.GA:provided">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.7.GA/jboss-common-core-2.2.7.GA.jar!/" />
@@ -352,15 +342,6 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.google.gwt:gwt-dev:jar:mac:1.5.2:provided">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/gwt/gwt-dev/1.5.2/gwt-dev-1.5.2-mac.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
<library name="M2 Dep: bsh:bsh:jar:1.3.0:provided">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/bsh/bsh/1.3.0/bsh-1.3.0.jar!/" />
@@ -424,15 +405,6 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.google.code.gwt-log:gwt-log:jar:2.5.2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/code/gwt-log/gwt-log/2.5.2/gwt-log-2.5.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
<library name="M2 Dep: javax.activation:activation:jar:1.1:provided">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1.jar!/" />
@@ -541,15 +513,6 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.gwtext:gwtext:jar:2.0.5:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/gwtext/gwtext/2.0.5/gwtext-2.0.5.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
<library name="M2 Dep: mysql:mysql-connector-java:jar:5.1.6:provided">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/mysql/mysql-connector-java/5.1.6/mysql-connector-java-5.1.6.jar!/" />
@@ -568,33 +531,6 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.eclipse.birt:coreapi:jar:2.2.2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/coreapi/2.2.2/coreapi-2.2.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.eclipse.birt:dataadapterapi:jar:2.2.2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/dataadapterapi/2.2.2/dataadapterapi-2.2.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.eclipse.birt:chartengineapi:jar:2.2.2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/chartengineapi/2.2.2/chartengineapi-2.2.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.jboss:jboss-reflect:jar:2.0.0.CR1:provided">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/jboss-reflect/2.0.0.CR1/jboss-reflect-2.0.0.CR1.jar!/" />
@@ -604,15 +540,6 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.eclipse.birt:dteapi:jar:2.2.2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/dteapi/2.2.2/dteapi-2.2.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
<library name="M2 Dep: apache-xerces:xml-apis:jar:2.9.1:provided">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/apache-xerces/xml-apis/2.9.1/xml-apis-2.9.1.jar!/" />
@@ -631,15 +558,6 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.eclipse.birt:scriptapi:jar:2.2.2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/scriptapi/2.2.2/scriptapi-2.2.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.jboss:jbossxb:jar:2.0.0.CR13:provided">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/jbossxb/2.0.0.CR13/jbossxb-2.0.0.CR13.jar!/" />
@@ -676,15 +594,6 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.eclipse.birt:engineapi:jar:2.2.2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/engineapi/2.2.2/engineapi-2.2.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.jboss.microcontainer:jboss-kernel:jar:2.0.0.CR1:provided">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/microcontainer/jboss-kernel/2.0.0.CR1/jboss-kernel-2.0.0.CR1.jar!/" />
@@ -712,113 +621,50 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.eclipse.birt:modelapi:jar:2.2.2:compile">
+ <library name="M2 Dep: com.google.gwt:gchart:jar:2.2:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/modelapi/2.2.2/modelapi-2.2.2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/gwt/gchart/2.2/gchart-2.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.ibm.icu:icu4j:jar:3.6.1:compile">
+ <library name="M2 Dep: com.google.gwt:gwt-dev:jar:mac:1.5.2:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/ibm/icu/icu4j/3.6.1/icu4j-3.6.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/gwt/gwt-dev/1.5.2/gwt-dev-1.5.2-mac.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: commons-codec:commons-codec:jar:1.3:compile">
+ <library name="M2 Dep: com.google.code.gwt-log:gwt-log:jar:2.5.2:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/code/gwt-log/gwt-log/2.5.2/gwt-log-2.5.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: rhino:js:jar:1.6R2:compile">
+ <library name="M2 Dep: com.gwtext:gwtext:jar:2.0.5:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/rhino/js/1.6R2/js-1.6R2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/gwtext/gwtext/2.0.5/gwtext-2.0.5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.eclipse.emf:ecore-xmi:jar:2.2.2.v200702131851:compile">
+ <library name="M2 Dep: commons-codec:commons-codec:jar:1.2:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/emf/ecore-xmi/2.2.2.v200702131851/ecore-xmi-2.2.2.v200702131851.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-codec/commons-codec/1.2/commons-codec-1.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://$MODULE_DIR$/../../../../../../.m2/repository/org/w3c/flute/1.2/flute-1.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: commons-discovery:commons-discovery:jar:0.2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-discovery/commons-discovery/0.2/commons-discovery-0.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.eclipse.emf:common:jar:2.2.1.v200702131851:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/emf/common/2.2.1.v200702131851/common-2.2.1.v200702131851.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://$MODULE_DIR$/../../../../../../.m2/repository/commons-cli/commons-cli/1.0/commons-cli-1.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.w3c:sac:jar:1.3:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/w3c/sac/1.3/sac-1.3.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.eclipse.emf:ecore:jar:2.2.2.v200702131851:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/emf/ecore/2.2.2.v200702131851/ecore-2.2.2.v200702131851.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://$MODULE_DIR$/../../../../../../.m2/repository/com/lowagie/itext/1.3/itext-1.3.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
<orderEntryProperties />
</component>
</module>
Modified: projects/gwt-console/trunk/pom.xml
===================================================================
--- projects/gwt-console/trunk/pom.xml 2008-12-08 11:57:31 UTC (rev 3266)
+++ projects/gwt-console/trunk/pom.xml 2008-12-08 12:01:52 UTC (rev 3267)
@@ -17,7 +17,6 @@
<properties>
<commons.logging.version>1.1.1</commons.logging.version>
<gwt.version>1.5.2</gwt.version>
- <gchart.version>2.2</gchart.version>
<gwtext.version>2.0.5</gwtext.version>
<gwt-log.version>2.5.2</gwt-log.version>
<stax-api.version>1.0-2</stax-api.version>
Modified: projects/gwt-console/trunk/war/pom.xml
===================================================================
--- projects/gwt-console/trunk/war/pom.xml 2008-12-08 11:57:31 UTC (rev 3266)
+++ projects/gwt-console/trunk/war/pom.xml 2008-12-08 12:01:52 UTC (rev 3267)
@@ -55,10 +55,6 @@
<artifactId>gwtext</artifactId>
</dependency>
<dependency>
- <groupId>com.google.gwt</groupId>
- <artifactId>gchart</artifactId>
- </dependency>
- <dependency>
<groupId>com.google.code.gwt-log</groupId>
<artifactId>gwt-log</artifactId>
</dependency>
Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/MainView.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/MainView.java 2008-12-08 11:57:31 UTC (rev 3266)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/MainView.java 2008-12-08 12:01:52 UTC (rev 3267)
@@ -37,10 +37,10 @@
import com.gwtext.client.widgets.layout.BorderLayoutData;
import com.gwtext.client.widgets.layout.FitLayout;
import com.gwtext.client.widgets.layout.VerticalLayout;
-import org.jboss.bpm.console.client.metric.ReportOverviewEditor;
import org.jboss.bpm.console.client.process.ProcessDefinitionListEditor;
import org.jboss.bpm.console.client.task.TaskListEditor;
import org.jboss.bpm.console.client.util.ConsoleLog;
+import org.jboss.bpm.console.client.report.ReportOverviewEditor;
import java.util.List;
Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Menu.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Menu.java 2008-12-08 11:57:31 UTC (rev 3266)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Menu.java 2008-12-08 12:01:52 UTC (rev 3267)
@@ -28,7 +28,7 @@
import com.gwtext.client.widgets.tree.TreeNode;
import com.gwtext.client.widgets.tree.TreePanel;
import com.gwtext.client.widgets.tree.event.TreeNodeListenerAdapter;
-import org.jboss.bpm.console.client.metric.ReportOverviewEditor;
+import org.jboss.bpm.console.client.report.ReportOverviewEditor;
import org.jboss.bpm.console.client.process.ProcessDefinitionListEditor;
import org.jboss.bpm.console.client.task.TaskListEditor;
Deleted: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/BarChart.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/BarChart.java 2008-12-08 11:57:31 UTC (rev 3266)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/BarChart.java 2008-12-08 12:01:52 UTC (rev 3267)
@@ -1,95 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.console.client.widgets;
-
-import com.googlecode.gchart.client.GChart;
-
-import java.util.Map;
-
-/**
- * @author Heiko.Braun <heiko.braun(a)jboss.com>
- */
-public class BarChart extends GChart
-{
- String[] groupLabels;
-
- final static String BAR_COLOR = "#66CC66";
-
- final int MAX_REVENUE = 1000;
-
- public BarChart(int width, int height, String title, String groupName, Map barValues)
- {
-
- // limit to a single group
- this.groupLabels = new String[] { groupName };
-
- setChartSize(width, height);
- setChartTitle(title);
- setFontFamily("sans-serif");
-
- String[] labels = (String[])barValues.keySet().toArray( new String[]{} );
-
- for (int iCurve=0; iCurve < labels.length; iCurve++)
- {
- addCurve(); // one curve per quarter
- getCurve().getSymbol().setSymbolType(GChart.SymbolType.VBAR_SOUTHWEST);
- getCurve().getSymbol().setBackgroundColor(BAR_COLOR);
- getCurve().setLegendLabel(labels[iCurve]);
-
- getCurve().getSymbol().setHovertextTemplate(
- labels[iCurve] + " value=${y}"
- );
-
- getCurve().getSymbol().setModelWidth(0.8);
- getCurve().getSymbol().setBorderColor("black");
- getCurve().getSymbol().setBorderWidth(1);
- for (int jGroup=0; jGroup < groupLabels.length; jGroup++)
- {
- // the '+1' creates a bar-sized gap between groups
- getCurve().addPoint(1+iCurve+jGroup*(labels.length+1), Math.random()*MAX_REVENUE);
- getCurve().getPoint().setAnnotationText(labels[iCurve]);
- getCurve().getPoint().setAnnotationLocation( GChart.AnnotationLocation.NORTH);
- }
- }
-
- for (int i = 0; i < groupLabels.length; i++)
- {
- // formula centers tick-label horizontally on each group
- getXAxis().addTick(
- labels.length/2. + i*(labels.length+1),
- groupLabels[i]
- );
- getXAxis().setTickLabelFontSize(20);
- }
-
- getXAxis().setTickLength(6); // small tick-like gap...
- getXAxis().setTickThickness(0); // but with invisible ticks
- getXAxis().setAxisMin(0); // keeps first bar on chart
-
- getYAxis().setAxisMin(0); // Based on sim revenue range
- getYAxis().setAxisMax(MAX_REVENUE); // of 0 to MAX_REVENUE.
- getYAxis().setTickCount(11);
- getYAxis().setHasGridlines(true);
- getYAxis().setTickLabelFormat("###");
- }
-
-}
Deleted: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/LineChart.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/LineChart.java 2008-12-08 11:57:31 UTC (rev 3266)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/LineChart.java 2008-12-08 12:01:52 UTC (rev 3267)
@@ -1,80 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.console.client.widgets;
-
-import com.googlecode.gchart.client.GChart;
-
-import java.util.Map;
-import java.util.Set;
-import java.util.Iterator;
-
-import org.jboss.bpm.console.client.model.internal.MockMetricsDAO;
-
-/**
- * @author Heiko.Braun <heiko.braun(a)jboss.com>
- */
-public class LineChart extends GChart
-{
- /**
- *
- * @param metrics Long->Double
- */
- public LineChart(String title, int width, int height, Map metrics, String xLabel, String yLabel)
- {
- setChartTitle(title);
- setChartSize(width, height);
- setFontFamily("sans-serif");
- addCurve();
-
- // 2 pixel square connecting dots, spaced 5 pixels apart:
- getCurve().getSymbol().setFillThickness(2);
- getCurve().getSymbol().setFillSpacing(5);
- getCurve().getSymbol().setBackgroundColor("#66CC66");
- getCurve().getSymbol().setBorderColor("#66CC66");
-
- Iterator keys = metrics.keySet().iterator();
- int i=0;
- while(keys.hasNext())
- {
- Long k = (Long)keys.next();
- Double v = (Double)metrics.get(k);
- getCurve().addPoint(i, v.doubleValue() );
-
- getCurve().getPoint().setAnnotationVisible(true);
- getCurve().getPoint().setAnnotationText("ID " + k);
- getCurve().getPoint().setAnnotationLocation( GChart.AnnotationLocation.NORTH);
- i++;
- }
-
-
- getXAxis().setTickCount(metrics.size());
- getXAxis().setTickLength(6); // small tick-like gap...
- getXAxis().setTickThickness(0); // but with invisible ticks
- getXAxis().setAxisMin(0); // keeps first bar on chart
-
- getXAxis().setAxisLabel(xLabel);
- getYAxis().setAxisLabel(yLabel);
- getYAxis().setAxisMin(0); // Based on sim revenue range
- getYAxis().setAxisMax(MockMetricsDAO.MAX_EXEC_TIME); // TODO: Fixme
- getYAxis().setTickCount(11);
- }
-}
Deleted: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/PieChart.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/PieChart.java 2008-12-08 11:57:31 UTC (rev 3266)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/PieChart.java 2008-12-08 12:01:52 UTC (rev 3267)
@@ -1,83 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.console.client.widgets;
-
-import com.googlecode.gchart.client.GChart;
-
-import java.util.Map;
-
-/**
- * @author Heiko.Braun <heiko.braun(a)jboss.com>
- */
-public class PieChart extends GChart
-{
- public PieChart(int width, int height, String title, Map typeValues)
- {
- String[] pieColors = {"green", "red", "maroon", "yellow"};
-
- this.setChartSize(width, height);
- setChartTitle(title);
- this.setLegendVisible(false);
-
- getXAxis().setAxisVisible(false);
- getYAxis().setAxisVisible(false);
- getXAxis().setAxisMin(0);
- getXAxis().setAxisMax(10);
- getXAxis().setTickCount(0);
- getYAxis().setAxisMin(0);
- getYAxis().setAxisMax(10);
- getYAxis().setTickCount(0);
-
- // --------------------
- // this line orients the center of the first slice (apple) due east
- String[] pieTypes = (String[])typeValues.keySet().toArray(new String[] {});
-
- double[] pieValues = new double[pieTypes.length];
- for(int i=0; i<pieTypes.length; i++)
- {
- pieValues[i] = ((Double)typeValues.get(pieTypes[i])).doubleValue();
- }
-
- // --------------------
-
- setInitialPieSliceOrientation(0.75 - pieValues[0]/2);
- for (int i=0; i < pieValues.length; i++)
- {
- addCurve();
- getCurve().addPoint(5,5);
- getCurve().getSymbol().setSymbolType( SymbolType.PIE_SLICE_OPTIMAL_SHADING );
- getCurve().getSymbol().setBorderColor("white");
- getCurve().getSymbol().setBackgroundColor(pieColors[i]);
-
- // next two lines define pie diameter as 6 x-axis model units
- getCurve().getSymbol().setModelWidth(6);
- getCurve().getSymbol().setHeight(0);
- getCurve().getSymbol().setFillSpacing(3);
- getCurve().getSymbol().setFillThickness(3);
- getCurve().getSymbol().setHovertextTemplate(pieTypes[i] + ", " + Math.round(100*pieValues[i])+"%");
-
- getCurve().getSymbol().setPieSliceSize(pieValues[i]);
- getCurve().getPoint().setAnnotationText( pieTypes[i] );
- getCurve().getPoint().setAnnotationLocation( AnnotationLocation.OUTSIDE_PIE_ARC);
- }
- }
-}
Modified: projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml
===================================================================
--- projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml 2008-12-08 11:57:31 UTC (rev 3266)
+++ projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml 2008-12-08 12:01:52 UTC (rev 3267)
@@ -5,7 +5,6 @@
<inherits name='com.google.gwt.json.JSON'/>
<inherits name="com.google.gwt.i18n.I18N"/>
<inherits name='com.gwtext.GwtExt' />
- <inherits name='com.googlecode.gchart.GChart'/>
<!-- Add gwt-log support, default level `DEBUG` -->
<inherits name="com.allen_sauer.gwt.log.gwt-log-DEBUG" />
17 years, 4 months
- 1
- 0
JBoss JBPM SVN: r3266 - in projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client: report and 1 other directory.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-12-08 06:57:31 -0500 (Mon, 08 Dec 2008)
New Revision: 3266
Added:
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/report/
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/report/BirtPanel.java
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/report/ProcessReportEditor.java
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/report/ReportOverviewEditor.java
Removed:
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/
Log:
Rename package metric to report
Added: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/report/BirtPanel.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/report/BirtPanel.java (rev 0)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/report/BirtPanel.java 2008-12-08 11:57:31 UTC (rev 3266)
@@ -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.report;
+
+import com.google.gwt.user.client.ui.Frame;
+import com.gwtext.client.widgets.Panel;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class BirtPanel extends Panel
+{
+ private Frame frame;
+
+ public BirtPanel()
+ {
+ setHeader(false);
+ setWidth(660);
+ setHeight(450);
+
+ frame = new Frame();
+ frame.setWidth("660");
+ frame.setHeight("448");
+
+ add(frame);
+ }
+
+ public void setUrl(String url)
+ {
+ frame.setUrl(url);
+ }
+}
Added: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/report/ProcessReportEditor.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/report/ProcessReportEditor.java (rev 0)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/report/ProcessReportEditor.java 2008-12-08 11:57:31 UTC (rev 3266)
@@ -0,0 +1,180 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.console.client.report;
+
+import org.jboss.bpm.console.client.MainView;
+import org.jboss.bpm.console.client.Editor;
+import org.jboss.bpm.console.client.UIConstants;
+import org.jboss.bpm.console.client.util.ConsoleLog;
+import com.gwtext.client.widgets.layout.VerticalLayout;
+import com.gwtext.client.widgets.layout.HorizontalLayout;
+import com.gwtext.client.widgets.event.PanelListenerAdapter;
+import com.gwtext.client.widgets.event.ButtonListenerAdapter;
+import com.gwtext.client.widgets.Component;
+import com.gwtext.client.widgets.Button;
+import com.gwtext.client.widgets.MessageBox;
+import com.gwtext.client.widgets.Panel;
+import com.gwtext.client.widgets.menu.Separator;
+import com.gwtext.client.widgets.form.ComboBox;
+import com.gwtext.client.widgets.form.Label;
+import com.gwtext.client.core.EventObject;
+import com.gwtext.client.data.*;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class ProcessReportEditor extends Editor
+{
+ public final static String ID = "org.jboss.bpm.metric.ProcessMetric";
+ private String definitionName;
+ private MainView view;
+
+ public ProcessReportEditor(final String definitionName, final MainView view)
+ {
+ this.definitionName = definitionName;
+ this.view = view;
+ this.setId( createWidgetID(definitionName) );
+
+ this.setPaddings(10);
+
+ // -------------------------------------
+ this.setLayout(new VerticalLayout(10) );
+
+ this.addListener(
+ new PanelListenerAdapter()
+ {
+
+ public void onRender(Component component)
+ {
+
+ final String reportUrl= view.getUrlBuilder().getDefinitionReportUrl(definitionName);
+ ConsoleLog.debug("Report resource:" + reportUrl);
+
+ final ComboBox comboBox = buildInstanceSelection();
+
+ final BirtPanel birtPanel = new BirtPanel();
+ birtPanel.setUrl(reportUrl);
+
+ // --
+
+ Button refreshBtn = new Button("Refresh", new ButtonListenerAdapter()
+ {
+
+ public void onClick(Button button, EventObject eventObject)
+ {
+ birtPanel.setUrl(reportUrl);
+ }
+ });
+
+ Button viewBtn = new Button("Examine", new ButtonListenerAdapter()
+ {
+
+ public void onClick(Button button, EventObject eventObject)
+ {
+ String rawValue = comboBox.getRawValue();
+ if(rawValue==null || rawValue.equals(""))
+ MessageBox.alert("Please enter a process instance ID!");
+ else
+ MessageBox.alert("Not implemented");
+ }
+ });
+
+ // --
+
+ Panel p = new Panel();
+ p.setLayout( new HorizontalLayout(10) );
+ Label label = new Label("Instance ID");
+ label.setStyleName("bpm-label");
+ p.add(label);
+ p.add(comboBox);
+ p.add( viewBtn );
+ p.add( new Separator() );
+ p.add( refreshBtn );
+
+ add(p);
+ add(birtPanel);
+ }
+ }
+ );
+ }
+
+ private ComboBox buildInstanceSelection()
+ {
+
+ final RecordDef recordDef = new RecordDef(
+ new FieldDef[]{
+ new IntegerFieldDef("instanceId"),
+ new IntegerFieldDef("parentId"),
+ new StringFieldDef("key"),
+ new StringFieldDef("state"),
+ new DateFieldDef("startDate", UIConstants.DATE_FORMAT),
+ new DateFieldDef("endDate", UIConstants.DATE_FORMAT),
+ new BooleanFieldDef("suspended")
+ }
+ );
+
+ final JsonReader reader = new JsonReader(recordDef);
+ reader.setRoot("instances");
+ reader.setTotalProperty("totalCount");
+ reader.setId("instanceId");
+
+ DataProxy dataProxy = new ScriptTagProxy(
+ view.getUrlBuilder().getProcessDefinitionsURL(), 1000*10);
+
+ final Store store = new Store(dataProxy, reader, false);
+ store.load();
+
+ ComboBox cb = new ComboBox();
+ cb.setMinChars(1);
+ cb.setFieldLabel("Instance ID");
+ cb.setStore(store);
+ cb.setDisplayField("ID");
+ cb.setMode(ComboBox.LOCAL);
+ cb.setTriggerAction(ComboBox.ALL);
+ cb.setEmptyText("Please enter an ID");
+ cb.setLoadingText("Searching...");
+ cb.setTypeAhead(true);
+ cb.setSelectOnFocus(true);
+ cb.setWidth(180);
+
+ return cb;
+ }
+ public String getEditorId()
+ {
+ return createWidgetID(definitionName);
+ }
+
+ public String getTitle()
+ {
+ return definitionName +" Metrics";
+ }
+
+ public String getIconCSS()
+ {
+ return "bpm-report-icon";
+ }
+
+ public static String createWidgetID(String definitionName)
+ {
+ return ID+"."+definitionName;
+ }
+}
Added: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/report/ReportOverviewEditor.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/report/ReportOverviewEditor.java (rev 0)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/report/ReportOverviewEditor.java 2008-12-08 11:57:31 UTC (rev 3266)
@@ -0,0 +1,185 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.console.client.report;
+
+import com.gwtext.client.core.EventObject;
+import com.gwtext.client.data.*;
+import com.gwtext.client.widgets.Button;
+import com.gwtext.client.widgets.Component;
+import com.gwtext.client.widgets.Panel;
+import com.gwtext.client.widgets.MessageBox;
+import com.gwtext.client.widgets.event.ButtonListenerAdapter;
+import com.gwtext.client.widgets.event.PanelListenerAdapter;
+import com.gwtext.client.widgets.form.ComboBox;
+import com.gwtext.client.widgets.form.Label;
+import com.gwtext.client.widgets.layout.HorizontalLayout;
+import com.gwtext.client.widgets.layout.VerticalLayout;
+import com.gwtext.client.widgets.menu.Separator;
+import org.jboss.bpm.console.client.Editor;
+import org.jboss.bpm.console.client.MainView;
+import org.jboss.bpm.console.client.util.ConsoleLog;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class ReportOverviewEditor extends Editor
+{
+ public final static String ID = "org.jboss.bpm.metric.ProcessMetricOverview";
+ private MainView view;
+
+ public ReportOverviewEditor(final MainView view)
+ {
+ super();
+ this.view = view;
+ this.setId(ID);
+ this.setPaddings(10);
+
+ // -------------------------------------
+ this.setLayout(new VerticalLayout(10) );
+
+ this.addListener(
+ new PanelListenerAdapter()
+ {
+
+ public void onRender(Component component)
+ {
+
+ Panel panel = new Panel("Metric overview");
+ panel.setPaddings(10);
+
+ final String reportUrl= view.getUrlBuilder().getOverviewReportUrl();
+ ConsoleLog.debug("Report resource:" + reportUrl);
+
+ final ComboBox comboBox = buildProcessSelection();
+
+ final BirtPanel birtPanel = new BirtPanel();
+ birtPanel.setUrl(reportUrl);
+
+ // --
+
+ Button refreshBtn = new Button("Refresh", new ButtonListenerAdapter()
+ {
+
+ public void onClick(Button button, EventObject eventObject)
+ {
+ birtPanel.setUrl(reportUrl);
+ }
+ });
+
+ Button viewBtn = new Button("Examine", new ButtonListenerAdapter()
+ {
+
+ public void onClick(Button button, EventObject eventObject)
+ {
+ String rawValue = comboBox.getRawValue();
+ if(rawValue==null || rawValue.equals(""))
+ MessageBox.alert("Please enter a process definition name!");
+ else
+ onExamine(rawValue);
+ }
+ });
+
+ // --
+
+ Panel toolsPanel = new Panel();
+ toolsPanel.setLayout( new HorizontalLayout(10) );
+ Label label = new Label("Process definition");
+ label.setStyleName("bpm-label");
+ toolsPanel.add(label);
+ toolsPanel.add(comboBox);
+ toolsPanel.add( viewBtn );
+ toolsPanel.add( new Separator() );
+ toolsPanel.add( refreshBtn );
+
+ panel.add(toolsPanel);
+ panel.add(birtPanel);
+
+ add(panel);
+ }
+ }
+ );
+ }
+
+
+ private void onExamine(String definitionName)
+ {
+ String editorId = ProcessReportEditor.createWidgetID(definitionName);
+
+ if(view.hasEditor(editorId))
+ view.showEditor(editorId);
+ else
+ view.addEditor( new ProcessReportEditor(definitionName, view) );
+ }
+
+ private ComboBox buildProcessSelection()
+ {
+
+ final RecordDef recordDef = new RecordDef(
+ new FieldDef[]{
+ new IntegerFieldDef("processId"),
+ new StringFieldDef("name"),
+ new StringFieldDef("version")
+ }
+ );
+
+ final JsonReader reader = new JsonReader(recordDef);
+ reader.setRoot("definitions");
+ reader.setTotalProperty("totalCount");
+ reader.setId("processId");
+
+ DataProxy dataProxy = new ScriptTagProxy(
+ view.getUrlBuilder().getProcessDefinitionsURL(), 1000*10);
+
+ final Store store = new Store(dataProxy, reader, false);
+ store.load();
+
+ ComboBox cb = new ComboBox();
+ cb.setMinChars(1);
+ cb.setFieldLabel("Process definition");
+ cb.setStore(store);
+ cb.setDisplayField("name");
+ cb.setMode(ComboBox.LOCAL);
+ cb.setTriggerAction(ComboBox.ALL);
+ cb.setEmptyText("Please enter a name");
+ cb.setLoadingText("Searching...");
+ cb.setTypeAhead(true);
+ cb.setSelectOnFocus(true);
+ cb.setWidth(180);
+
+ return cb;
+ }
+
+ public String getEditorId()
+ {
+ return ID;
+ }
+
+ public String getTitle()
+ {
+ return "Metrics and Stats";
+ }
+
+ public String getIconCSS()
+ {
+ return "bpm-report-icon";
+ }
+}
17 years, 4 months
- 1
- 0
JBoss JBPM SVN: r3265 - in projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client: metric and 2 other directories.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-12-08 06:54:47 -0500 (Mon, 08 Dec 2008)
New Revision: 3265
Added:
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/ProcessReportEditor.java
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/ReportOverviewEditor.java
Removed:
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/DefinitionMetricEditor.java
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/DefinitionMetricView.java
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/InstanceMetricView.java
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/MetricOverview.java
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/MetricOverviewEditor.java
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/ProcessMetricEditor.java
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/DAOFactory.java
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/HelpDAO.java
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/MetricsDAO.java
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/ProcessDefinitionDAO.java
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/ProcessInstanceDAO.java
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/internal/
Modified:
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/MainView.java
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Menu.java
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionListEditor.java
Log:
Remove lagacy stuff
Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/MainView.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/MainView.java 2008-12-08 11:43:08 UTC (rev 3264)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/MainView.java 2008-12-08 11:54:47 UTC (rev 3265)
@@ -37,7 +37,7 @@
import com.gwtext.client.widgets.layout.BorderLayoutData;
import com.gwtext.client.widgets.layout.FitLayout;
import com.gwtext.client.widgets.layout.VerticalLayout;
-import org.jboss.bpm.console.client.metric.MetricOverviewEditor;
+import org.jboss.bpm.console.client.metric.ReportOverviewEditor;
import org.jboss.bpm.console.client.process.ProcessDefinitionListEditor;
import org.jboss.bpm.console.client.task.TaskListEditor;
import org.jboss.bpm.console.client.util.ConsoleLog;
@@ -135,7 +135,7 @@
// TODO: these don't initialze correctly when ordered differently or launched form Menu
workspace.addEditor( new ProcessDefinitionListEditor(this), false );
workspace.addEditor( new TaskListEditor(this), false );
- workspace.addEditor( new MetricOverviewEditor(this), false);
+ workspace.addEditor( new ReportOverviewEditor(this), false);
// ------------------------------------------
Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Menu.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Menu.java 2008-12-08 11:43:08 UTC (rev 3264)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Menu.java 2008-12-08 11:54:47 UTC (rev 3265)
@@ -28,7 +28,7 @@
import com.gwtext.client.widgets.tree.TreeNode;
import com.gwtext.client.widgets.tree.TreePanel;
import com.gwtext.client.widgets.tree.event.TreeNodeListenerAdapter;
-import org.jboss.bpm.console.client.metric.MetricOverviewEditor;
+import org.jboss.bpm.console.client.metric.ReportOverviewEditor;
import org.jboss.bpm.console.client.process.ProcessDefinitionListEditor;
import org.jboss.bpm.console.client.task.TaskListEditor;
@@ -127,13 +127,13 @@
{
public void onClick(Node node, EventObject eventObject)
{
- if(view.hasEditor(MetricOverviewEditor.ID))
+ if(view.hasEditor(ReportOverviewEditor.ID))
{
- view.showEditor(MetricOverviewEditor.ID);
+ view.showEditor(ReportOverviewEditor.ID);
}
else
{
- view.addEditor( new MetricOverviewEditor(view) );
+ view.addEditor( new ReportOverviewEditor(view) );
}
}
Deleted: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/DefinitionMetricEditor.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/DefinitionMetricEditor.java 2008-12-08 11:43:08 UTC (rev 3264)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/DefinitionMetricEditor.java 2008-12-08 11:54:47 UTC (rev 3265)
@@ -1,114 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.console.client.metric;
-
-import org.jboss.bpm.console.client.Editor;
-import org.jboss.bpm.console.client.UIConstants;
-import org.jboss.bpm.console.client.widgets.TeaserPanel;
-import org.jboss.bpm.console.client.widgets.HelpPanel;
-import org.jboss.bpm.console.client.model.ProcessDefinitionRef;
-import org.jboss.bpm.console.client.MainView;
-import org.jboss.bpm.console.client.process.ProcessInstanceEditor;
-import org.jboss.bpm.console.client.process.ProcessInstanceListEditor;
-import com.gwtext.client.widgets.layout.ColumnLayout;
-import com.gwtext.client.widgets.layout.ColumnLayoutData;
-import com.gwtext.client.widgets.Panel;
-import com.gwtext.client.widgets.Toolbar;
-import com.gwtext.client.widgets.ToolbarButton;
-import com.gwtext.client.widgets.Button;
-import com.gwtext.client.widgets.event.ButtonListenerAdapter;
-import com.gwtext.client.core.EventObject;
-
-/**
- * @author Heiko.Braun <heiko.braun(a)jboss.com>
- */
-public class DefinitionMetricEditor extends Editor
-{
-
- private ProcessDefinitionRef parent;
- private MainView view;
- private Panel teaserPanel;
-
- public DefinitionMetricEditor(final MainView view, final ProcessDefinitionRef proc)
- {
- super();
- this.view = view;
- this.parent = proc;
-
- this.setId(MetricOverviewEditor.ID+"."+proc.getName());
-
- // -----------------------------------------------
-
- this.setLayout( new ColumnLayout() );
- this.setWidth(UIConstants.EDITOR_WIDTH);
-
- // -----------------------------------------------
-
- teaserPanel = new TeaserPanel();
-
- HelpPanel instancePanel = new HelpPanel(UIConstants.TEASER_PANEL_WIDTH, 180, "Process instances");
- instancePanel.setIconCls("bpm-process-icon");
-
- instancePanel.setContent(
- "You can manage running instances through the process management editor."
- );
-
- Toolbar bottomToolbar = new Toolbar();
- bottomToolbar.addFill();
- bottomToolbar.addButton(
- new ToolbarButton("View instances", new ButtonListenerAdapter() {
- public void onClick(Button button, EventObject e)
- {
- String editorId = ProcessInstanceEditor.ID+"."+proc.getName();
-
- if(view.hasEditor(editorId))
- view.showEditor(editorId);
- else
- view.addEditor( new ProcessInstanceListEditor(proc, view) );
- }
- })
- );
-
- instancePanel.setBottomToolbar(bottomToolbar);
- teaserPanel.add(instancePanel);
-
- // -----------------------------------------------
-
- this.add( new DefinitionMetricView(view, proc), new ColumnLayoutData(0.7));
- this.add( teaserPanel, new ColumnLayoutData(0.3));
- }
-
- public String getEditorId()
- {
- return getId();
- }
-
- public String getTitle()
- {
- return parent.getName() + " metrics";
- }
-
- public String getIconCSS()
- {
- return "bpm-metric-icon";
- }
-}
Deleted: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/DefinitionMetricView.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/DefinitionMetricView.java 2008-12-08 11:43:08 UTC (rev 3264)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/DefinitionMetricView.java 2008-12-08 11:54:47 UTC (rev 3265)
@@ -1,164 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.console.client.metric;
-
-import com.gwtext.client.widgets.Panel;
-import com.gwtext.client.widgets.form.FieldSet;
-import com.gwtext.client.widgets.form.FormPanel;
-import com.gwtext.client.widgets.form.TextField;
-import com.gwtext.client.core.Position;
-import org.jboss.bpm.console.client.MainView;
-import org.jboss.bpm.console.client.UIConstants;
-import org.jboss.bpm.console.client.model.DAOFactory;
-import org.jboss.bpm.console.client.model.ProcessDefinitionRef;
-import org.jboss.bpm.console.client.model.ProcessInstancePerformance;
-import org.jboss.bpm.console.client.widgets.LineChart;
-
-import java.util.Iterator;
-import java.util.Map;
-
-/**
- * @author Heiko.Braun <heiko.braun(a)jboss.com>
- */
-public class DefinitionMetricView extends Panel
-{
- private ProcessDefinitionRef parent;
-
- private MainView view;
-
- public DefinitionMetricView(MainView view, ProcessDefinitionRef parent)
- {
- super();
- this.view = view;
- this.parent = parent;
-
- this.setHeader(false);
- this.setBorder(false);
-
- // ----------------------------------------
-
- ProcessInstancePerformance perf =
- DAOFactory.createMetricsDAO().getProcessInstancePerformance(parent.getProcessId());
-
- LineChart chart = new LineChart(
- parent.getName() + " performance", 380, 260, perf.getInstanceMetrics(), "Instance", "t"
- );
-
- double[] fixture = deriveFixture(perf);
-
- Panel chartPanel = new Panel();
- chartPanel.setPaddings(10);
- chartPanel.setHeader(false);
- chartPanel.setBorder(false);
- chartPanel.setWidth(UIConstants.EDITOR_WIDTH);
- chartPanel.add(chart);
-
- // ----------------------------------------
-
- Panel panel = new Panel();
- panel.setBorder(false);
- panel.setFrame(false);
- panel.setPaddings(10);
-
- //create the form
- FormPanel formPanel = new FormPanel();
- formPanel.setLabelAlign(Position.LEFT);
- formPanel.setWidth(UIConstants.EDITOR_PANEL_WIDTH);
- formPanel.setHeader(false);
- formPanel.setFrame(false);
- formPanel.setPaddings(5, 5, 5, 0);
- formPanel.setLabelWidth(120);
-
- //create first collapsible fieldset with checkbox
- FieldSet fieldSet = new FieldSet();
- fieldSet.setCheckboxToggle(false);
- fieldSet.setTitle("Process metrics");
- fieldSet.setCollapsed(false);
- fieldSet.setAutoHeight(true);
- fieldSet.setBorder(false);
-
- //add fields to the User FieldSet
- TextField name = new TextField("Process Definition Name", "name", 210);
- name.setAllowBlank(false);
- name.setValue( parent.getName() );
- fieldSet.add(name);
-
- TextField execs = new TextField("Number of executions", "numexec", 210);
- execs.setAllowBlank(false);
- execs.setValue( perf.getInstanceMetrics().size() +"" );
- fieldSet.add(execs);
-
- TextField average = new TextField("Average execution time", "average", 210);
- average.setValue(""+fixture[0]);
- fieldSet.add(average);
-
- TextField max = new TextField("Min execution time", "min", 210);
- max.setValue(""+ fixture[1]);
- fieldSet.add(max);
-
- TextField min = new TextField("Max execution time", "max", 210);
- min.setValue("" + fixture[2]);
- fieldSet.add(min);
-
- formPanel.add(fieldSet);
-
- panel.add(formPanel);
-
-
- // ----------------------------------------
- this.add(chartPanel);
- this.add(panel);
-
- // gchart hack
- chart.update();
-
- }
-
- private double[] deriveFixture(ProcessInstancePerformance perf)
- {
- double avg = -1;
- double min= -1;
- double max = -1;
- double sum = -1;
-
- Map metrics = perf.getInstanceMetrics();
- Iterator keys = metrics.keySet().iterator();
-
- while(keys.hasNext())
- {
- Long k = (Long)keys.next();
- Double v = (Double)metrics.get(k);
-
- if(min==-1) min = v.longValue();
-
- if(v.longValue()>max) max = v.longValue();
- else if(v.longValue()<=min) min = v.longValue();
-
- sum += v.longValue();
-
- }
-
- avg = Math.floor( sum/metrics.size());
-
- return new double[] {avg, min, max};
- }
-}
Deleted: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/InstanceMetricView.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/InstanceMetricView.java 2008-12-08 11:43:08 UTC (rev 3264)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/InstanceMetricView.java 2008-12-08 11:54:47 UTC (rev 3265)
@@ -1,29 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.console.client.metric;
-
-/**
- * @author Heiko.Braun <heiko.braun(a)jboss.com>
- */
-public class InstanceMetricView
-{
-}
Deleted: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/MetricOverview.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/MetricOverview.java 2008-12-08 11:43:08 UTC (rev 3264)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/MetricOverview.java 2008-12-08 11:54:47 UTC (rev 3265)
@@ -1,98 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.console.client.metric;
-
-import com.google.gwt.http.client.*;
-import com.google.gwt.user.client.ui.HTMLPanel;
-import com.gwtext.client.widgets.Panel;
-import com.gwtext.client.widgets.layout.ColumnLayout;
-import org.jboss.bpm.console.client.MainView;
-import org.jboss.bpm.console.client.UIConstants;
-import org.jboss.bpm.console.client.util.ConsoleLog;
-
-/**
- * @author Heiko.Braun <heiko.braun(a)jboss.com>
- */
-public class MetricOverview extends Panel
-{
- private final MainView view;
- private Panel container;
-
- public MetricOverview(final MainView view)
- {
- super();
- this.view = view;
-
- this.setHeader(false);
- this.setBorder(false);
- this.setTitle("Default report");
-
- container = new Panel();
- container.setBorder(false);
- container.setFrame(false);
- container.setHeader(false);
-
- // ------------
-
- RequestBuilder rb = new RequestBuilder(RequestBuilder.GET,
- view.getUrlBuilder().getOverviewReportUrl()
- );
- try
- {
- rb.sendRequest(null,
- new RequestCallback() {
-
- public void onResponseReceived(Request request, Response response)
- {
- // parse roles
- if(response.getStatusCode()!=200)
- {
- ConsoleLog.error("Failed to get report: " + response.getStatusText());
- }
- else
- {
- container.clear();
- container.add(new HTMLPanel(response.getText()));
- container.doLayout();
- }
- }
-
- public void onError(Request request, Throwable t)
- {
- ConsoleLog.error("Failed to get report",t);
- }
- });
- }
-
- catch (RequestException e1)
- {
- // Couldn't connect to server
- throw new RuntimeException("Unknown error upon getting report", e1);
- }
-
-
- this.setLayout( new ColumnLayout() );
- this.setWidth(UIConstants.EDITOR_WIDTH);
-
- }
-
-}
Deleted: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/MetricOverviewEditor.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/MetricOverviewEditor.java 2008-12-08 11:43:08 UTC (rev 3264)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/MetricOverviewEditor.java 2008-12-08 11:54:47 UTC (rev 3265)
@@ -1,185 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.console.client.metric;
-
-import com.gwtext.client.core.EventObject;
-import com.gwtext.client.data.*;
-import com.gwtext.client.widgets.Button;
-import com.gwtext.client.widgets.Component;
-import com.gwtext.client.widgets.Panel;
-import com.gwtext.client.widgets.MessageBox;
-import com.gwtext.client.widgets.event.ButtonListenerAdapter;
-import com.gwtext.client.widgets.event.PanelListenerAdapter;
-import com.gwtext.client.widgets.form.ComboBox;
-import com.gwtext.client.widgets.form.Label;
-import com.gwtext.client.widgets.layout.HorizontalLayout;
-import com.gwtext.client.widgets.layout.VerticalLayout;
-import com.gwtext.client.widgets.menu.Separator;
-import org.jboss.bpm.console.client.Editor;
-import org.jboss.bpm.console.client.MainView;
-import org.jboss.bpm.console.client.util.ConsoleLog;
-
-/**
- * @author Heiko.Braun <heiko.braun(a)jboss.com>
- */
-public class MetricOverviewEditor extends Editor
-{
- public final static String ID = "org.jboss.bpm.metric.ProcessMetricOverview";
- private MainView view;
-
- public MetricOverviewEditor(final MainView view)
- {
- super();
- this.view = view;
- this.setId(ID);
- this.setPaddings(10);
-
- // -------------------------------------
- this.setLayout(new VerticalLayout(10) );
-
- this.addListener(
- new PanelListenerAdapter()
- {
-
- public void onRender(Component component)
- {
-
- Panel panel = new Panel("Metric overview");
- panel.setPaddings(10);
-
- final String reportUrl= view.getUrlBuilder().getOverviewReportUrl();
- ConsoleLog.debug("Report resource:" + reportUrl);
-
- final ComboBox comboBox = buildProcessSelection();
-
- final BirtPanel birtPanel = new BirtPanel();
- birtPanel.setUrl(reportUrl);
-
- // --
-
- Button refreshBtn = new Button("Refresh", new ButtonListenerAdapter()
- {
-
- public void onClick(Button button, EventObject eventObject)
- {
- birtPanel.setUrl(reportUrl);
- }
- });
-
- Button viewBtn = new Button("Examine", new ButtonListenerAdapter()
- {
-
- public void onClick(Button button, EventObject eventObject)
- {
- String rawValue = comboBox.getRawValue();
- if(rawValue==null || rawValue.equals(""))
- MessageBox.alert("Please enter a process definition name!");
- else
- onExamine(rawValue);
- }
- });
-
- // --
-
- Panel toolsPanel = new Panel();
- toolsPanel.setLayout( new HorizontalLayout(10) );
- Label label = new Label("Process definition");
- label.setStyleName("bpm-label");
- toolsPanel.add(label);
- toolsPanel.add(comboBox);
- toolsPanel.add( viewBtn );
- toolsPanel.add( new Separator() );
- toolsPanel.add( refreshBtn );
-
- panel.add(toolsPanel);
- panel.add(birtPanel);
-
- add(panel);
- }
- }
- );
- }
-
-
- private void onExamine(String definitionName)
- {
- String editorId = ProcessMetricEditor.createWidgetID(definitionName);
-
- if(view.hasEditor(editorId))
- view.showEditor(editorId);
- else
- view.addEditor( new ProcessMetricEditor(definitionName, view) );
- }
-
- private ComboBox buildProcessSelection()
- {
-
- final RecordDef recordDef = new RecordDef(
- new FieldDef[]{
- new IntegerFieldDef("processId"),
- new StringFieldDef("name"),
- new StringFieldDef("version")
- }
- );
-
- final JsonReader reader = new JsonReader(recordDef);
- reader.setRoot("definitions");
- reader.setTotalProperty("totalCount");
- reader.setId("processId");
-
- DataProxy dataProxy = new ScriptTagProxy(
- view.getUrlBuilder().getProcessDefinitionsURL(), 1000*10);
-
- final Store store = new Store(dataProxy, reader, false);
- store.load();
-
- ComboBox cb = new ComboBox();
- cb.setMinChars(1);
- cb.setFieldLabel("Process definition");
- cb.setStore(store);
- cb.setDisplayField("name");
- cb.setMode(ComboBox.LOCAL);
- cb.setTriggerAction(ComboBox.ALL);
- cb.setEmptyText("Please enter a name");
- cb.setLoadingText("Searching...");
- cb.setTypeAhead(true);
- cb.setSelectOnFocus(true);
- cb.setWidth(180);
-
- return cb;
- }
-
- public String getEditorId()
- {
- return ID;
- }
-
- public String getTitle()
- {
- return "Metrics and Stats";
- }
-
- public String getIconCSS()
- {
- return "bpm-metric-icon";
- }
-}
Deleted: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/ProcessMetricEditor.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/ProcessMetricEditor.java 2008-12-08 11:43:08 UTC (rev 3264)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/ProcessMetricEditor.java 2008-12-08 11:54:47 UTC (rev 3265)
@@ -1,180 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.console.client.metric;
-
-import org.jboss.bpm.console.client.MainView;
-import org.jboss.bpm.console.client.Editor;
-import org.jboss.bpm.console.client.UIConstants;
-import org.jboss.bpm.console.client.util.ConsoleLog;
-import com.gwtext.client.widgets.layout.VerticalLayout;
-import com.gwtext.client.widgets.layout.HorizontalLayout;
-import com.gwtext.client.widgets.event.PanelListenerAdapter;
-import com.gwtext.client.widgets.event.ButtonListenerAdapter;
-import com.gwtext.client.widgets.Component;
-import com.gwtext.client.widgets.Button;
-import com.gwtext.client.widgets.MessageBox;
-import com.gwtext.client.widgets.Panel;
-import com.gwtext.client.widgets.menu.Separator;
-import com.gwtext.client.widgets.form.ComboBox;
-import com.gwtext.client.widgets.form.Label;
-import com.gwtext.client.core.EventObject;
-import com.gwtext.client.data.*;
-
-/**
- * @author Heiko.Braun <heiko.braun(a)jboss.com>
- */
-public class ProcessMetricEditor extends Editor
-{
- public final static String ID = "org.jboss.bpm.metric.ProcessMetric";
- private String definitionName;
- private MainView view;
-
- public ProcessMetricEditor(final String definitionName, final MainView view)
- {
- this.definitionName = definitionName;
- this.view = view;
- this.setId( ProcessMetricEditor.createWidgetID(definitionName) );
-
- this.setPaddings(10);
-
- // -------------------------------------
- this.setLayout(new VerticalLayout(10) );
-
- this.addListener(
- new PanelListenerAdapter()
- {
-
- public void onRender(Component component)
- {
-
- final String reportUrl= view.getUrlBuilder().getDefinitionReportUrl(definitionName);
- ConsoleLog.debug("Report resource:" + reportUrl);
-
- final ComboBox comboBox = buildInstanceSelection();
-
- final BirtPanel birtPanel = new BirtPanel();
- birtPanel.setUrl(reportUrl);
-
- // --
-
- Button refreshBtn = new Button("Refresh", new ButtonListenerAdapter()
- {
-
- public void onClick(Button button, EventObject eventObject)
- {
- birtPanel.setUrl(reportUrl);
- }
- });
-
- Button viewBtn = new Button("Examine", new ButtonListenerAdapter()
- {
-
- public void onClick(Button button, EventObject eventObject)
- {
- String rawValue = comboBox.getRawValue();
- if(rawValue==null || rawValue.equals(""))
- MessageBox.alert("Please enter a process instance ID!");
- else
- MessageBox.alert("Not implemented");
- }
- });
-
- // --
-
- Panel p = new Panel();
- p.setLayout( new HorizontalLayout(10) );
- Label label = new Label("Instance ID");
- label.setStyleName("bpm-label");
- p.add(label);
- p.add(comboBox);
- p.add( viewBtn );
- p.add( new Separator() );
- p.add( refreshBtn );
-
- add(p);
- add(birtPanel);
- }
- }
- );
- }
-
- private ComboBox buildInstanceSelection()
- {
-
- final RecordDef recordDef = new RecordDef(
- new FieldDef[]{
- new IntegerFieldDef("instanceId"),
- new IntegerFieldDef("parentId"),
- new StringFieldDef("key"),
- new StringFieldDef("state"),
- new DateFieldDef("startDate", UIConstants.DATE_FORMAT),
- new DateFieldDef("endDate", UIConstants.DATE_FORMAT),
- new BooleanFieldDef("suspended")
- }
- );
-
- final JsonReader reader = new JsonReader(recordDef);
- reader.setRoot("instances");
- reader.setTotalProperty("totalCount");
- reader.setId("instanceId");
-
- DataProxy dataProxy = new ScriptTagProxy(
- view.getUrlBuilder().getProcessDefinitionsURL(), 1000*10);
-
- final Store store = new Store(dataProxy, reader, false);
- store.load();
-
- ComboBox cb = new ComboBox();
- cb.setMinChars(1);
- cb.setFieldLabel("Instance ID");
- cb.setStore(store);
- cb.setDisplayField("ID");
- cb.setMode(ComboBox.LOCAL);
- cb.setTriggerAction(ComboBox.ALL);
- cb.setEmptyText("Please enter an ID");
- cb.setLoadingText("Searching...");
- cb.setTypeAhead(true);
- cb.setSelectOnFocus(true);
- cb.setWidth(180);
-
- return cb;
- }
- public String getEditorId()
- {
- return createWidgetID(definitionName);
- }
-
- public String getTitle()
- {
- return definitionName +" Metrics";
- }
-
- public String getIconCSS()
- {
- return "bpm-metric-icon";
- }
-
- public static String createWidgetID(String definitionName)
- {
- return ID+"."+definitionName;
- }
-}
Copied: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/ProcessReportEditor.java (from rev 3262, projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/ProcessMetricEditor.java)
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/ProcessReportEditor.java (rev 0)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/ProcessReportEditor.java 2008-12-08 11:54:47 UTC (rev 3265)
@@ -0,0 +1,180 @@
+/*
+ * 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.metric;
+
+import org.jboss.bpm.console.client.MainView;
+import org.jboss.bpm.console.client.Editor;
+import org.jboss.bpm.console.client.UIConstants;
+import org.jboss.bpm.console.client.util.ConsoleLog;
+import com.gwtext.client.widgets.layout.VerticalLayout;
+import com.gwtext.client.widgets.layout.HorizontalLayout;
+import com.gwtext.client.widgets.event.PanelListenerAdapter;
+import com.gwtext.client.widgets.event.ButtonListenerAdapter;
+import com.gwtext.client.widgets.Component;
+import com.gwtext.client.widgets.Button;
+import com.gwtext.client.widgets.MessageBox;
+import com.gwtext.client.widgets.Panel;
+import com.gwtext.client.widgets.menu.Separator;
+import com.gwtext.client.widgets.form.ComboBox;
+import com.gwtext.client.widgets.form.Label;
+import com.gwtext.client.core.EventObject;
+import com.gwtext.client.data.*;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class ProcessReportEditor extends Editor
+{
+ public final static String ID = "org.jboss.bpm.metric.ProcessMetric";
+ private String definitionName;
+ private MainView view;
+
+ public ProcessReportEditor(final String definitionName, final MainView view)
+ {
+ this.definitionName = definitionName;
+ this.view = view;
+ this.setId( createWidgetID(definitionName) );
+
+ this.setPaddings(10);
+
+ // -------------------------------------
+ this.setLayout(new VerticalLayout(10) );
+
+ this.addListener(
+ new PanelListenerAdapter()
+ {
+
+ public void onRender(Component component)
+ {
+
+ final String reportUrl= view.getUrlBuilder().getDefinitionReportUrl(definitionName);
+ ConsoleLog.debug("Report resource:" + reportUrl);
+
+ final ComboBox comboBox = buildInstanceSelection();
+
+ final BirtPanel birtPanel = new BirtPanel();
+ birtPanel.setUrl(reportUrl);
+
+ // --
+
+ Button refreshBtn = new Button("Refresh", new ButtonListenerAdapter()
+ {
+
+ public void onClick(Button button, EventObject eventObject)
+ {
+ birtPanel.setUrl(reportUrl);
+ }
+ });
+
+ Button viewBtn = new Button("Examine", new ButtonListenerAdapter()
+ {
+
+ public void onClick(Button button, EventObject eventObject)
+ {
+ String rawValue = comboBox.getRawValue();
+ if(rawValue==null || rawValue.equals(""))
+ MessageBox.alert("Please enter a process instance ID!");
+ else
+ MessageBox.alert("Not implemented");
+ }
+ });
+
+ // --
+
+ Panel p = new Panel();
+ p.setLayout( new HorizontalLayout(10) );
+ Label label = new Label("Instance ID");
+ label.setStyleName("bpm-label");
+ p.add(label);
+ p.add(comboBox);
+ p.add( viewBtn );
+ p.add( new Separator() );
+ p.add( refreshBtn );
+
+ add(p);
+ add(birtPanel);
+ }
+ }
+ );
+ }
+
+ private ComboBox buildInstanceSelection()
+ {
+
+ final RecordDef recordDef = new RecordDef(
+ new FieldDef[]{
+ new IntegerFieldDef("instanceId"),
+ new IntegerFieldDef("parentId"),
+ new StringFieldDef("key"),
+ new StringFieldDef("state"),
+ new DateFieldDef("startDate", UIConstants.DATE_FORMAT),
+ new DateFieldDef("endDate", UIConstants.DATE_FORMAT),
+ new BooleanFieldDef("suspended")
+ }
+ );
+
+ final JsonReader reader = new JsonReader(recordDef);
+ reader.setRoot("instances");
+ reader.setTotalProperty("totalCount");
+ reader.setId("instanceId");
+
+ DataProxy dataProxy = new ScriptTagProxy(
+ view.getUrlBuilder().getProcessDefinitionsURL(), 1000*10);
+
+ final Store store = new Store(dataProxy, reader, false);
+ store.load();
+
+ ComboBox cb = new ComboBox();
+ cb.setMinChars(1);
+ cb.setFieldLabel("Instance ID");
+ cb.setStore(store);
+ cb.setDisplayField("ID");
+ cb.setMode(ComboBox.LOCAL);
+ cb.setTriggerAction(ComboBox.ALL);
+ cb.setEmptyText("Please enter an ID");
+ cb.setLoadingText("Searching...");
+ cb.setTypeAhead(true);
+ cb.setSelectOnFocus(true);
+ cb.setWidth(180);
+
+ return cb;
+ }
+ public String getEditorId()
+ {
+ return createWidgetID(definitionName);
+ }
+
+ public String getTitle()
+ {
+ return definitionName +" Metrics";
+ }
+
+ public String getIconCSS()
+ {
+ return "bpm-metric-icon";
+ }
+
+ public static String createWidgetID(String definitionName)
+ {
+ return ID+"."+definitionName;
+ }
+}
Copied: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/ReportOverviewEditor.java (from rev 3262, projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/MetricOverviewEditor.java)
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/ReportOverviewEditor.java (rev 0)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/ReportOverviewEditor.java 2008-12-08 11:54:47 UTC (rev 3265)
@@ -0,0 +1,185 @@
+/*
+ * 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.metric;
+
+import com.gwtext.client.core.EventObject;
+import com.gwtext.client.data.*;
+import com.gwtext.client.widgets.Button;
+import com.gwtext.client.widgets.Component;
+import com.gwtext.client.widgets.Panel;
+import com.gwtext.client.widgets.MessageBox;
+import com.gwtext.client.widgets.event.ButtonListenerAdapter;
+import com.gwtext.client.widgets.event.PanelListenerAdapter;
+import com.gwtext.client.widgets.form.ComboBox;
+import com.gwtext.client.widgets.form.Label;
+import com.gwtext.client.widgets.layout.HorizontalLayout;
+import com.gwtext.client.widgets.layout.VerticalLayout;
+import com.gwtext.client.widgets.menu.Separator;
+import org.jboss.bpm.console.client.Editor;
+import org.jboss.bpm.console.client.MainView;
+import org.jboss.bpm.console.client.util.ConsoleLog;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class ReportOverviewEditor extends Editor
+{
+ public final static String ID = "org.jboss.bpm.metric.ProcessMetricOverview";
+ private MainView view;
+
+ public ReportOverviewEditor(final MainView view)
+ {
+ super();
+ this.view = view;
+ this.setId(ID);
+ this.setPaddings(10);
+
+ // -------------------------------------
+ this.setLayout(new VerticalLayout(10) );
+
+ this.addListener(
+ new PanelListenerAdapter()
+ {
+
+ public void onRender(Component component)
+ {
+
+ Panel panel = new Panel("Metric overview");
+ panel.setPaddings(10);
+
+ final String reportUrl= view.getUrlBuilder().getOverviewReportUrl();
+ ConsoleLog.debug("Report resource:" + reportUrl);
+
+ final ComboBox comboBox = buildProcessSelection();
+
+ final BirtPanel birtPanel = new BirtPanel();
+ birtPanel.setUrl(reportUrl);
+
+ // --
+
+ Button refreshBtn = new Button("Refresh", new ButtonListenerAdapter()
+ {
+
+ public void onClick(Button button, EventObject eventObject)
+ {
+ birtPanel.setUrl(reportUrl);
+ }
+ });
+
+ Button viewBtn = new Button("Examine", new ButtonListenerAdapter()
+ {
+
+ public void onClick(Button button, EventObject eventObject)
+ {
+ String rawValue = comboBox.getRawValue();
+ if(rawValue==null || rawValue.equals(""))
+ MessageBox.alert("Please enter a process definition name!");
+ else
+ onExamine(rawValue);
+ }
+ });
+
+ // --
+
+ Panel toolsPanel = new Panel();
+ toolsPanel.setLayout( new HorizontalLayout(10) );
+ Label label = new Label("Process definition");
+ label.setStyleName("bpm-label");
+ toolsPanel.add(label);
+ toolsPanel.add(comboBox);
+ toolsPanel.add( viewBtn );
+ toolsPanel.add( new Separator() );
+ toolsPanel.add( refreshBtn );
+
+ panel.add(toolsPanel);
+ panel.add(birtPanel);
+
+ add(panel);
+ }
+ }
+ );
+ }
+
+
+ private void onExamine(String definitionName)
+ {
+ String editorId = ProcessReportEditor.createWidgetID(definitionName);
+
+ if(view.hasEditor(editorId))
+ view.showEditor(editorId);
+ else
+ view.addEditor( new ProcessReportEditor(definitionName, view) );
+ }
+
+ private ComboBox buildProcessSelection()
+ {
+
+ final RecordDef recordDef = new RecordDef(
+ new FieldDef[]{
+ new IntegerFieldDef("processId"),
+ new StringFieldDef("name"),
+ new StringFieldDef("version")
+ }
+ );
+
+ final JsonReader reader = new JsonReader(recordDef);
+ reader.setRoot("definitions");
+ reader.setTotalProperty("totalCount");
+ reader.setId("processId");
+
+ DataProxy dataProxy = new ScriptTagProxy(
+ view.getUrlBuilder().getProcessDefinitionsURL(), 1000*10);
+
+ final Store store = new Store(dataProxy, reader, false);
+ store.load();
+
+ ComboBox cb = new ComboBox();
+ cb.setMinChars(1);
+ cb.setFieldLabel("Process definition");
+ cb.setStore(store);
+ cb.setDisplayField("name");
+ cb.setMode(ComboBox.LOCAL);
+ cb.setTriggerAction(ComboBox.ALL);
+ cb.setEmptyText("Please enter a name");
+ cb.setLoadingText("Searching...");
+ cb.setTypeAhead(true);
+ cb.setSelectOnFocus(true);
+ cb.setWidth(180);
+
+ return cb;
+ }
+
+ public String getEditorId()
+ {
+ return ID;
+ }
+
+ public String getTitle()
+ {
+ return "Metrics and Stats";
+ }
+
+ public String getIconCSS()
+ {
+ return "bpm-metric-icon";
+ }
+}
Property changes on: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/metric/ReportOverviewEditor.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/DAOFactory.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/DAOFactory.java 2008-12-08 11:43:08 UTC (rev 3264)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/DAOFactory.java 2008-12-08 11:54:47 UTC (rev 3265)
@@ -1,54 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.console.client.model;
-
-import org.jboss.bpm.console.client.model.internal.MockHelpDAO;
-import org.jboss.bpm.console.client.model.internal.MockProcessDefinitionDAO;
-import org.jboss.bpm.console.client.model.internal.MockMetricsDAO;
-import org.jboss.bpm.console.client.model.internal.MockProcessInstanceDAO;
-
-/**
- * @author Heiko.Braun <heiko.braun(a)jboss.com>
- */
-@Deprecated
-public class DAOFactory
-{
- public static ProcessDefinitionDAO createProcessDefinitionDAO()
- {
- return new MockProcessDefinitionDAO();
- }
-
- public static ProcessInstanceDAO createProcessInstanceDAO()
- {
- return new MockProcessInstanceDAO();
- }
-
- public static HelpDAO createHelpDAO()
- {
- return new MockHelpDAO();
- }
-
- public static MetricsDAO createMetricsDAO()
- {
- return new MockMetricsDAO();
- }
-}
Deleted: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/HelpDAO.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/HelpDAO.java 2008-12-08 11:43:08 UTC (rev 3264)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/HelpDAO.java 2008-12-08 11:54:47 UTC (rev 3265)
@@ -1,33 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.console.client.model;
-
-/**
- * @author Heiko.Braun <heiko.braun(a)jboss.com>
- */
-public interface HelpDAO
-{
- public final static int REF_PROCESS_DEFINITIONS = 100;
- public final static int REF_PROCESS_METRIC = 200;
-
- String getHelpByReference(int ref);
-}
Deleted: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/MetricsDAO.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/MetricsDAO.java 2008-12-08 11:43:08 UTC (rev 3264)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/MetricsDAO.java 2008-12-08 11:54:47 UTC (rev 3265)
@@ -1,31 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.console.client.model;
-
-/**
- * @author Heiko.Braun <heiko.braun(a)jboss.com>
- */
-public interface MetricsDAO
-{
-
- ProcessInstancePerformance getProcessInstancePerformance(long processId);
-}
Deleted: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/ProcessDefinitionDAO.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/ProcessDefinitionDAO.java 2008-12-08 11:43:08 UTC (rev 3264)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/ProcessDefinitionDAO.java 2008-12-08 11:54:47 UTC (rev 3265)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.console.client.model;
-
-import java.util.List;
-
-/**
- * @author Heiko.Braun <heiko.braun(a)jboss.com>
- */
-@Deprecated
-public interface ProcessDefinitionDAO
-{
- List getAllProcessDefinitions();
-
- ProcessDefinitionRef getProcessDefinitionById(long id);
-}
Deleted: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/ProcessInstanceDAO.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/ProcessInstanceDAO.java 2008-12-08 11:43:08 UTC (rev 3264)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/ProcessInstanceDAO.java 2008-12-08 11:54:47 UTC (rev 3265)
@@ -1,33 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.console.client.model;
-
-import java.util.List;
-
-/**
- * @author Heiko.Braun <heiko.braun(a)jboss.com>
- */
-@Deprecated
-public interface ProcessInstanceDAO
-{
- List getInstanceByProcessDefinitionId(long id);
-}
Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionListEditor.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionListEditor.java 2008-12-08 11:43:08 UTC (rev 3264)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionListEditor.java 2008-12-08 11:54:47 UTC (rev 3265)
@@ -37,8 +37,6 @@
import org.jboss.bpm.console.client.Editor;
import org.jboss.bpm.console.client.MainView;
import org.jboss.bpm.console.client.UIConstants;
-import org.jboss.bpm.console.client.model.DAOFactory;
-import org.jboss.bpm.console.client.model.HelpDAO;
import org.jboss.bpm.console.client.util.ConsoleLog;
import org.jboss.bpm.console.client.widgets.HelpPanel;
import org.jboss.bpm.console.client.util.ModelListenerRegistry;
@@ -161,7 +159,7 @@
// ----------------------------------
HelpPanel help = new HelpPanel(UIConstants.TEASER_PANEL_WIDTH, 180, "About process definitions");
- help.setContent( DAOFactory.createHelpDAO().getHelpByReference(HelpDAO.REF_PROCESS_DEFINITIONS));
+ help.setContent( "");
// ----------------------------------
17 years, 4 months
- 1
- 0