[jbpm-commits] JBoss JBPM SVN: r3831 - in projects/gwt-console/trunk: plugin-api and 9 other directories.

Author: heiko.braun(a)jboss.com Date: 2009-02-11 08:13:20 -0500 (Wed, 11 Feb 2009) New Revision: 3831 Added: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/gson/ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/gson/GsonFactory.java projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/gson/SQLDateTypeAdapter.java Removed: projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/server/gson/ projects/gwt-console/trunk/server-integration/src/main/java/org/jboss/bpm/console/server/integration/ExtensionManagement.java Modified: projects/gwt-console/trunk/gwt-parent.iml projects/gwt-console/trunk/plugin-api/plugin.iml projects/gwt-console/trunk/pom.xml projects/gwt-console/trunk/rpc/pom.xml projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/ProcessDefinitionRef.java projects/gwt-console/trunk/server-integration/gwt-server-integration.iml projects/gwt-console/trunk/server-integration/src/main/java/org/jboss/bpm/console/server/integration/ManagementFactory.java projects/gwt-console/trunk/server-integration/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java projects/gwt-console/trunk/server/pom.xml projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/TaskMgmtFacade.java projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/TestFacade.java projects/gwt-console/trunk/war/gwt-war.iml Log: Cleanup dependencies Modified: projects/gwt-console/trunk/gwt-parent.iml =================================================================== --- projects/gwt-console/trunk/gwt-parent.iml 2009-02-11 12:12:09 UTC (rev 3830) +++ projects/gwt-console/trunk/gwt-parent.iml 2009-02-11 13:13:20 UTC (rev 3831) @@ -4,11 +4,12 @@ <component name="NewModuleRootManager" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/plugin-api/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/plugin-api/src/main/resources" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/plugin-example/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/plugin-example/src/main/resources" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/plugin/src/main/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/plugin/src/main/resources" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/rpc/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/server-integration/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/server/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/server/src/main/resources" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/server/src/test/java" isTestSource="true" /> @@ -29,15 +30,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: com.google.gwt:gwt-servlet:jar:1.5.2:runtime"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/gwt/gwt-servlet/1.5.2/gwt-servlet-1.5.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!/" /> @@ -184,15 +176,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: com.google.code.gson:gson:jar:1.2.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/code/gson/gson/1.2.2/gson-1.2.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.scannotation:scannotation:jar:1.0.2:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/scannotation/scannotation/1.0.2/scannotation-1.0.2.jar!/" /> @@ -220,15 +203,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: net.sf.ezmorph:ezmorph:jar:1.0.6:test"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/net/sf/ezmorph/ezmorph/1.0.6/ezmorph-1.0.6.jar!/" /> @@ -313,6 +287,33 @@ <SOURCES /> </library> </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.google.gwt:gwt-servlet:jar:1.5.2:runtime"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/gwt/gwt-servlet/1.5.2/gwt-servlet-1.5.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.google.code.gson:gson:jar:1.2.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/code/gson/gson/1.2.2/gson-1.2.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: 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> <orderEntryProperties /> </component> </module> Modified: projects/gwt-console/trunk/plugin-api/plugin.iml =================================================================== --- projects/gwt-console/trunk/plugin-api/plugin.iml 2009-02-11 12:12:09 UTC (rev 3830) +++ projects/gwt-console/trunk/plugin-api/plugin.iml 2009-02-11 13:13:20 UTC (rev 3831) @@ -9,6 +9,7 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="gwt-parent" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: com.gwtext:gwtext:jar:2.0.5:compile"> <CLASSES> @@ -55,17 +56,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jbpm.jbpm3:gwt-console-rpc:jar:1.0.0-SNAPSHOT:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm3/gwt-console-rpc/1.0.0-SNAPSHOT/gwt-console-rpc-1.0.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm3/gwt-console-rpc/1.0.0-SNAPSHOT/gwt-console-rpc-1.0.0-SNAPSHOT-sources.jar!/" /> - </SOURCES> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" /> Modified: projects/gwt-console/trunk/pom.xml =================================================================== --- projects/gwt-console/trunk/pom.xml 2009-02-11 12:12:09 UTC (rev 3830) +++ projects/gwt-console/trunk/pom.xml 2009-02-11 13:13:20 UTC (rev 3831) @@ -1,165 +1,195 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <name>JBoss BPM - GWT Console</name> - <groupId>org.jboss.bpm</groupId> - <artifactId>gwt-console-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> - <packaging>pom</packaging> + <modelVersion>4.0.0</modelVersion> + <name>JBoss BPM - GWT Console</name> + <groupId>org.jboss.bpm</groupId> + <artifactId>gwt-console-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>pom</packaging> - <!-- Parent --> - <parent> - <groupId>org.jbpm</groupId> - <artifactId>jbpm-parent</artifactId> - <version>1.0.0.GA</version> - </parent> + <!-- Parent --> + <parent> + <groupId>org.jbpm</groupId> + <artifactId>jbpm-parent</artifactId> + <version>1.0.0.GA</version> + </parent> - <properties> - <bpm.spec.version>1.0.0-Alpha1</bpm.spec.version> - <commons.fileupload.version>1.2.1</commons.fileupload.version> - <commons.io.version>1.3.2</commons.io.version> - <commons.logging.version>1.1.1</commons.logging.version> - <gson.version>1.2.2</gson.version> - <gwt.version>1.5.2</gwt.version> - <gwtext.version>2.0.5</gwtext.version> - <gwt-log.version>2.5.2</gwt-log.version> - <jaf.version>1.1</jaf.version> - <javax.ejb.version>3.0</javax.ejb.version> - <javax.jaxb.version>2.1</javax.jaxb.version> - <jboss.common.version>2.2.7.GA</jboss.common.version> - <jbpm.version>3.3.1.GA</jbpm.version> - <junit.version>3.8.1</junit.version> - <resteasy.version>1.0-beta-8</resteasy.version> - <stax-api.version>1.0-2</stax-api.version> - </properties> + <properties> + <bpm.spec.version>1.0.0-Alpha1</bpm.spec.version> + <commons.fileupload.version>1.2.1</commons.fileupload.version> + <commons.io.version>1.3.2</commons.io.version> + <commons.logging.version>1.1.1</commons.logging.version> + <gson.version>1.2.2</gson.version> + <gwt.version>1.5.2</gwt.version> + <gwtext.version>2.0.5</gwtext.version> + <gwt-log.version>2.5.2</gwt-log.version> + <jaf.version>1.1</jaf.version> + <javax.ejb.version>3.0</javax.ejb.version> + <javax.jaxb.version>2.1</javax.jaxb.version> + <jboss.common.version>2.2.7.GA</jboss.common.version> + <jbpm.version>3.3.1.GA</jbpm.version> + <junit.version>3.8.1</junit.version> + <resteasy.version>1.0-beta-8</resteasy.version> + <stax-api.version>1.0-2</stax-api.version> + </properties> - <modules> - <module>rpc</module> - <module>server-integration</module> - <module>server</module> - <module>war</module> - <module>plugin-api/</module> - <module>plugin-example</module> - </modules> + <modules> + <module>rpc</module> + <module>server-integration</module> + <module>server</module> + <module>war</module> + <module>plugin-api/</module> + <module>plugin-example</module> + </modules> - <dependencyManagement> - <dependencies> + <dependencyManagement> + <dependencies> - <!-- GET related --> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-servlet</artifactId> - <version>${gwt.version}</version> - </dependency> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-user</artifactId> - <version>${gwt.version}</version> - </dependency> + <!-- GET related --> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-servlet</artifactId> + <version>${gwt.version}</version> + </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-user</artifactId> + <version>${gwt.version}</version> + </dependency> - <dependency> - <groupId>com.gwtext</groupId> - <artifactId>gwtext</artifactId> - <version>${gwtext.version}</version> - </dependency> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gchart</artifactId> - <version>${gchart.version}</version> - </dependency> - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - <version>${gson.version}</version> - </dependency> - <dependency> - <groupId>com.google.code.gwt-log</groupId> - <artifactId>gwt-log</artifactId> - <version>${gwt-log.version}</version> - </dependency> + <dependency> + <groupId>com.gwtext</groupId> + <artifactId>gwtext</artifactId> + <version>${gwtext.version}</version> + </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gchart</artifactId> + <version>${gchart.version}</version> + </dependency> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>${gson.version}</version> + </dependency> + <dependency> + <groupId>com.google.code.gwt-log</groupId> + <artifactId>gwt-log</artifactId> + <version>${gwt-log.version}</version> + </dependency> - <!-- Other --> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>${commons.logging.version}</version> - </dependency> + <!-- Other --> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>${commons.logging.version}</version> + </dependency> - <dependency> - <groupId>javax.xml.stream</groupId> - <artifactId>stax-api</artifactId> - <version>${stax-api.version}</version> - </dependency> - <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - <version>${jaf.version}</version> - </dependency> - <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <version>${javax.jaxb.version}</version> - </dependency> - <dependency> - <groupId>javax.ejb</groupId> - <artifactId>ejb-api</artifactId> - <version>${javax.ejb.version}</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-common-core</artifactId> - <version>${jboss.common.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.resteasy</groupId> - <artifactId>resteasy-jaxrs</artifactId> - <version>${resteasy.version}</version> - </dependency> + <dependency> + <groupId>javax.xml.stream</groupId> + <artifactId>stax-api</artifactId> + <version>${stax-api.version}</version> + </dependency> + <dependency> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + <version>${jaf.version}</version> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${javax.jaxb.version}</version> + </dependency> + <dependency> + <groupId>javax.ejb</groupId> + <artifactId>ejb-api</artifactId> + <version>${javax.ejb.version}</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-common-core</artifactId> + <version>${jboss.common.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.resteasy</groupId> + <artifactId>resteasy-jaxrs</artifactId> + <version>${resteasy.version}</version> + </dependency> - <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - <version>${commons.fileupload.version}</version> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>${commons.io.version}</version> - </dependency> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + <version>${commons.fileupload.version}</version> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>${commons.io.version}</version> + </dependency> - </dependencies> - </dependencyManagement> + </dependencies> + </dependencyManagement> - <!-- Repositories --> - <repositories> - <repository> - <id>repository.jboss.org</id> - <url>http://repository.jboss.org/maven2</url> - </repository> - <repository> - <id>snapshots.jboss.org</id> - <name>JBoss Snapshot Repository</name> - <url>http://snapshots.jboss.org/maven2</url> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> - </repositories> - <pluginRepositories> - <pluginRepository> - <id>gwt-maven</id> - <url>http://gwt-maven.googlecode.com/svn/trunk/mavenrepo</url> - </pluginRepository> - </pluginRepositories> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skipTests>true</skipTests> + </configuration> + </plugin> + </plugins> + </build> + <!-- Profiles --> + <profiles> + + <profile> + <id>enableTests</id> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skipTests>false</skipTests> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> + + + <!-- Repositories --> + <repositories> + <repository> + <id>repository.jboss.org</id> + <url>http://repository.jboss.org/maven2</url> + </repository> + <repository> + <id>snapshots.jboss.org</id> + <name>JBoss Snapshot Repository</name> + <url>http://snapshots.jboss.org/maven2</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>gwt-maven</id> + <url>http://gwt-maven.googlecode.com/svn/trunk/mavenrepo</url> + </pluginRepository> + </pluginRepositories> + </project> Modified: projects/gwt-console/trunk/rpc/pom.xml =================================================================== --- projects/gwt-console/trunk/rpc/pom.xml 2009-02-11 12:12:09 UTC (rev 3830) +++ projects/gwt-console/trunk/rpc/pom.xml 2009-02-11 13:13:20 UTC (rev 3831) @@ -16,15 +16,9 @@ <relativePath>../pom.xml</relativePath> </parent> - <dependencies> + <dependencies> <dependency> <groupId>com.google.gwt</groupId> - <artifactId>gwt-servlet</artifactId> - <version>${gwt.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>com.google.gwt</groupId> <artifactId>gwt-user</artifactId> <version>${gwt.version}</version> <scope>provided</scope> Modified: projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/ProcessDefinitionRef.java =================================================================== --- projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/ProcessDefinitionRef.java 2009-02-11 12:12:09 UTC (rev 3830) +++ projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/ProcessDefinitionRef.java 2009-02-11 13:13:20 UTC (rev 3831) @@ -30,80 +30,113 @@ * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; */ @XmlRootElement(name="processDefinition") -public class ProcessDefinitionRef implements IsSerializable +public class ProcessDefinitionRef { - private long processId; - private String name; - private String version; + private long processId; + private String name; + private long version; + private String key; + private String description; + private String packageName; - public ProcessDefinitionRef() - { - } + public ProcessDefinitionRef() + { + } - public ProcessDefinitionRef(long id, String name, String version) - { - this.processId = id; - this.name = name; - this.version = version; - } + public ProcessDefinitionRef(long id, String name, long version) + { + this.processId = id; + this.name = name; + this.version = version; + } - @XmlElement(name = "processId") - public long getProcessId() - { - return processId; - } + @XmlElement(name = "processId") + public long getProcessId() + { + return processId; + } - public void setProcessId(long processId) - { - this.processId = processId; - } + public void setProcessId(long processId) + { + this.processId = processId; + } - @XmlElement(name = "name") - public String getName() - { - return name; - } + @XmlElement(name = "name") + public String getName() + { + return name; + } - public void setName(String name) - { - this.name = name; - } + public void setName(String name) + { + this.name = name; + } - public String getVersion() - { - return version; - } + public long getVersion() + { + return version; + } - public void setVersion(String version) - { - this.version = version; - } + public void setVersion(long version) + { + this.version = version; + } - public String toString() - { - return "ProcessDefinitionRef{id="+this.processId +", name="+this.name+", version="+this.version+"}"; - } + public String toString() + { + return "ProcessDefinitionRef{id="+this.processId +", name="+this.name+", version="+this.version+"}"; + } - public boolean equals(Object o) - { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + public String getKey() + { + return key; + } - ProcessDefinitionRef that = (ProcessDefinitionRef) o; + public void setKey(String key) + { + this.key = key; + } - if (processId != that.processId) return false; - if (name != null ? !name.equals(that.name) : that.name != null) return false; - if (version != null ? !version.equals(that.version) : that.version != null) return false; + public String getDescription() + { + return description; + } - return true; - } + public void setDescription(String description) + { + this.description = description; + } - public int hashCode() - { - int result; - result = (int) (processId ^ (processId >>> 32)); - result = 31 * result + (name != null ? name.hashCode() : 0); - result = 31 * result + (version != null ? version.hashCode() : 0); - return result; - } + public String getPackageName() + { + return packageName; + } + + public void setPackageName(String packageName) + { + this.packageName = packageName; + } + + public boolean equals(Object o) + { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + ProcessDefinitionRef that = (ProcessDefinitionRef) o; + + if (processId != that.processId) return false; + if (version != that.version) return false; + if (name != null ? !name.equals(that.name) : that.name != null) return false; + + return true; + } + + public int hashCode() + { + int result; + result = (int) (processId ^ (processId >>> 32)); + result = 31 * result + (name != null ? name.hashCode() : 0); + result = 31 * result + (int) (version ^ (version >>> 32)); + return result; + } } Modified: projects/gwt-console/trunk/server/pom.xml =================================================================== --- projects/gwt-console/trunk/server/pom.xml 2009-02-11 12:12:09 UTC (rev 3830) +++ projects/gwt-console/trunk/server/pom.xml 2009-02-11 13:13:20 UTC (rev 3831) @@ -26,11 +26,13 @@ <groupId>org.jboss.bpm</groupId> <artifactId>gwt-console-rpc</artifactId> <version>${version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.bpm</groupId> <artifactId>gwt-console-server-integration</artifactId> <version>${version}</version> + <scope>provided</scope> </dependency> <!-- GWT related --> Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java =================================================================== --- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java 2009-02-11 12:12:09 UTC (rev 3830) +++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java 2009-02-11 13:13:20 UTC (rev 3831) @@ -34,7 +34,6 @@ import org.jboss.bpm.console.client.model.ProcessInstanceRef; import org.jboss.bpm.console.client.model.ProcessInstanceRefWrapper; import org.jboss.bpm.console.server.gson.GsonFactory; -import org.jboss.bpm.console.server.integration.ExtensionManagement; import org.jboss.bpm.console.server.integration.ManagementFactory; import org.jboss.bpm.console.server.integration.ProcessManagement; Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/TaskMgmtFacade.java =================================================================== --- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/TaskMgmtFacade.java 2009-02-11 12:12:09 UTC (rev 3830) +++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/TaskMgmtFacade.java 2009-02-11 13:13:20 UTC (rev 3831) @@ -25,17 +25,12 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jboss.bpm.console.client.model.TaskRefWrapper; -import org.jboss.bpm.console.client.model.util.MapEntry; import org.jboss.bpm.console.server.gson.GsonFactory; -import org.jboss.bpm.console.server.integration.ExtensionManagement; import org.jboss.bpm.console.server.integration.ManagementFactory; import org.jboss.bpm.console.server.integration.TaskManagement; import javax.ws.rs.*; import javax.ws.rs.core.Response; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; /** * REST server module for accessing task related data. @@ -48,7 +43,6 @@ private static final Log log = LogFactory.getLog(TaskMgmtFacade.class); private TaskManagement taskManagement; - private ExtensionManagement JBPM3Extension; /** * Lazy load the {@link org.jboss.bpm.console.server.integration.ProcessManagement} @@ -65,18 +59,6 @@ return this.taskManagement; } - private ExtensionManagement getManagementExtension() - { - if(null==this.JBPM3Extension) - { - ManagementFactory factory = ManagementFactory.newInstance(); - this.JBPM3Extension = factory.createExtensionManagement(); - } - - return this.JBPM3Extension; - - } - @GET @Path("actor/{actorName}") @Produces("application/json") @@ -90,26 +72,6 @@ return createJsonResponse(wrapper); } - @GET - @Path("forms/{processId}") - @Produces("application/json") - public Response getTasksForms( - @PathParam("processId") - long processId - ) - { - Map<String,String> formMapping = - getManagementExtension().getAvailableTaskForms(processId); - - List<MapEntry> entries = new ArrayList<MapEntry>(); - for(String s : formMapping.keySet()) - { - entries.add( new MapEntry(s, formMapping.get(s)) ); - } - - return createJsonResponse( entries ); - } - @POST @Path("{taskId}/assignment/{actorId}") @Produces("application/json") Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/TestFacade.java =================================================================== --- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/TestFacade.java 2009-02-11 12:12:09 UTC (rev 3830) +++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/TestFacade.java 2009-02-11 13:13:20 UTC (rev 3831) @@ -21,25 +21,20 @@ */ package org.jboss.bpm.console.server; +import com.google.gson.Gson; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jboss.bpm.console.client.model.ProcessDefinitionRef; -import org.jboss.bpm.console.server.integration.ExtensionManagement; +import org.jboss.bpm.console.server.gson.GsonFactory; import org.jboss.bpm.console.server.integration.ManagementFactory; import org.jboss.bpm.console.server.integration.ProcessManagement; -import org.jboss.bpm.console.server.gson.GsonFactory; import javax.ws.rs.POST; import javax.ws.rs.Path; -import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Response; -import java.io.ByteArrayOutputStream; -import java.io.IOException; import java.io.InputStream; import java.util.List; -import com.google.gson.Gson; - /** * Test utility to simplify GWT tests. * @@ -50,22 +45,9 @@ { private static final Log log = LogFactory.getLog(TaskMgmtFacade.class); - private ExtensionManagement JBPM3Extension; private ProcessManagement processManagement; private static final String SAMPLE_PROCESS_PAR = "/SampleProcess.par"; - private ExtensionManagement getManagementExtension() - { - if(null==this.JBPM3Extension) - { - ManagementFactory factory = ManagementFactory.newInstance(); - this.JBPM3Extension = factory.createExtensionManagement(); - } - - return this.JBPM3Extension; - - } - private ProcessManagement getProcessManagement() { if(null==this.processManagement) @@ -82,33 +64,12 @@ @Path("deploy/harness") public Response deployTestHarness() { - try - { - InputStream in = getClass().getResourceAsStream(SAMPLE_PROCESS_PAR); + InputStream in = getClass().getResourceAsStream(SAMPLE_PROCESS_PAR); + if(null==in) + throw new RuntimeException("Failed to read test deployment: " + SAMPLE_PROCESS_PAR); - if(null==in) - throw new RuntimeException("Failed to read test deployment: " + SAMPLE_PROCESS_PAR); - - ByteArrayOutputStream out = new ByteArrayOutputStream(); - final int BUF_SIZE = 1 << 8; - byte[] buffer = new byte[BUF_SIZE]; - int bytesRead = -1; - while((bytesRead = in.read(buffer)) > -1) { - out.write(buffer, 0, bytesRead); - } - in.close(); - byte[] data = out.toByteArray(); - - ProcessDefinitionRef def = getManagementExtension().deployNewDefinition(data); - log.info("Deployed test process definition " + def); - - return createJsonResponse(def); - } - catch (IOException e) - { - throw new WebApplicationException(e, 500); - } - + getProcessManagement().deploy(in); + return Response.ok().build(); } @POST Added: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/gson/GsonFactory.java =================================================================== --- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/gson/GsonFactory.java (rev 0) +++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/gson/GsonFactory.java 2009-02-11 13:13:20 UTC (rev 3831) @@ -0,0 +1,40 @@ +/* + * 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.server.gson; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +public class GsonFactory +{ + public static Gson createInstance() + { + Gson gson = new GsonBuilder() + .setDateFormat("yyyy-MM-dd HH:mm:ss") + .registerTypeAdapter(java.sql.Timestamp.class, new SQLDateTypeAdapter()) + .create(); + return gson; + } +} Added: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/gson/SQLDateTypeAdapter.java =================================================================== --- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/gson/SQLDateTypeAdapter.java (rev 0) +++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/gson/SQLDateTypeAdapter.java 2009-02-11 13:13:20 UTC (rev 3831) @@ -0,0 +1,69 @@ +/* + * 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.server.gson; + +import com.google.gson.*; + +import java.util.Date; +import java.text.*; +import java.lang.reflect.Type; + + +/** + * A default type adapter for a {@link java.util.Date} object.<br> + * Create a GSON instance that can serialize/deserialize "java.util.Date" objects: + * <pre> + * Gson gson = new GsonBuilder() + * .registerTypeAdapter(new DateTypeAdapter()) + * .create(); + * </pre> + * + * @author Joel Leitch + */ +public class SQLDateTypeAdapter implements JsonSerializer<java.sql.Timestamp>, JsonDeserializer<Date> +{ + private final DateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + public JsonElement serialize(java.sql.Timestamp src, Type typeOfSrc, JsonSerializationContext context) + { + String dateFormatAsString = format.format(src); + return new JsonPrimitive(dateFormatAsString); + } + + public Date deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) + throws JsonParseException + { + if (!(json instanceof JsonPrimitive)) { + throw new JsonParseException("The date should be a string value"); + } + + try + { + return format.parse(json.getAsString()); + } + catch (ParseException e) + { + throw new JsonParseException(e); + } + + } +} Modified: projects/gwt-console/trunk/server-integration/gwt-server-integration.iml =================================================================== --- projects/gwt-console/trunk/server-integration/gwt-server-integration.iml 2009-02-11 12:12:09 UTC (rev 3830) +++ projects/gwt-console/trunk/server-integration/gwt-server-integration.iml 2009-02-11 13:13:20 UTC (rev 3831) @@ -8,6 +8,63 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="gwt-parent" /> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javax.ejb:ejb-api:jar:3.0:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/ejb/ejb-api/3.0/ejb-api-3.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.google.code.gson:gson:jar:1.2.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/code/gson/gson/1.2.2/gson-1.2.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.google.gwt:gwt-servlet:jar:1.5.2:runtime"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-servlet/1.5.2/gwt-servlet-1.5.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javax.activation:activation:jar:1.1:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Deleted: projects/gwt-console/trunk/server-integration/src/main/java/org/jboss/bpm/console/server/integration/ExtensionManagement.java =================================================================== --- projects/gwt-console/trunk/server-integration/src/main/java/org/jboss/bpm/console/server/integration/ExtensionManagement.java 2009-02-11 12:12:09 UTC (rev 3830) +++ projects/gwt-console/trunk/server-integration/src/main/java/org/jboss/bpm/console/server/integration/ExtensionManagement.java 2009-02-11 13:13:20 UTC (rev 3831) @@ -1,48 +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.server.integration; - -import java.util.Map; - -import org.jboss.bpm.console.client.model.ProcessDefinitionRef; -import org.jboss.bpm.console.client.model.jbpm3.ActiveNodeInfo; -import org.jboss.bpm.console.client.model.jbpm3.DiagramInfo; - -/** - * Proprietary to jBPM3, no sure if it will stay. - * - * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; - */ -public interface ExtensionManagement -{ - byte[] getProcessImage(long processId); - - DiagramInfo getDiagramInfo(long processId); - - ActiveNodeInfo getActivNodeInfo(long instanceId); - - Map<String, String> getAvailableTaskForms(long processId); - - byte[] getTaskFormByTaskName(long processId, long taskId); - - ProcessDefinitionRef deployNewDefinition(byte[] data); -} Modified: projects/gwt-console/trunk/server-integration/src/main/java/org/jboss/bpm/console/server/integration/ManagementFactory.java =================================================================== --- projects/gwt-console/trunk/server-integration/src/main/java/org/jboss/bpm/console/server/integration/ManagementFactory.java 2009-02-11 12:12:09 UTC (rev 3830) +++ projects/gwt-console/trunk/server-integration/src/main/java/org/jboss/bpm/console/server/integration/ManagementFactory.java 2009-02-11 13:13:20 UTC (rev 3831) @@ -49,6 +49,5 @@ public abstract TaskManagement createTaskManagement(); public abstract UserManagement createUserManagement(); - - public abstract ExtensionManagement createExtensionManagement(); + } Modified: projects/gwt-console/trunk/server-integration/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java =================================================================== --- projects/gwt-console/trunk/server-integration/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java 2009-02-11 12:12:09 UTC (rev 3830) +++ projects/gwt-console/trunk/server-integration/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java 2009-02-11 13:13:20 UTC (rev 3831) @@ -26,6 +26,7 @@ import org.jboss.bpm.console.client.model.ProcessInstanceRef.STATE; import java.util.List; +import java.io.InputStream; /** * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; @@ -33,19 +34,21 @@ */ public interface ProcessManagement { - List<ProcessDefinitionRef> getProcessDefinitions(); + List<ProcessDefinitionRef> getProcessDefinitions(); - ProcessDefinitionRef getProcessDefinition(long procDefId); + ProcessDefinitionRef getProcessDefinition(long procDefId); - List<ProcessDefinitionRef> removeProcessDefinition(long procDefId); + List<ProcessDefinitionRef> removeProcessDefinition(long procDefId); - List<ProcessInstanceRef> getProcessInstances(long procDefId); + List<ProcessInstanceRef> getProcessInstances(long procDefId); - ProcessInstanceRef getProcessInstance(long procId); + ProcessInstanceRef getProcessInstance(long procId); - ProcessInstanceRef newInstance(long procDefId); + ProcessInstanceRef newInstance(long procDefId); - void setProcessState(long procId, STATE nextState); + void setProcessState(long procId, STATE nextState); - void signalToken(long tokenId, String signal); + void signalToken(long tokenId, String signal); + + void deploy(InputStream deployment); } Modified: projects/gwt-console/trunk/war/gwt-war.iml =================================================================== --- projects/gwt-console/trunk/war/gwt-war.iml 2009-02-11 12:12:09 UTC (rev 3830) +++ projects/gwt-console/trunk/war/gwt-war.iml 2009-02-11 13:13:20 UTC (rev 3831) @@ -11,7 +11,6 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="plugin" /> <orderEntry type="module" module-name="gwt-parent" /> <orderEntry type="module-library"> <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:compile">