[jbpm-commits] JBoss JBPM SVN: r5179 - in projects/gwt-console/trunk: gui/war and 12 other directories.

Author: heiko.braun(a)jboss.com Date: 2009-07-01 11:48:36 -0400 (Wed, 01 Jul 2009) New Revision: 5179 Added: projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/util/Payload2XML.java projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/util/PayloadCollection.java projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/util/PayloadEntry.java projects/gwt-console/trunk/server/server-core/src/test/java/org/ projects/gwt-console/trunk/server/server-core/src/test/java/org/jboss/ projects/gwt-console/trunk/server/server-core/src/test/java/org/jboss/bpm/ projects/gwt-console/trunk/server/server-core/src/test/java/org/jboss/bpm/test/ projects/gwt-console/trunk/server/server-core/src/test/java/org/jboss/bpm/test/typeconversion/ projects/gwt-console/trunk/server/server-core/src/test/java/org/jboss/bpm/test/typeconversion/AnnotatedComplexType.java projects/gwt-console/trunk/server/server-core/src/test/java/org/jboss/bpm/test/typeconversion/ComplexType.java projects/gwt-console/trunk/server/server-core/src/test/java/org/jboss/bpm/test/typeconversion/IllegalType.java projects/gwt-console/trunk/server/server-core/src/test/java/org/jboss/bpm/test/typeconversion/TypeConversionTestCase.java Modified: projects/gwt-console/trunk/gui/war/gui-war.iml projects/gwt-console/trunk/gui/workspace-example/workspace-example.iml projects/gwt-console/trunk/gwt-parent.iml projects/gwt-console/trunk/pom.xml projects/gwt-console/trunk/server/server-core/pom.xml projects/gwt-console/trunk/server/server-core/server-core.iml projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java projects/gwt-console/trunk/server/server-integration/server-integration.iml projects/gwt-console/trunk/server/server-integration/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java Log: Added Java to XML conversion util Modified: projects/gwt-console/trunk/gui/war/gui-war.iml =================================================================== --- projects/gwt-console/trunk/gui/war/gui-war.iml 2009-07-01 14:59:44 UTC (rev 5178) +++ projects/gwt-console/trunk/gui/war/gui-war.iml 2009-07-01 15:48:36 UTC (rev 5179) @@ -12,8 +12,9 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="gwt-rpc" exported="" /> - <orderEntry type="module" module-name="gwt-parent" exported="" /> - <orderEntry type="module" module-name="workspace-api" exported="" /> + <orderEntry type="module" module-name="workspace-api" /> + <orderEntry type="module" module-name="profiles" /> + <orderEntry type="module" module-name="gwt-parent" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:compile"> <CLASSES> Modified: projects/gwt-console/trunk/gui/workspace-example/workspace-example.iml =================================================================== --- projects/gwt-console/trunk/gui/workspace-example/workspace-example.iml 2009-07-01 14:59:44 UTC (rev 5178) +++ projects/gwt-console/trunk/gui/workspace-example/workspace-example.iml 2009-07-01 15:48:36 UTC (rev 5179) @@ -10,8 +10,8 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="toplevel" /> + <orderEntry type="module" module-name="workspace-api" /> <orderEntry type="module" module-name="gwt-parent" /> - <orderEntry type="module" module-name="workspace-api" /> <orderEntry type="module-library"> <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:compile"> <CLASSES> Modified: projects/gwt-console/trunk/gwt-parent.iml =================================================================== --- projects/gwt-console/trunk/gwt-parent.iml 2009-07-01 14:59:44 UTC (rev 5178) +++ projects/gwt-console/trunk/gwt-parent.iml 2009-07-01 15:48:36 UTC (rev 5179) @@ -17,17 +17,12 @@ <sourceFolder url="file://$MODULE_DIR$/gui/workspace-example/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/gui/workspace-example/src/main/resources" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/rpc/src/main/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/server/server-core/src/main/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/server/server-core/src/main/resources" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/server/server-core/src/test/java" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/server/server-integration/src/main/java" isTestSource="false" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="gui-war" exported="" /> - <orderEntry type="module" module-name="server-integration" exported="" /> - <orderEntry type="module" module-name="report-server" exported="" /> <orderEntry type="module" module-name="workspace-api" exported="" /> + <orderEntry type="module" module-name="profiles" exported="" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: junit:junit:jar:3.8.1:test"> <CLASSES> @@ -206,134 +201,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.slf4j:slf4j-simple:jar:1.5.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/slf4j/slf4j-simple/1.5.2/slf4j-simple-1.5.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: net.sf.json-lib:json-lib:jar:2.2.3:test"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/net/sf/json-lib/json-lib/2.2.3/json-lib-2.2.3.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: commons-fileupload:commons-fileupload:jar:1.2.1:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-fileupload/commons-fileupload/1.2.1/commons-fileupload-1.2.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: commons-io:commons-io:jar:1.3.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-io/commons-io/1.3.2/commons-io-1.3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss.resteasy:resteasy-jaxrs:jar:1.0.2.GA:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/resteasy/resteasy-jaxrs/1.0.2.GA/resteasy-jaxrs-1.0.2.GA.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: javax.annotation:jsr250-api:jar:1.0:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss.resteasy:resteasy-multipart-provider:jar:1.0.2.GA:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/resteasy/resteasy-multipart-provider/1.0.2.GA/resteasy-multipart-provider-1.0.2.GA.jar!/" /> - </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!/" /> - </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!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.slf4j:slf4j-api:jar:1.5.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: javassist:javassist:jar:3.6.0.GA:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javassist/javassist/3.6.0.GA/javassist-3.6.0.GA.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss.resteasy:jaxrs-api:jar:1.0.2.GA:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/resteasy/jaxrs-api/1.0.2.GA/jaxrs-api-1.0.2.GA.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss.logging:jboss-logging-spi:jar:2.0.5.GA:provided"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar!/" /> - </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!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-dnd:jar:0.1.10:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-dnd/0.1.10/gwt-mosaic-dnd-0.1.10.jar!/" /> @@ -352,24 +219,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.eclipse.birt:chartengineapi:jar:2.3.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/chartengineapi/2.3.2/chartengineapi-2.3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.eclipse.emf:common:jar:2.4.0:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/emf/common/2.4.0/common-2.4.0.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-incubator:jar:0.1.10:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-incubator/0.1.10/gwt-mosaic-incubator-0.1.10.jar!/" /> @@ -379,134 +228,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.eclipse.birt:scriptapi:jar:2.3.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/scriptapi/2.3.2/scriptapi-2.3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.eclipse.birt:engineapi:jar:2.3.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/engineapi/2.3.2/engineapi-2.3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: commons-codec:commons-codec:jar:1.3:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3-sources.jar!/" /> - </SOURCES> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.eclipse.birt:coreapi:jar:2.3.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/coreapi/2.3.2/coreapi-2.3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: rhino:js:jar:1.6R2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/rhino/js/1.6R2/js-1.6R2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.eclipse.emf:ecore:jar:2.4.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/emf/ecore/2.4.2/ecore-2.4.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.w3c: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: com.ibm.icu:icu4j:jar:3.8.1:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/ibm/icu/icu4j/3.8.1/icu4j-3.8.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.eclipse.birt:modelapi:jar:2.3.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/modelapi/2.3.2/modelapi-2.3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: 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.birt:dataadapterapi:jar:2.3.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/dataadapterapi/2.3.2/dataadapterapi-2.3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.eclipse.emf:ecore-xmi:jar:2.4.1:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/emf/ecore-xmi/2.4.1/ecore-xmi-2.4.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: 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.eclipse.birt:dteapi:jar:2.3.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/dteapi/2.3.2/dteapi-2.3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic:jar:0.1.10:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic/0.1.10/gwt-mosaic-0.1.10.jar!/" /> @@ -515,24 +236,6 @@ <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: 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 2009-07-01 14:59:44 UTC (rev 5178) +++ projects/gwt-console/trunk/pom.xml 2009-07-01 15:48:36 UTC (rev 5179) @@ -135,6 +135,12 @@ <artifactId>jaxb-api</artifactId> <version>${javax.jaxb.version}</version> </dependency> + <dependency> + <groupId>javax.xml</groupId> + <artifactId>jaxb-impl</artifactId> + <version>${javax.jaxb.version}</version> + </dependency> + <dependency> <groupId>javax.ejb</groupId> <artifactId>ejb-api</artifactId> Modified: projects/gwt-console/trunk/server/server-core/pom.xml =================================================================== --- projects/gwt-console/trunk/server/server-core/pom.xml 2009-07-01 14:59:44 UTC (rev 5178) +++ projects/gwt-console/trunk/server/server-core/pom.xml 2009-07-01 15:48:36 UTC (rev 5179) @@ -162,8 +162,12 @@ <artifactId>jboss-common-core</artifactId> <scope>provided</scope> </dependency> - <dependency> + <groupId>javax.xml</groupId> + <artifactId>jaxb-impl</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.jboss.bpm</groupId> <artifactId>report-core</artifactId> Modified: projects/gwt-console/trunk/server/server-core/server-core.iml =================================================================== --- projects/gwt-console/trunk/server/server-core/server-core.iml 2009-07-01 14:59:44 UTC (rev 5178) +++ projects/gwt-console/trunk/server/server-core/server-core.iml 2009-07-01 15:48:36 UTC (rev 5179) @@ -16,410 +16,7 @@ <orderEntry type="module" module-name="gwt-parent" exported="" /> <orderEntry type="module" module-name="server-integration" exported="" /> <orderEntry type="module" module-name="report-server" exported="" /> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.slf4j:slf4j-simple:jar:1.5.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/slf4j/slf4j-simple/1.5.2/slf4j-simple-1.5.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: javax.xml.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: junit:junit:jar:3.8.1:test"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: commons-logging:commons-logging:jar:1.1.1:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: net.sf.json-lib:json-lib:jar:2.2.3:test"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/net/sf/json-lib/json-lib/2.2.3/json-lib-2.2.3.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: 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: com.google.gwt:gwt-user:jar:1.5.3:provided"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/google/gwt/gwt-user/1.5.3/gwt-user-1.5.3.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: commons-beanutils:commons-beanutils:jar:1.7.0:test"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar!/" /> - </SOURCES> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: commons-fileupload:commons-fileupload:jar:1.2.1:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-fileupload/commons-fileupload/1.2.1/commons-fileupload-1.2.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: commons-io:commons-io:jar:1.3.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-io/commons-io/1.3.2/commons-io-1.3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss.resteasy:resteasy-jaxrs:jar:1.0.2.GA:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/resteasy/resteasy-jaxrs/1.0.2.GA/resteasy-jaxrs-1.0.2.GA.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: javax.annotation:jsr250-api:jar:1.0:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss.resteasy:resteasy-multipart-provider:jar:1.0.2.GA:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/resteasy/resteasy-multipart-provider/1.0.2.GA/resteasy-multipart-provider-1.0.2.GA.jar!/" /> - </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!/" /> - </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!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: commons-lang:commons-lang:jar:2.4:test"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: javax.ejb:ejb-api:jar:3.0:provided"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/ejb/ejb-api/3.0/ejb-api-3.0.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.slf4j:slf4j-api:jar:1.5.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: com.google.gwt:gwt-servlet:jar:1.5.3:runtime"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/google/gwt/gwt-servlet/1.5.3/gwt-servlet-1.5.3.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: javassist:javassist:jar:3.6.0.GA:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javassist/javassist/3.6.0.GA/javassist-3.6.0.GA.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: commons-collections:commons-collections:jar:3.2:test"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-collections/commons-collections/3.2/commons-collections-3.2.jar!/" /> - </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: org.jboss.resteasy:jaxrs-api:jar:1.0.2.GA:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/resteasy/jaxrs-api/1.0.2.GA/jaxrs-api-1.0.2.GA.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss.logging:jboss-logging-spi:jar:2.0.5.GA:provided"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar!/" /> - </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!/" /> - </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> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.eclipse.birt:modelapi:jar:2.3.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/birt/modelapi/2.3.2/modelapi-2.3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: 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.birt:dataadapterapi:jar:2.3.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/birt/dataadapterapi/2.3.2/dataadapterapi-2.3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.eclipse.birt:chartengineapi:jar:2.3.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/birt/chartengineapi/2.3.2/chartengineapi-2.3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.eclipse.emf:common:jar:2.4.0:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/emf/common/2.4.0/common-2.4.0.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.eclipse.emf:ecore-xmi:jar:2.4.1:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/emf/ecore-xmi/2.4.1/ecore-xmi-2.4.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: 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.eclipse.birt:scriptapi:jar:2.3.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/birt/scriptapi/2.3.2/scriptapi-2.3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.eclipse.birt:engineapi:jar:2.3.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/birt/engineapi/2.3.2/engineapi-2.3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.eclipse.birt:dteapi:jar:2.3.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/birt/dteapi/2.3.2/dteapi-2.3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: commons-codec:commons-codec:jar:1.3:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3-sources.jar!/" /> - </SOURCES> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.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.birt:coreapi:jar:2.3.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/birt/coreapi/2.3.2/coreapi-2.3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: rhino:js:jar:1.6R2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/rhino/js/1.6R2/js-1.6R2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: 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> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.eclipse.emf:ecore:jar:2.4.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/emf/ecore/2.4.2/ecore-2.4.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.w3c: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: com.ibm.icu:icu4j:jar:3.8.1:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/ibm/icu/icu4j/3.8.1/icu4j-3.8.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> + <orderEntry type="library" name="jaxb-impl-2.1" level="application" /> <orderEntryProperties /> </component> </module> Modified: projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java =================================================================== --- projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java 2009-07-01 14:59:44 UTC (rev 5178) +++ projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java 2009-07-01 15:48:36 UTC (rev 5179) @@ -37,15 +37,13 @@ import org.jboss.bpm.console.server.plugin.GraphViewerPlugin; import org.jboss.bpm.console.server.plugin.PluginMgr; import org.jboss.bpm.console.server.util.RsComment; +import org.jboss.bpm.console.server.util.Payload2XML; -import javax.servlet.http.HttpServletRequest; import javax.ws.rs.*; -import javax.ws.rs.core.Context; import javax.ws.rs.core.Response; -import java.io.InputStream; import java.net.URL; -import java.util.Iterator; import java.util.List; +import java.util.Map; /** * REST server module for accessing process related data. @@ -184,10 +182,22 @@ @GET @Path("instance/{id}/dataset") - @Produces("application/json") - public Response getInstanceData() + @Produces("text/xml") + public Response getInstanceData( + @PathParam("id") + String instanceId + ) { - return Response.ok().build(); + StringBuffer sb = new StringBuffer(); // TODO: Document builder could be used + sb.append("<dataset ref='").append(instanceId).append("'>"); + Map<String, Object> javaPayload = getProcessManagement().getInstanceData(instanceId); + Payload2XML payload2XML = new Payload2XML(); + sb.append( + payload2XML.convert(instanceId, javaPayload) + ); + sb.append("</dataset>"); + + return Response.ok(sb.toString()).build(); } @POST Added: projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/util/Payload2XML.java =================================================================== --- projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/util/Payload2XML.java (rev 0) +++ projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/util/Payload2XML.java 2009-07-01 15:48:36 UTC (rev 5179) @@ -0,0 +1,81 @@ +/* + * 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.util; + +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBException; +import javax.xml.bind.Marshaller; +import java.io.ByteArrayOutputStream; +import java.util.Map; +import java.util.List; +import java.util.ArrayList; + +/** + * Simple java to xml conversion for displaying process data + * within the console. + * + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +public class Payload2XML +{ + + public StringBuffer convert(String refId, Map<String, Object> javaPayload) + { + + StringBuffer sb = new StringBuffer(); + + try + { + List<Class> clz = new ArrayList<Class>(javaPayload.size()+2); + clz.add(PayloadCollection.class); + clz.add(PayloadEntry.class); + + List<PayloadEntry> data = new ArrayList<PayloadEntry>(); + + for(String key : javaPayload.keySet()) + { + Object payload = javaPayload.get(key); + clz.add(payload.getClass()); + data.add(new PayloadEntry(key, payload)); + } + + PayloadCollection dataset = new PayloadCollection(refId, data); + JAXBContext jaxbContext = JAXBContext.newInstance(clz.toArray(new Class[]{})); + ByteArrayOutputStream bout = new ByteArrayOutputStream(); + + Marshaller m = jaxbContext.createMarshaller(); + //m.setProperty(Marshaller.JAXB_FRAGMENT, Boolean.TRUE); + m.setProperty( Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE ); + + m.marshal(dataset, bout); + sb.append(new String(bout.toByteArray())); + + } + catch (JAXBException e) + { + throw new RuntimeException("Payload2XML conversion failed",e ); + } + + return sb; + } +} + Added: projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/util/PayloadCollection.java =================================================================== --- projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/util/PayloadCollection.java (rev 0) +++ projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/util/PayloadCollection.java 2009-07-01 15:48:36 UTC (rev 5179) @@ -0,0 +1,70 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.console.server.util; + +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlAttribute; +import java.util.List; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +@XmlRootElement(name="dataset") +public class PayloadCollection +{ + List<PayloadEntry> payloadEntries; + String ref; + + + public PayloadCollection() + { + } + + public PayloadCollection(String ref, List<PayloadEntry> payloadEntries) + { + this.ref = ref; + this.payloadEntries = payloadEntries; + } + + @XmlElement(name = "data") + public List<PayloadEntry> getPayload() + { + return payloadEntries; + } + + public void setPayload(List<PayloadEntry> payloadEntries) + { + this.payloadEntries = payloadEntries; + } + + @XmlAttribute + public String getRef() + { + return ref; + } + + public void setRef(String ref) + { + this.ref = ref; + } +} Added: projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/util/PayloadEntry.java =================================================================== --- projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/util/PayloadEntry.java (rev 0) +++ projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/util/PayloadEntry.java 2009-07-01 15:48:36 UTC (rev 5179) @@ -0,0 +1,75 @@ +/* + * 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.util; + +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +@XmlRootElement(name = "data") +public class PayloadEntry +{ + private String key; + + private Object value; + + public PayloadEntry() + { + } + + public PayloadEntry(String key, Object value) + { + this.key = key; + this.value = value; + } + + @XmlAttribute(name = "key") + public String getKey() + { + return key; + } + + public void setKey(String key) + { + this.key = key; + } + + @XmlElement(name = "value") + public Object getValue() + { + return value; + } + + public void setValue(Object value) + { + this.value = value; + } + + @XmlAttribute + public String getJavaType() + { + return value.getClass().getName(); + } +} Added: projects/gwt-console/trunk/server/server-core/src/test/java/org/jboss/bpm/test/typeconversion/AnnotatedComplexType.java =================================================================== --- projects/gwt-console/trunk/server/server-core/src/test/java/org/jboss/bpm/test/typeconversion/AnnotatedComplexType.java (rev 0) +++ projects/gwt-console/trunk/server/server-core/src/test/java/org/jboss/bpm/test/typeconversion/AnnotatedComplexType.java 2009-07-01 15:48:36 UTC (rev 5179) @@ -0,0 +1,38 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.test.typeconversion; + +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; +import java.util.Date; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +@XmlRootElement() +@XmlType(namespace = "http://foo.bar.com", name = "Order") +public class AnnotatedComplexType +{ + @XmlElement(name = "timestamp") + long data = new Date().getTime(); +} Added: projects/gwt-console/trunk/server/server-core/src/test/java/org/jboss/bpm/test/typeconversion/ComplexType.java =================================================================== --- projects/gwt-console/trunk/server/server-core/src/test/java/org/jboss/bpm/test/typeconversion/ComplexType.java (rev 0) +++ projects/gwt-console/trunk/server/server-core/src/test/java/org/jboss/bpm/test/typeconversion/ComplexType.java 2009-07-01 15:48:36 UTC (rev 5179) @@ -0,0 +1,50 @@ +/* + * 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.test.typeconversion; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +public class ComplexType +{ + String message; + + + public ComplexType() + { + } + + public String getMessage() + { + return message; + } + + public void setMessage(String message) + { + this.message = message; + } + + public ComplexType(String message) + { + this.message = message; + } +} Added: projects/gwt-console/trunk/server/server-core/src/test/java/org/jboss/bpm/test/typeconversion/IllegalType.java =================================================================== --- projects/gwt-console/trunk/server/server-core/src/test/java/org/jboss/bpm/test/typeconversion/IllegalType.java (rev 0) +++ projects/gwt-console/trunk/server/server-core/src/test/java/org/jboss/bpm/test/typeconversion/IllegalType.java 2009-07-01 15:48:36 UTC (rev 5179) @@ -0,0 +1,33 @@ +/* + * 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.test.typeconversion; + +import java.io.InputStream; +import java.io.ByteArrayInputStream; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +public class IllegalType +{ + InputStream in = new ByteArrayInputStream("Hwllo World".getBytes()); +} Added: projects/gwt-console/trunk/server/server-core/src/test/java/org/jboss/bpm/test/typeconversion/TypeConversionTestCase.java =================================================================== --- projects/gwt-console/trunk/server/server-core/src/test/java/org/jboss/bpm/test/typeconversion/TypeConversionTestCase.java (rev 0) +++ projects/gwt-console/trunk/server/server-core/src/test/java/org/jboss/bpm/test/typeconversion/TypeConversionTestCase.java 2009-07-01 15:48:36 UTC (rev 5179) @@ -0,0 +1,50 @@ +/* + * 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.test.typeconversion; + +import junit.framework.TestCase; + +import java.util.Map; +import java.util.HashMap; +import java.util.Date; + +import org.jboss.bpm.console.server.util.Payload2XML; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +public class TypeConversionTestCase extends TestCase +{ + public void testComplexTypes() throws Exception + { + Map<String, Object> javaPayload = new HashMap<String,Object>(); + javaPayload.put("not annotated", new ComplexType("Hello World")); + javaPayload.put("a simple type", "Just a java String"); + javaPayload.put("a date field", new Date()); + javaPayload.put("annotation present", new AnnotatedComplexType()); + javaPayload.put("illegal type", new IllegalType()); + javaPayload.put("77illegal name % $$ - 1", "Hi There"); + Payload2XML t = new Payload2XML(); + System.out.println(t.convert("SampleProcess", javaPayload).toString()); + } + +} Modified: projects/gwt-console/trunk/server/server-integration/server-integration.iml =================================================================== --- projects/gwt-console/trunk/server/server-integration/server-integration.iml 2009-07-01 14:59:44 UTC (rev 5178) +++ projects/gwt-console/trunk/server/server-integration/server-integration.iml 2009-07-01 15:48:36 UTC (rev 5179) @@ -11,7 +11,7 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="gwt-rpc" exported="" /> - <orderEntry type="module" module-name="gwt-parent" exported="" /> + <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> Modified: projects/gwt-console/trunk/server/server-integration/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java =================================================================== --- projects/gwt-console/trunk/server/server-integration/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java 2009-07-01 14:59:44 UTC (rev 5178) +++ projects/gwt-console/trunk/server/server-integration/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java 2009-07-01 15:48:36 UTC (rev 5179) @@ -26,6 +26,7 @@ import org.jboss.bpm.console.client.model.ProcessInstanceRef.STATE; import java.util.List; +import java.util.Map; import java.io.InputStream; /** @@ -46,6 +47,10 @@ ProcessInstanceRef newInstance(String instanceId); + Map<String, Object> getInstanceData(String instanceId); + + void setInstanceData(String instanceId, Map<String, Object> data); + void endInstance(String instanceId, ProcessInstanceRef.RESULT result); void deleteInstance(String instanceId);