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

Author: heiko.braun(a)jboss.com Date: 2009-03-24 10:53:08 -0400 (Tue, 24 Mar 2009) New Revision: 4316 Modified: projects/gwt-console/trunk/gwt-parent.iml projects/gwt-console/trunk/plugin-api/plugin.iml projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java projects/gwt-console/trunk/plugin-example/plugin-example.iml projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/TaskRef.java projects/gwt-console/trunk/server-integration/gwt-server-integration.iml projects/gwt-console/trunk/server/gwt-server.iml projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java projects/gwt-console/trunk/server/src/main/webapp/WEB-INF/jboss-web.xml projects/gwt-console/trunk/server/src/main/webapp/WEB-INF/web.xml projects/gwt-console/trunk/war/gwt-war.iml projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/workspace-default.cfg Log: jBPM4 task managent first cut Modified: projects/gwt-console/trunk/gwt-parent.iml =================================================================== --- projects/gwt-console/trunk/gwt-parent.iml 2009-03-24 14:07:27 UTC (rev 4315) +++ projects/gwt-console/trunk/gwt-parent.iml 2009-03-24 14:53:08 UTC (rev 4316) @@ -20,7 +20,9 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="gwt-server-integration" exported="" /> + <orderEntry type="module" module-name="plugin" /> + <orderEntry type="module" module-name="gwt-server-integration" /> + <orderEntry type="module" module-name="gwt-rpc" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.slf4j:slf4j-simple:jar:1.5.2:compile"> <CLASSES> Modified: projects/gwt-console/trunk/plugin-api/plugin.iml =================================================================== --- projects/gwt-console/trunk/plugin-api/plugin.iml 2009-03-24 14:07:27 UTC (rev 4315) +++ projects/gwt-console/trunk/plugin-api/plugin.iml 2009-03-24 14:53:08 UTC (rev 4316) @@ -9,7 +9,7 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="gwt-parent" /> + <orderEntry type="module" module-name="gwt-rpc" exported="" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: com.gwtext:gwtext:jar:2.0.5:compile"> <CLASSES> Modified: projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java =================================================================== --- projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java 2009-03-24 14:07:27 UTC (rev 4315) +++ projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java 2009-03-24 14:53:08 UTC (rev 4316) @@ -101,8 +101,8 @@ long id = JSONWalk.on(item).next("id").asLong(); long tokenId = JSONWalk.on(item).next("tokenId").asLong(); - long instanceId = JSONWalk.on(item).next("processInstanceId").asLong(); - long processId = JSONWalk.on(item).next("processId").asLong(); + String instanceId = JSONWalk.on(item).next("processInstanceId").asString(); + String processId = JSONWalk.on(item).next("processId").asString(); String name = JSONWalk.on(item).next("name").asString(); String actor = JSONWalk.on(item).next("actor").asString(); boolean isBlocking = JSONWalk.on(item).next("isBlocking").asBool(); Modified: projects/gwt-console/trunk/plugin-example/plugin-example.iml =================================================================== --- projects/gwt-console/trunk/plugin-example/plugin-example.iml 2009-03-24 14:07:27 UTC (rev 4315) +++ projects/gwt-console/trunk/plugin-example/plugin-example.iml 2009-03-24 14:53:08 UTC (rev 4316) @@ -9,7 +9,8 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="gwt-parent" /> + <orderEntry type="module" module-name="plugin" /> + <orderEntry type="module" module-name="gwt-rpc" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: com.google.code.gson:gson:jar:1.2.2:provided"> <CLASSES> Modified: projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/TaskRef.java =================================================================== --- projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/TaskRef.java 2009-03-24 14:07:27 UTC (rev 4315) +++ projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/TaskRef.java 2009-03-24 14:53:08 UTC (rev 4316) @@ -33,8 +33,8 @@ { private long id; private long tokenId; - private long processInstanceId; - private long processId; + private String processInstanceId; + private String processId; private String name; private String actor = ""; @@ -54,8 +54,8 @@ } public TaskRef( - long taskId, long tokenId, long processInstanceId, - long processId, + long taskId, long tokenId, String processInstanceId, + String processId, String taskName, String actorName, boolean blocking, boolean signalling ) @@ -92,12 +92,12 @@ this.tokenId = tokenId; } - public long getProcessInstanceId() + public String getProcessInstanceId() { return processInstanceId; } - public void setProcessInstanceId(long processInstanceId) + public void setProcessInstanceId(String processInstanceId) { this.processInstanceId = processInstanceId; } @@ -151,7 +151,7 @@ return transitionNames; } - public void setProcessId(long processId) + public void setProcessId(String processId) { this.processId = processId; } @@ -193,7 +193,7 @@ currentState = STATE.CLOSED; } - public long getProcessId() + public String getProcessId() { return processId; } Modified: projects/gwt-console/trunk/server/gwt-server.iml =================================================================== --- projects/gwt-console/trunk/server/gwt-server.iml 2009-03-24 14:07:27 UTC (rev 4315) +++ projects/gwt-console/trunk/server/gwt-server.iml 2009-03-24 14:53:08 UTC (rev 4316) @@ -11,7 +11,6 @@ <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-server-integration" exported="" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.slf4j:slf4j-simple:jar:1.5.2:compile"> 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-03-24 14:07:27 UTC (rev 4315) +++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java 2009-03-24 14:53:08 UTC (rev 4316) @@ -119,7 +119,7 @@ return createJsonResponse(instance); } catch (Throwable t) - { + { throw new WebApplicationException(t, 500); } Modified: projects/gwt-console/trunk/server/src/main/webapp/WEB-INF/jboss-web.xml =================================================================== --- projects/gwt-console/trunk/server/src/main/webapp/WEB-INF/jboss-web.xml 2009-03-24 14:07:27 UTC (rev 4315) +++ projects/gwt-console/trunk/server/src/main/webapp/WEB-INF/jboss-web.xml 2009-03-24 14:53:08 UTC (rev 4316) @@ -6,20 +6,8 @@ <jboss-web> - <!--class-loading> - <loader-repository> - org.bpm.console.server:gwt-consoler-server.war - </loader-repository> - </class-loading--> - <security-domain>java:/jaas/jbpm-console</security-domain> <context-root>gwt-console-server</context-root> - <!--resource-ref> - <res-ref-name>jdbc/JbpmDataSource</res-ref-name> - <jndi-name>java:/JbpmDS</jndi-name> - </resource-ref> - --> - </jboss-web> Modified: projects/gwt-console/trunk/server/src/main/webapp/WEB-INF/web.xml =================================================================== --- projects/gwt-console/trunk/server/src/main/webapp/WEB-INF/web.xml 2009-03-24 14:07:27 UTC (rev 4315) +++ projects/gwt-console/trunk/server/src/main/webapp/WEB-INF/web.xml 2009-03-24 14:53:08 UTC (rev 4316) @@ -1,68 +1,72 @@ <!DOCTYPE web-app PUBLIC - "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" - "http://java.sun.com/dtd/web-app_2_3.dtd" > + "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd" > <web-app> - <display-name>GWT Console Server</display-name> + <display-name>GWT Console Server</display-name> - <context-param> - <param-name>javax.ws.rs.core.Application</param-name> - <param-value>org.jboss.bpm.console.server.ConsoleServerApplication</param-value> - </context-param> + <context-param> + <param-name>javax.ws.rs.core.Application</param-name> + <param-value>org.jboss.bpm.console.server.ConsoleServerApplication</param-value> + </context-param> - <context-param> - <param-name>resteasy.servlet.mapping.prefix</param-name> - <param-value>/rs</param-value> - </context-param> + <context-param> + <param-name>resteasy.servlet.mapping.prefix</param-name> + <param-value>/rs</param-value> + </context-param> - <filter> - <filter-name>gwtJSON</filter-name> - <filter-class>org.jboss.bpm.console.server.util.GWTJsonFilter</filter-class> - </filter> - <filter-mapping> - <filter-name>gwtJSON</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> + <filter> + <filter-name>gwtJSON</filter-name> + <filter-class>org.jboss.bpm.console.server.util.GWTJsonFilter</filter-class> + </filter> + <filter-mapping> + <filter-name>gwtJSON</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> - <listener> - <listener-class> - org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap - </listener-class> - </listener> + <listener> + <listener-class> + org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap + </listener-class> + </listener> - <servlet> - <servlet-name>Resteasy</servlet-name> - <servlet-class> - org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher - </servlet-class> - </servlet> + <servlet> + <servlet-name>Resteasy</servlet-name> + <servlet-class> + org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher + </servlet-class> + </servlet> - <servlet-mapping> - <servlet-name>Resteasy</servlet-name> + <servlet-mapping> + <servlet-name>Resteasy</servlet-name> + <url-pattern>/rs/*</url-pattern> + </servlet-mapping> + + <security-constraint> + <web-resource-collection> + <web-resource-name>Resteasy</web-resource-name> <url-pattern>/rs/*</url-pattern> - </servlet-mapping> + </web-resource-collection> + <auth-constraint> + <role-name>administrator</role-name> + <role-name>manager</role-name> + <role-name>user</role-name> + </auth-constraint> + </security-constraint> - <security-constraint> - <web-resource-collection> - <web-resource-name>Resteasy</web-resource-name> - <url-pattern>/rs/*</url-pattern> - </web-resource-collection> - <auth-constraint> - <role-name>admin</role-name> - <role-name>user</role-name> - </auth-constraint> - </security-constraint> + <login-config> + <auth-method>BASIC</auth-method> + <realm-name>GWT Console Server</realm-name> + </login-config> - <login-config> - <auth-method>BASIC</auth-method> - <realm-name>GWT Console Server</realm-name> - </login-config> + <security-role> + <role-name>administrator</role-name> + </security-role> + <security-role> + <role-name>manager</role-name> + </security-role> + <security-role> + <role-name>user</role-name> + </security-role> - <security-role> - <role-name>admin</role-name> - </security-role> - <security-role> - <role-name>user</role-name> - </security-role> - </web-app> Modified: projects/gwt-console/trunk/server-integration/gwt-server-integration.iml =================================================================== --- projects/gwt-console/trunk/server-integration/gwt-server-integration.iml 2009-03-24 14:07:27 UTC (rev 4315) +++ projects/gwt-console/trunk/server-integration/gwt-server-integration.iml 2009-03-24 14:53:08 UTC (rev 4316) @@ -8,7 +8,7 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="gwt-parent" exported="" /> + <orderEntry type="module" module-name="gwt-rpc" exported="" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:provided"> <CLASSES> Modified: projects/gwt-console/trunk/war/gwt-war.iml =================================================================== --- projects/gwt-console/trunk/war/gwt-war.iml 2009-03-24 14:07:27 UTC (rev 4315) +++ projects/gwt-console/trunk/war/gwt-war.iml 2009-03-24 14:53:08 UTC (rev 4316) @@ -11,7 +11,8 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="gwt-parent" exported="" /> + <orderEntry type="module" module-name="plugin" exported="" /> + <orderEntry type="module" module-name="gwt-rpc" exported="" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:compile"> <CLASSES> Modified: projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/workspace-default.cfg =================================================================== --- projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/workspace-default.cfg 2009-03-24 14:07:27 UTC (rev 4315) +++ projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/workspace-default.cfg 2009-03-24 14:53:08 UTC (rev 4316) @@ -1,5 +1,5 @@ org.jboss.bpm.console.client.process.ProcessEditor +org.jboss.bpm.console.client.task.TaskEditor # not yet implemented in jBPM4 -#org.jboss.bpm.console.client.task.TaskEditor #org.jboss.bpm.console.client.report.ReportEditor \ No newline at end of file