December 2008 - jbpm-commits - Jboss List Archives

JBoss JBPM SVN: r3214 - in projects/balalaika/trunk: core/src/main/java/org/jboss/balalaika and 9 other directories.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-12-05 05:02:01 -0500 (Fri, 05 Dec 2008) New Revision: 3214 Added: projects/balalaika/trunk/war/ projects/balalaika/trunk/war/pom.xml projects/balalaika/trunk/war/src/ projects/balalaika/trunk/war/src/main/ projects/balalaika/trunk/war/src/main/java/ projects/balalaika/trunk/war/src/main/java/org/ projects/balalaika/trunk/war/src/main/java/org/jboss/ projects/balalaika/trunk/war/src/main/java/org/jboss/balalaika/ projects/balalaika/trunk/war/src/main/java/org/jboss/balalaika/ReportFacade.java projects/balalaika/trunk/war/src/main/java/org/jboss/balalaika/ServerApplication.java projects/balalaika/trunk/war/src/main/resources/ projects/balalaika/trunk/war/src/main/webapp/ projects/balalaika/trunk/war/src/main/webapp/WEB-INF/ projects/balalaika/trunk/war/src/main/webapp/WEB-INF/jboss-web.xml projects/balalaika/trunk/war/src/main/webapp/WEB-INF/web.xml projects/balalaika/trunk/war/src/main/webapp/index.html Removed: projects/balalaika/trunk/core/src/main/java/org/jboss/balalaika/ConfigAdapter.java projects/balalaika/trunk/core/src/main/java/org/jboss/balalaika/IntegrationConfig.java Modified: projects/balalaika/trunk/core/src/main/java/org/jboss/balalaika/BirtService.java projects/balalaika/trunk/core/src/main/java/org/jboss/balalaika/RenderMetaData.java projects/balalaika/trunk/pom.xml Log: Added server component (REST) to the project Modified: projects/balalaika/trunk/core/src/main/java/org/jboss/balalaika/BirtService.java =================================================================== --- projects/balalaika/trunk/core/src/main/java/org/jboss/balalaika/BirtService.java 2008-12-05 09:26:04 UTC (rev 3213) +++ projects/balalaika/trunk/core/src/main/java/org/jboss/balalaika/BirtService.java 2008-12-05 10:02:01 UTC (rev 3214) @@ -23,6 +23,8 @@ import org.eclipse.birt.report.engine.api.*; import org.eclipse.birt.core.framework.Platform; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * jBPM BIRT integration. @@ -31,17 +33,21 @@ */ public class BirtService { + private static final Log log = LogFactory.getLog(BirtService.class); + private IReportEngine engine; private IntegrationConfig iConfig; public BirtService() { - this.iConfig = new ConfigAdapter(); + // TODO: runtime configuration + this.iConfig = new IntegrationConfig(); } public void create() { this.engine = BirtEngineFactory.newInstance(iConfig); + log.info("Service created: " +this.engine); } public void start() @@ -58,13 +64,16 @@ { if(engine!=null) engine.destroy(); - Platform.shutdown(); + Platform.shutdown(); + log.info("Service destroyed"); } public String render(RenderMetaData metaData) { String outputFileName = null; + log.debug("Render " + metaData); + try { //Open a report design @@ -96,7 +105,9 @@ if( options.getOutputFormat().equalsIgnoreCase("html")) { HTMLRenderOption htmlOptions = new HTMLRenderOption( options); - htmlOptions.setImageDirectory(iConfig.getOutputDir()+"image"); + htmlOptions.setImageHandler(new HTMLServerImageHandler()); + htmlOptions.setImageDirectory(iConfig.getImageDirectory()); + htmlOptions.setBaseImageURL(iConfig.getImageBaseUrl()); htmlOptions.setHtmlPagination(false); htmlOptions.setHtmlRtLFlag(false); //Setting this to true removes html and body tags @@ -110,7 +121,7 @@ pdfOptions.setOption( IPDFRenderOption.PAGEBREAK_PAGINATION_ONLY, new Boolean(true) ); runRenderTask.setRenderOption(pdfOptions); } - + // ------------------ if(runRenderTask.getRenderOption()==null) runRenderTask.setRenderOption(options); Deleted: projects/balalaika/trunk/core/src/main/java/org/jboss/balalaika/ConfigAdapter.java =================================================================== --- projects/balalaika/trunk/core/src/main/java/org/jboss/balalaika/ConfigAdapter.java 2008-12-05 09:26:04 UTC (rev 3213) +++ projects/balalaika/trunk/core/src/main/java/org/jboss/balalaika/ConfigAdapter.java 2008-12-05 10:02:01 UTC (rev 3214) @@ -1,62 +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.balalaika; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com> - */ -public class ConfigAdapter implements IntegrationConfig -{ - private String birtHome = "/Users/hbraun/dev/env/birt-runtime-2_2_2/ReportEngine/"; - private String reportDir = "/Users/hbraun/dev/prj/jbpm/projects/gwt-console/trunk/server/src/main/resources/"; - private String outputDir = "/Users/hbraun/balalaika/"; - - public String getBirtHome() - { - return birtHome; - } - - public void setBirtHome(String birtHome) - { - this.birtHome = birtHome; - } - - public String getReportDir() - { - return reportDir; - } - - public void setReportDir(String reportDir) - { - this.reportDir = reportDir; - } - - public String getOutputDir() - { - return outputDir; - } - - public void setOutputDir(String outputDir) - { - this.outputDir = outputDir; - } -} Deleted: projects/balalaika/trunk/core/src/main/java/org/jboss/balalaika/IntegrationConfig.java =================================================================== --- projects/balalaika/trunk/core/src/main/java/org/jboss/balalaika/IntegrationConfig.java 2008-12-05 09:26:04 UTC (rev 3213) +++ projects/balalaika/trunk/core/src/main/java/org/jboss/balalaika/IntegrationConfig.java 2008-12-05 10:02:01 UTC (rev 3214) @@ -1,40 +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.balalaika; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com> - */ -public interface IntegrationConfig -{ - String getBirtHome(); - - void setBirtHome(String birtHome); - - String getReportDir(); - - void setReportDir(String reportDir); - - String getOutputDir(); - - void setOutputDir(String outputDir); -} Modified: projects/balalaika/trunk/core/src/main/java/org/jboss/balalaika/RenderMetaData.java =================================================================== --- projects/balalaika/trunk/core/src/main/java/org/jboss/balalaika/RenderMetaData.java 2008-12-05 09:26:04 UTC (rev 3213) +++ projects/balalaika/trunk/core/src/main/java/org/jboss/balalaika/RenderMetaData.java 2008-12-05 10:02:01 UTC (rev 3214) @@ -36,11 +36,11 @@ { } - public RenderMetaData(ClassLoader classloader, String reportName, Format format) + public RenderMetaData(ClassLoader classloader, String reportName, Format format, String imageBaseUrl) { this.classloader = classloader; this.reportName = reportName; - this.format = format; + this.format = format; } public ClassLoader getClassloader() @@ -72,4 +72,10 @@ { this.format = format; } + + + public String toString() + { + return "RenderMetaData {reportName="+reportName+", format="+format+"}"; + } } Modified: projects/balalaika/trunk/pom.xml =================================================================== --- projects/balalaika/trunk/pom.xml 2008-12-05 09:26:04 UTC (rev 3213) +++ projects/balalaika/trunk/pom.xml 2008-12-05 10:02:01 UTC (rev 3214) @@ -15,12 +15,14 @@ </parent> <properties> - <commons.logging.version>1.1.1</commons.logging.version> + <commons.logging.version>1.1.1</commons.logging.version> <junit.version>3.8.1</junit.version> + <resteasy.version>1.0-beta-8</resteasy.version> </properties> <modules> - <module>core</module> + <module>core</module> + <module>war</module> </modules> <dependencyManagement> @@ -39,6 +41,12 @@ <scope>test</scope> </dependency> + <dependency> + <groupId>org.jboss.resteasy</groupId> + <artifactId>resteasy-jaxrs</artifactId> + <version>${resteasy.version}</version> + </dependency> + </dependencies> </dependencyManagement> @@ -59,6 +67,6 @@ <enabled>true</enabled> </snapshots> </repository> - </repositories> + </repositories> </project> Added: projects/balalaika/trunk/war/pom.xml =================================================================== --- projects/balalaika/trunk/war/pom.xml (rev 0) +++ projects/balalaika/trunk/war/pom.xml 2008-12-05 10:02:01 UTC (rev 3214) @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project> + <modelVersion>4.0.0</modelVersion> + <name>JBoss jBPM3 - Balalaika Server</name> + <groupId>org.jbpm</groupId> + <artifactId>balalaika-server</artifactId> + <packaging>war</packaging> + +  + <parent> + <groupId>org.jbpm</groupId> + <artifactId>balalaika-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + +  + <dependencies> + + <dependency> + <groupId>org.jbpm</groupId> + <artifactId>balalaika-core</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.jboss.resteasy</groupId> + <artifactId>resteasy-jaxrs</artifactId> + </dependency> + + </dependencies> + +  + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + </plugins> + <finalName>report-server</finalName> + </build> +</project> Added: projects/balalaika/trunk/war/src/main/java/org/jboss/balalaika/ReportFacade.java =================================================================== --- projects/balalaika/trunk/war/src/main/java/org/jboss/balalaika/ReportFacade.java (rev 0) +++ projects/balalaika/trunk/war/src/main/java/org/jboss/balalaika/ReportFacade.java 2008-12-05 10:02:01 UTC (rev 3214) @@ -0,0 +1,118 @@ +/* + * 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.balalaika; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.core.Response; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; + +/** + * BIRT integration facade. + * + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +@Path("report") +public class ReportFacade +{ + private static final Log log = LogFactory.getLog(ReportFacade.class); + private BirtService birtService; + + + public ReportFacade() + { + this.birtService = new BirtService(); + this.birtService.create(); + } + + @GET + @Path("view/{fileName}") + @Produces("text/html") + public Response viewReportHtml( + @PathParam("fileName") + String fileName + ) + { + RenderMetaData renderMeta = new RenderMetaData(); + renderMeta.setReportName(fileName); + renderMeta.setFormat(RenderMetaData.Format.HTML); + renderMeta.setClassloader(Thread.currentThread().getContextClassLoader()); + + String outputFileName = birtService.render(renderMeta); + String absoluteFile = birtService.getIConfig().getOutputDir() + outputFileName; + log.info("Render " + absoluteFile); + + File f = new File(absoluteFile); + return Response.ok(bytesFromFile(f)).type("text/html").build(); + } + + @GET + @Path("view/image/{fileName}") + public Response getImage( + @PathParam("fileName") + String fileName + ) + { + String imageDir = birtService.getIConfig().getImageDirectory(); + String absName = imageDir + fileName; + File imageFile = new File(absName); + if(!imageFile.exists()) + throw new IllegalArgumentException("Image " +absName+" doesn't exist"); + return Response.ok(bytesFromFile(imageFile)).build(); + } + + public static byte[] bytesFromFile(File file) + { + try + { + InputStream is = new FileInputStream(file); + long length = file.length(); + + byte[] bytes = new byte[(int)length]; + int offset = 0; + int numRead = 0; + while (offset < bytes.length && (numRead=is.read(bytes, + offset, bytes.length-offset)) >= 0) { + offset += numRead; + } + if (offset < bytes.length) { + throw new IOException("Could not completely read file " + + file.getName()); + } + is.close(); + return bytes; + } + catch (IOException e) + { + throw new RuntimeException("Failed to read file " + file); + } + } + +} Added: projects/balalaika/trunk/war/src/main/java/org/jboss/balalaika/ServerApplication.java =================================================================== --- projects/balalaika/trunk/war/src/main/java/org/jboss/balalaika/ServerApplication.java (rev 0) +++ projects/balalaika/trunk/war/src/main/java/org/jboss/balalaika/ServerApplication.java 2008-12-05 10:02:01 UTC (rev 3214) @@ -0,0 +1,54 @@ +/* + * 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.balalaika; + +import javax.ws.rs.core.Application; +import java.util.HashSet; +import java.util.Set; + +/** + * JAX-RS core component. + * + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public class ServerApplication extends Application +{ + HashSet<Object> singletons = new HashSet<Object>(); + + public ServerApplication() + { + singletons.add(new ReportFacade()); + } + + @Override + public Set<Class<?>> getClasses() + { + HashSet<Class<?>> set = new HashSet<Class<?>>(); + return set; + } + + @Override + public Set<Object> getSingletons() + { + return singletons; + } +} Added: projects/balalaika/trunk/war/src/main/webapp/WEB-INF/jboss-web.xml =================================================================== --- projects/balalaika/trunk/war/src/main/webapp/WEB-INF/jboss-web.xml (rev 0) +++ projects/balalaika/trunk/war/src/main/webapp/WEB-INF/jboss-web.xml 2008-12-05 10:02:01 UTC (rev 3214) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE jboss-web PUBLIC + "-//JBoss//DTD Web Application 2.4//EN" + "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd"> + +<jboss-web> + + <security-domain>java:/jaas/jbpm-console</security-domain> + + <context-root>report-server</context-root> + + <loader-repository> + org.bpm.console.server:report-server.war + </loader-repository> + +  + +</jboss-web> Added: projects/balalaika/trunk/war/src/main/webapp/WEB-INF/web.xml =================================================================== --- projects/balalaika/trunk/war/src/main/webapp/WEB-INF/web.xml (rev 0) +++ projects/balalaika/trunk/war/src/main/webapp/WEB-INF/web.xml 2008-12-05 10:02:01 UTC (rev 3214) @@ -0,0 +1,64 @@ +<!DOCTYPE web-app PUBLIC + "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd" > + +<web-app> + <display-name>Report Server</display-name> + + <context-param> + <param-name>javax.ws.rs.core.Application</param-name> + <param-value>org.jboss.balalaika.ServerApplication</param-value> + </context-param> + + <context-param> + <param-name>resteasy.servlet.mapping.prefix</param-name> + <param-value>/rs</param-value> + </context-param> + +  + + <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-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> + </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>Report Server</realm-name> + </login-config> + + <security-role> + <role-name>admin</role-name> + </security-role> + <security-role> + <role-name>user</role-name> + </security-role> + +</web-app> Added: projects/balalaika/trunk/war/src/main/webapp/index.html =================================================================== --- projects/balalaika/trunk/war/src/main/webapp/index.html (rev 0) +++ projects/balalaika/trunk/war/src/main/webapp/index.html 2008-12-05 10:02:01 UTC (rev 3214) @@ -0,0 +1,35 @@ +<html> +<body> + +<h1>Report Server</h1> + +<h2>Published REST Url's </h2> + +<table border=1 cellpadding=5> +<tr> + <th>Method</th> + <th>Context</th> + <th>Description</th> + <th>Mime Types</th> +</tr> + +<tr> + <td colspan=4><h3>Report Management</h3></td> +</tr> + +<tr> + <td>GET</td> + <td>/rs/report/view/{reportName}</td> + <td>Get an HTML report from file 'reportName' </td> + <td>text/html</td> +</tr> + +<tr> + <td>GET</td> + <td>/rs/report/view/image/{image}</td> + <td>Get images associated with an HTML report (usally a private call)</td> + <td>image/jpg, image/gif, image/png</td> +</tr> +</table> +</body> +</html> \ No newline at end of file

15 years, 6 months

1
0
0 / 0

JBoss JBPM SVN: r3213 - in projects/spec/trunk/modules: api/src/main/java/org/jboss/bpm/api/service/internal and 12 other directories.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-12-05 04:26:04 -0500 (Fri, 05 Dec 2008) New Revision: 3213 Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessDefinitionService.java projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessService.java projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/internal/AbstractProcessService.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitMarshallerTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessDefinitionServiceTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessServiceTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/task/waitstate/WaitStateMarshallerTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/startevent/StartEventSignalTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/receive/ReceiveTaskTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/user/UserTaskTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/transaction/TxRequiredMarshallerTest.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ProcessImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessDefinitionServiceImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessServiceImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ThreadingServiceImpl.java projects/spec/trunk/modules/ri/src/test/java/org/jboss/bpm/test/ri/dialect/stp/sequence/SequenceTest.java projects/spec/trunk/modules/ri/src/test/java/org/jboss/bpm/test/ri/service/persistence/ProcessPersistenceTest.java projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java Log: Allow registries to return proxied objects Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessDefinitionService.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessDefinitionService.java 2008-12-05 09:05:33 UTC (rev 3212) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessDefinitionService.java 2008-12-05 09:26:04 UTC (rev 3213) @@ -40,9 +40,20 @@ public interface ProcessDefinitionService { /** + * Create a ProcessDefinition from a XML string in one of the supported formats + */ + ProcessDefinition parseProcessDefinition(String pXML); + + /** + * Create a ProcessDefinition from an URL to a XML descritor in one of the supported formats + */ + ProcessDefinition parseProcessDefinition(URL pURL) throws IOException; + + /** * Register a ProcessDefinition. + * @return An implementation may return a proxied version of the given ProcessDefinition */ - ObjectName registerProcessDefinition(ProcessDefinition procDef); + ProcessDefinition registerProcessDefinition(ProcessDefinition procDef); /** * Unregister a ProcessDefinition. @@ -58,15 +69,4 @@ * Get the set of registered ProcessDefinition names */ Set<ObjectName> getProcessDefinitions(); - - /** - * Create a ProcessDefinition from a XML string in one of the supported formats - */ - ProcessDefinition parseProcessDefinition(String pXML); - - /** - * Create a ProcessDefinition from an URL to a XML descritor in one of the supported formats - */ - ProcessDefinition parseProcessDefinition(URL pURL) throws IOException; - } \ No newline at end of file Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessService.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessService.java 2008-12-05 09:05:33 UTC (rev 3212) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessService.java 2008-12-05 09:26:04 UTC (rev 3213) @@ -41,8 +41,9 @@ /** * Register a Process. + * @return An implementation may return a proxied version of the given Process */ - ObjectName registerProcess(Process proc); + Process registerProcess(Process proc); /** * Unregister a Process. Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/internal/AbstractProcessService.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/internal/AbstractProcessService.java 2008-12-05 09:05:33 UTC (rev 3212) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/internal/AbstractProcessService.java 2008-12-05 09:26:04 UTC (rev 3213) @@ -23,12 +23,6 @@ //$Id$ -import java.util.Set; - -import javax.management.ObjectName; - -import org.jboss.bpm.api.model.Process; -import org.jboss.bpm.api.model.Process.ProcessStatus; import org.jboss.bpm.api.service.ProcessService; /** @@ -43,29 +37,4 @@ protected AbstractProcessService() { } - - /* (non-Javadoc) - * @see org.jboss.bpm.api.service.internal.ProcessService#registerProcess(org.jboss.bpm.api.model.Process) - */ - public abstract ObjectName registerProcess(Process proc); - - /* (non-Javadoc) - * @see org.jboss.bpm.api.service.internal.ProcessService#unregisterProcess(javax.management.ObjectName) - */ - public abstract boolean unregisterProcess(ObjectName procID); - - /* (non-Javadoc) - * @see org.jboss.bpm.api.service.internal.ProcessService#getProcess(javax.management.ObjectName) - */ - public abstract Process getProcess(ObjectName procID); - - /* (non-Javadoc) - * @see org.jboss.bpm.api.service.internal.ProcessService#getProcesses() - */ - public abstract Set<ObjectName> getProcesses(); - - /* (non-Javadoc) - * @see org.jboss.bpm.api.service.internal.ProcessService#getProcesses(javax.management.ObjectName, org.jboss.bpm.api.model.Process.ProcessStatus) - */ - public abstract Set<ObjectName> getProcesses(ObjectName procDefID, ProcessStatus status); } \ No newline at end of file Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitMarshallerTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitMarshallerTest.java 2008-12-05 09:05:33 UTC (rev 3212) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitMarshallerTest.java 2008-12-05 09:26:04 UTC (rev 3213) @@ -27,7 +27,6 @@ import org.jboss.bpm.api.model.ProcessDefinition; import org.jboss.bpm.api.service.ProcessDefinitionService; -import org.jboss.bpm.api.service.internal.AbstractProcessDefinitionService; /** Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessDefinitionServiceTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessDefinitionServiceTest.java 2008-12-05 09:05:33 UTC (rev 3212) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessDefinitionServiceTest.java 2008-12-05 09:26:04 UTC (rev 3213) @@ -32,8 +32,6 @@ import org.jboss.bpm.api.model.ProcessDefinition; import org.jboss.bpm.api.service.ProcessDefinitionService; import org.jboss.bpm.api.service.ProcessService; -import org.jboss.bpm.api.service.internal.AbstractProcessDefinitionService; -import org.jboss.bpm.api.service.internal.AbstractProcessService; import org.jboss.bpm.api.test.CTSTestCase; import org.jboss.bpm.api.test.ProcessCatalog; @@ -81,10 +79,10 @@ ProcessEngine engine = procDef.getProcessEngine(); ProcessDefinitionService procDefService = engine.getService(ProcessDefinitionService.class); - ObjectName procDefID = procDefService.registerProcessDefinition(procDef); - assertNotNull("Registered ProcessDefinition not null", procDefID); + procDef = procDefService.registerProcessDefinition(procDef); + assertNotNull("Registered ProcessDefinition not null", procDef); - boolean success = procDefService.unregisterProcessDefinition(procDefID); + boolean success = procDefService.unregisterProcessDefinition(procDef.getKey()); assertTrue("ProcessDefinition unregistered", success); } } Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessServiceTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessServiceTest.java 2008-12-05 09:05:33 UTC (rev 3212) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessServiceTest.java 2008-12-05 09:26:04 UTC (rev 3213) @@ -54,14 +54,14 @@ assertNull("Process not registered automatically", procService.getProcess(proc.getKey())); // Register the process - ObjectName procID = procService.registerProcess(proc); - assertEquals("Proc ID equals", proc.getKey(), procID); + proc = procService.registerProcess(proc); + assertNotNull("Proc not null", proc); assertNotNull("ProcessDefinition registered", procDefService.getProcessDefinition(procDef.getKey())); assertNotNull("Process registered", procService.getProcess(proc.getKey())); // Unregister the process - procService.unregisterProcess(procID); - assertNull("Process unregistered", procService.getProcess(procID)); + procService.unregisterProcess(proc.getKey()); + assertNull("Process unregistered", procService.getProcess(proc.getKey())); assertNotNull("ProcessDefinition still registered", procDefService.getProcessDefinition(procDef.getKey())); procDefService.unregisterProcessDefinition(procDef.getKey()); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/task/waitstate/WaitStateMarshallerTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/task/waitstate/WaitStateMarshallerTest.java 2008-12-05 09:05:33 UTC (rev 3212) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/task/waitstate/WaitStateMarshallerTest.java 2008-12-05 09:26:04 UTC (rev 3213) @@ -25,7 +25,6 @@ import org.jboss.bpm.api.model.ProcessDefinition; import org.jboss.bpm.api.service.ProcessDefinitionService; -import org.jboss.bpm.api.service.internal.AbstractProcessDefinitionService; // $Id$ Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/startevent/StartEventSignalTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/startevent/StartEventSignalTest.java 2008-12-05 09:05:33 UTC (rev 3212) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/startevent/StartEventSignalTest.java 2008-12-05 09:26:04 UTC (rev 3213) @@ -34,8 +34,6 @@ import org.jboss.bpm.api.service.ProcessBuilderService; import org.jboss.bpm.api.service.ProcessDefinitionService; import org.jboss.bpm.api.service.ProcessService; -import org.jboss.bpm.api.service.internal.AbstractProcessDefinitionService; -import org.jboss.bpm.api.service.internal.AbstractProcessService; import org.jboss.bpm.api.test.CTSTestCase; import org.jboss.bpm.incubator.client.ProcessExt; import org.jboss.bpm.incubator.client.SignalListener; Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/receive/ReceiveTaskTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/receive/ReceiveTaskTest.java 2008-12-05 09:05:33 UTC (rev 3212) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/receive/ReceiveTaskTest.java 2008-12-05 09:26:04 UTC (rev 3213) @@ -25,17 +25,14 @@ import java.io.IOException; -import javax.management.ObjectName; - import org.jboss.bpm.api.InvalidProcessException; +import org.jboss.bpm.api.model.Process; import org.jboss.bpm.api.model.ProcessDefinition; import org.jboss.bpm.api.model.Event.EventDetailType; import org.jboss.bpm.api.model.Task.TaskType; import org.jboss.bpm.api.service.ProcessBuilderService; import org.jboss.bpm.api.service.ProcessDefinitionService; import org.jboss.bpm.api.service.ProcessService; -import org.jboss.bpm.api.service.internal.AbstractProcessDefinitionService; -import org.jboss.bpm.api.service.internal.AbstractProcessService; import org.jboss.bpm.api.test.CTSTestCase; import org.jboss.bpm.incubator.client.ProcessExt; import org.jboss.bpm.incubator.client.SignalListener; @@ -97,17 +94,18 @@ ProcessService procService = getProcessEngine().getService(ProcessService.class); ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessExt proc = (ProcessExt)procDef.newInstance(); + Process proc = procDef.newInstance(); - ObjectName procID = procService.registerProcess(proc); + proc = procService.registerProcess(proc); try { // Send the message before the process is started MessageService msgService = MessageService.locateMessageService(); - msgService.sendMessage(procID, "TaskA", getMessage()); + msgService.sendMessage(proc.getKey(), "TaskA", getMessage()); - proc.startProcessAsync(); - proc.waitForEnd(5000); + ProcessExt procExt = (ProcessExt)proc; + procExt.startProcessAsync(); + procExt.waitForEnd(5000); } finally { Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/user/UserTaskTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/user/UserTaskTest.java 2008-12-05 09:05:33 UTC (rev 3212) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/user/UserTaskTest.java 2008-12-05 09:26:04 UTC (rev 3213) @@ -36,7 +36,6 @@ import org.jboss.bpm.api.runtime.BasicAttachments; import org.jboss.bpm.api.service.ProcessBuilderService; import org.jboss.bpm.api.service.ProcessService; -import org.jboss.bpm.api.service.internal.AbstractProcessService; import org.jboss.bpm.api.test.CTSTestCase; import org.jboss.bpm.incubator.client.MessageListener; import org.jboss.bpm.incubator.client.ProcessExt; Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/transaction/TxRequiredMarshallerTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/transaction/TxRequiredMarshallerTest.java 2008-12-05 09:05:33 UTC (rev 3212) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/transaction/TxRequiredMarshallerTest.java 2008-12-05 09:26:04 UTC (rev 3213) @@ -27,7 +27,6 @@ import org.jboss.bpm.api.model.ProcessDefinition; import org.jboss.bpm.api.service.ProcessDefinitionService; -import org.jboss.bpm.api.service.internal.AbstractProcessDefinitionService; /** * Test two tasks with Tx attribute REQUIRED Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ProcessImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ProcessImpl.java 2008-12-05 09:05:33 UTC (rev 3212) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ProcessImpl.java 2008-12-05 09:26:04 UTC (rev 3213) @@ -53,7 +53,6 @@ import org.jboss.bpm.api.runtime.Token; import org.jboss.bpm.api.runtime.Token.TokenStatus; import org.jboss.bpm.api.service.ProcessService; -import org.jboss.bpm.api.service.internal.AbstractProcessService; import org.jboss.bpm.incubator.client.ProcessExt; import org.jboss.bpm.incubator.model.Assignment; import org.jboss.bpm.incubator.model.Group; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessDefinitionServiceImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessDefinitionServiceImpl.java 2008-12-05 09:05:33 UTC (rev 3212) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessDefinitionServiceImpl.java 2008-12-05 09:26:04 UTC (rev 3213) @@ -32,9 +32,9 @@ import org.jboss.bpm.api.client.ProcessEngine; import org.jboss.bpm.api.model.ProcessDefinition; +import org.jboss.bpm.api.service.ProcessDefinitionService; import org.jboss.bpm.api.service.ProcessService; import org.jboss.bpm.api.service.internal.AbstractProcessDefinitionService; -import org.jboss.bpm.api.service.internal.AbstractProcessService; import org.jboss.bpm.incubator.service.PersistenceService; import org.jboss.bpm.ri.model.ProcessDefinitionImpl; import org.slf4j.Logger; @@ -46,7 +46,7 @@ * @author thomas.diesler(a)jboss.com * @since 18-Jun-2008 */ -public class ProcessDefinitionServiceImpl extends AbstractProcessDefinitionService implements MutableService +public class ProcessDefinitionServiceImpl extends AbstractProcessDefinitionService implements ProcessDefinitionService, MutableService { // Provide logging final static Logger log = LoggerFactory.getLogger(ProcessDefinitionServiceImpl.class); @@ -73,7 +73,7 @@ } @Override - public ObjectName registerProcessDefinition(ProcessDefinition procDef) + public ProcessDefinition registerProcessDefinition(ProcessDefinition procDef) { if (getProcessDefinition(procDef.getKey()) != null) throw new IllegalStateException("Process definition already registered: " + procDef); @@ -88,7 +88,7 @@ ProcessDefinitionImpl procDefImpl = (ProcessDefinitionImpl)procDef; procDefImpl.register(procDef); - return procDef.getKey(); + return procDef; } @Override Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessServiceImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessServiceImpl.java 2008-12-05 09:05:33 UTC (rev 3212) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessServiceImpl.java 2008-12-05 09:26:04 UTC (rev 3213) @@ -38,7 +38,7 @@ import org.jboss.bpm.api.model.ProcessDefinition; import org.jboss.bpm.api.model.Process.ProcessStatus; import org.jboss.bpm.api.service.ProcessDefinitionService; -import org.jboss.bpm.api.service.internal.AbstractProcessDefinitionService; +import org.jboss.bpm.api.service.ProcessService; import org.jboss.bpm.api.service.internal.AbstractProcessService; import org.jboss.bpm.incubator.service.PersistenceService; import org.jboss.bpm.ri.model.ProcessImpl; @@ -52,7 +52,7 @@ * @author thomas.diesler(a)jboss.com * @since 18-Jun-2008 */ -public class ProcessServiceImpl extends AbstractProcessService implements MutableService +public class ProcessServiceImpl extends AbstractProcessService implements ProcessService, MutableService { // Provide logging final static Logger log = LoggerFactory.getLogger(ProcessServiceImpl.class); @@ -125,7 +125,7 @@ /** * Register a Process. */ - public ObjectName registerProcess(Process proc) + public Process registerProcess(Process proc) { log.debug("registerProcess: " + proc); @@ -153,7 +153,7 @@ procImpl.register(proc); procImpl.setProcessStatus(ProcessStatus.Ready); - return procID; + return proc; } /** Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ThreadingServiceImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ThreadingServiceImpl.java 2008-12-05 09:05:33 UTC (rev 3212) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ThreadingServiceImpl.java 2008-12-05 09:26:04 UTC (rev 3213) @@ -38,7 +38,6 @@ import org.jboss.bpm.api.runtime.Attachments; import org.jboss.bpm.api.runtime.Token; import org.jboss.bpm.api.service.ProcessService; -import org.jboss.bpm.api.service.internal.AbstractProcessService; import org.jboss.bpm.incubator.client.ProcessExt; import org.jboss.bpm.incubator.model.Assignment; import org.jboss.bpm.incubator.model.Assignment.AssignTime; Modified: projects/spec/trunk/modules/ri/src/test/java/org/jboss/bpm/test/ri/dialect/stp/sequence/SequenceTest.java =================================================================== --- projects/spec/trunk/modules/ri/src/test/java/org/jboss/bpm/test/ri/dialect/stp/sequence/SequenceTest.java 2008-12-05 09:05:33 UTC (rev 3212) +++ projects/spec/trunk/modules/ri/src/test/java/org/jboss/bpm/test/ri/dialect/stp/sequence/SequenceTest.java 2008-12-05 09:26:04 UTC (rev 3213) @@ -27,7 +27,6 @@ import org.jboss.bpm.api.model.ProcessDefinition; import org.jboss.bpm.api.service.ProcessDefinitionService; -import org.jboss.bpm.api.service.internal.AbstractProcessDefinitionService; import org.jboss.bpm.api.test.APITestCase; /** Modified: projects/spec/trunk/modules/ri/src/test/java/org/jboss/bpm/test/ri/service/persistence/ProcessPersistenceTest.java =================================================================== --- projects/spec/trunk/modules/ri/src/test/java/org/jboss/bpm/test/ri/service/persistence/ProcessPersistenceTest.java 2008-12-05 09:05:33 UTC (rev 3212) +++ projects/spec/trunk/modules/ri/src/test/java/org/jboss/bpm/test/ri/service/persistence/ProcessPersistenceTest.java 2008-12-05 09:26:04 UTC (rev 3213) @@ -33,7 +33,6 @@ import org.jboss.bpm.api.model.StartEvent; import org.jboss.bpm.api.model.Task; import org.jboss.bpm.api.service.ProcessDefinitionService; -import org.jboss.bpm.api.service.internal.AbstractProcessDefinitionService; import org.jboss.bpm.api.test.CTSTestCase; import org.jboss.bpm.api.test.ProcessCatalog; import org.jboss.bpm.incubator.service.PersistenceService; Modified: projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java =================================================================== --- projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java 2008-12-05 09:05:33 UTC (rev 3212) +++ projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java 2008-12-05 09:26:04 UTC (rev 3213) @@ -11,7 +11,6 @@ import org.jboss.bpm.api.model.ProcessDefinition; import org.jboss.bpm.api.model.builder.ObjectNameFactory; import org.jboss.bpm.api.service.ProcessService; -import org.jboss.bpm.api.service.internal.AbstractProcessService; import org.jboss.bpm.incubator.client.MessageListener; import org.jboss.bpm.incubator.client.ProcessExt; import org.jboss.bpm.incubator.client.SignalListener;

15 years, 6 months

1
0
0 / 0

JBoss JBPM SVN: r3212 - in projects/spec/trunk/modules: ri/src/main/java/org/jboss/bpm/ri/service and 1 other directory.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-12-05 04:05:33 -0500 (Fri, 05 Dec 2008) New Revision: 3212 Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessDefinitionServiceTest.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessDefinitionServiceImpl.java Log: Revert back to ObjectName getProcessDefinition() Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessDefinitionServiceTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessDefinitionServiceTest.java 2008-12-05 08:58:17 UTC (rev 3211) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessDefinitionServiceTest.java 2008-12-05 09:05:33 UTC (rev 3212) @@ -81,10 +81,10 @@ ProcessEngine engine = procDef.getProcessEngine(); ProcessDefinitionService procDefService = engine.getService(ProcessDefinitionService.class); - procDef = procDefService.registerProcessDefinition(procDef); - assertNotNull("Registered ProcessDefinition not null", procDef); + ObjectName procDefID = procDefService.registerProcessDefinition(procDef); + assertNotNull("Registered ProcessDefinition not null", procDefID); - boolean success = procDefService.unregisterProcessDefinition(procDef.getKey()); + boolean success = procDefService.unregisterProcessDefinition(procDefID); assertTrue("ProcessDefinition unregistered", success); } } Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessDefinitionServiceImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessDefinitionServiceImpl.java 2008-12-05 08:58:17 UTC (rev 3211) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessDefinitionServiceImpl.java 2008-12-05 09:05:33 UTC (rev 3212) @@ -73,7 +73,7 @@ } @Override - public ProcessDefinition registerProcessDefinition(ProcessDefinition procDef) + public ObjectName registerProcessDefinition(ProcessDefinition procDef) { if (getProcessDefinition(procDef.getKey()) != null) throw new IllegalStateException("Process definition already registered: " + procDef); @@ -88,7 +88,7 @@ ProcessDefinitionImpl procDefImpl = (ProcessDefinitionImpl)procDef; procDefImpl.register(procDef); - return procDef; + return procDef.getKey(); } @Override

15 years, 6 months

1
0
0 / 0

JBoss JBPM SVN: r3211 - in projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm: incubator/service and 1 other directory.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-12-05 03:58:17 -0500 (Fri, 05 Dec 2008) New Revision: 3211 Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessDefinitionService.java projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/MessageService.java Log: Revert back to ObjectName getProcessDefinition() Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessDefinitionService.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessDefinitionService.java 2008-12-05 01:28:25 UTC (rev 3210) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessDefinitionService.java 2008-12-05 08:58:17 UTC (rev 3211) @@ -42,7 +42,7 @@ /** * Register a ProcessDefinition. */ - ProcessDefinition registerProcessDefinition(ProcessDefinition procDef); + ObjectName registerProcessDefinition(ProcessDefinition procDef); /** * Unregister a ProcessDefinition. Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/MessageService.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/MessageService.java 2008-12-05 01:28:25 UTC (rev 3210) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/MessageService.java 2008-12-05 08:58:17 UTC (rev 3211) @@ -38,7 +38,6 @@ import org.jboss.bpm.api.model.Process; import org.jboss.bpm.api.model.Task; import org.jboss.bpm.api.service.ProcessService; -import org.jboss.bpm.api.service.internal.AbstractProcessService; import org.jboss.bpm.api.service.internal.AbstractService; import org.jboss.bpm.incubator.client.MessageListener; import org.jboss.bpm.incubator.model.Message;

15 years, 6 months

1
0
0 / 0

JBoss JBPM SVN: r3210 - in jbpm4/trunk/modules: task/src/main/java/org/jbpm/task/internal and 13 other directories.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2008-12-04 20:28:25 -0500 (Thu, 04 Dec 2008) New Revision: 3210 Added: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/CreateTask.java jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/DeleteTask.java jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/GetTask.java jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/UpdateTask.java jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/hibernate/ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/hibernate/HibernateTaskDbSession.java jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/LifeCycle.java jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/LifeCycleParser.java jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/LifeCycleState.java jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/RoleImpl.java jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/SwimlaneDefinitionImpl.java jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/SwimlaneImpl.java jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/TaskDefinitionImpl.java jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/TaskExecution.java jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/TaskImpl.java jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/TaskServiceImpl.java jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/wire/ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/wire/binding/ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/wire/binding/TaskDbSessionBinding.java jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/wire/binding/TaskServiceBinding.java jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/wire/descriptor/ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/wire/descriptor/HibernateTaskDbSessionDescriptor.java jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/session/ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/session/TaskDbSession.java jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/internal/ jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/internal/model/ jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/internal/model/TaskTest.java Removed: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/cmd/ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/db/ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/xml/ jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskDbTest.java jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskTest.java Modified: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/TaskDefinition.java jbpm4/trunk/modules/task/src/main/resources/jbpm.task.hbm.xml jbpm4/trunk/modules/task/src/main/resources/jbpm.task.wire.bindings.xml jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskServiceTest.java jbpm4/trunk/modules/task/src/test/resources/jbpm.cfg.xml jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/DbTestCase.java jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java Log: JBPM-1858 reorganized task module to match pvm packages reviewed wire bindings and descriptions Modified: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/TaskDefinition.java =================================================================== --- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/TaskDefinition.java 2008-12-04 23:15:16 UTC (rev 3209) +++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/TaskDefinition.java 2008-12-05 01:28:25 UTC (rev 3210) @@ -25,8 +25,8 @@ import org.jbpm.model.ObservableElement; import org.jbpm.pvm.internal.wire.Descriptor; -import org.jbpm.task.impl.SwimlaneDefinitionImpl; -import org.jbpm.task.impl.TaskDefinitionImpl; +import org.jbpm.task.internal.model.SwimlaneDefinitionImpl; +import org.jbpm.task.internal.model.TaskDefinitionImpl; /** design-time declaration of a task. * Copied: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/CreateTask.java (from rev 3186, jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/cmd/CreateTask.java) =================================================================== --- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/CreateTask.java (rev 0) +++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/CreateTask.java 2008-12-05 01:28:25 UTC (rev 3210) @@ -0,0 +1,87 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.task.internal.cmd; + +import org.jbpm.cmd.Command; +import org.jbpm.env.Environment; +import org.jbpm.pvm.internal.model.ExecutionImpl; +import org.jbpm.session.DbSession; +import org.jbpm.task.Task; +import org.jbpm.task.internal.model.TaskDefinitionImpl; +import org.jbpm.task.internal.model.TaskImpl; +import org.jbpm.task.session.TaskDbSession; + +/** + * @author Tom Baeyens + */ +public class CreateTask implements Command<Task> { + + private static final long serialVersionUID = 1L; + + protected String taskId; + protected Long taskDefinitionDbid; + protected Long executionDbid; + + public CreateTask() { + } + + public CreateTask(String taskId) { + this.taskId = taskId; + } + + public CreateTask(String taskId, long taskDefinitionDbid) { + this.taskId = taskId; + this.taskDefinitionDbid = taskDefinitionDbid; + } + + public CreateTask(String taskId, long taskDefinitionDbid, long executionDbid) { + this.taskId = taskId; + this.taskDefinitionDbid = taskDefinitionDbid; + this.executionDbid = executionDbid; + } + + public Task execute(Environment environment) throws Exception { + TaskDefinitionImpl taskDefinition = null; + ExecutionImpl execution = null; + + if (taskDefinitionDbid!=null) { + TaskDbSession dbSession = environment.get(TaskDbSession.class); + taskDefinition = dbSession.get(TaskDefinitionImpl.class, taskDefinitionDbid); + } + + if (executionDbid!=null) { + DbSession dbSession = environment.get(DbSession.class); + execution = dbSession.get(ExecutionImpl.class, executionDbid); + } + + Task task = null; + if (taskDefinition==null) { + task = TaskImpl.create(taskId); + } else if (execution==null) { + task = TaskImpl.create(taskId, taskDefinition); + } else { + task = TaskImpl.create(taskId, taskDefinition, execution); + } + + return task; + } +} Property changes on: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/CreateTask.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Copied: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/DeleteTask.java (from rev 3185, jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/cmd/DeleteTask.java) =================================================================== --- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/DeleteTask.java (rev 0) +++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/DeleteTask.java 2008-12-05 01:28:25 UTC (rev 3210) @@ -0,0 +1,49 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.task.internal.cmd; + +import org.jbpm.cmd.Command; +import org.jbpm.env.Environment; +import org.jbpm.session.DbSession; +import org.jbpm.task.internal.model.TaskImpl; + +/** + * @author Tom Baeyens + */ +public class DeleteTask implements Command<Void> { + + private static final long serialVersionUID = 1L; + + protected long taskDbid; + + public DeleteTask(long taskDbid) { + this.taskDbid = taskDbid; + } + + public Void execute(Environment environment) throws Exception { + DbSession dbSession = environment.get(DbSession.class); + TaskImpl task = dbSession.get(TaskImpl.class, taskDbid); + dbSession.delete(task); + return null; + } + +} Property changes on: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/DeleteTask.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Copied: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/GetTask.java (from rev 3185, jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/cmd/GetTask.java) =================================================================== --- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/GetTask.java (rev 0) +++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/GetTask.java 2008-12-05 01:28:25 UTC (rev 3210) @@ -0,0 +1,47 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.task.internal.cmd; + +import org.jbpm.cmd.Command; +import org.jbpm.env.Environment; +import org.jbpm.session.DbSession; +import org.jbpm.task.Task; +import org.jbpm.task.internal.model.TaskImpl; + +/** + * @author Tom Baeyens + */ +public class GetTask implements Command<Task> { + + private static final long serialVersionUID = 1L; + + protected long taskDbid; + + public GetTask(long taskDbid) { + this.taskDbid = taskDbid; + } + + public Task execute(Environment environment) throws Exception { + DbSession dbSession = environment.get(DbSession.class); + return dbSession.get(TaskImpl.class, taskDbid); + } +} Property changes on: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/GetTask.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Copied: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/UpdateTask.java (from rev 3185, jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/cmd/UpdateTask.java) =================================================================== --- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/UpdateTask.java (rev 0) +++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/UpdateTask.java 2008-12-05 01:28:25 UTC (rev 3210) @@ -0,0 +1,49 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.task.internal.cmd; + +import org.jbpm.cmd.Command; +import org.jbpm.env.Environment; +import org.jbpm.session.DbSession; +import org.jbpm.task.Task; + + +/** + * @author Tom Baeyens + */ +public class UpdateTask implements Command<Void> { + + private static final long serialVersionUID = 1L; + + protected Task task; + + public UpdateTask(Task task) { + this.task = task; + } + + public Void execute(Environment environment) throws Exception { + DbSession dbSession = environment.get(DbSession.class); + dbSession.save(task); + return null; + } + +} Property changes on: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/UpdateTask.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Added: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/hibernate/HibernateTaskDbSession.java =================================================================== --- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/hibernate/HibernateTaskDbSession.java (rev 0) +++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/hibernate/HibernateTaskDbSession.java 2008-12-05 01:28:25 UTC (rev 3210) @@ -0,0 +1,34 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.task.internal.hibernate; + +import org.jbpm.pvm.internal.hibernate.HibernateDbSession; +import org.jbpm.task.session.TaskDbSession; + +/** + * @author Alejandro Guizar + * + */ +public class HibernateTaskDbSession extends HibernateDbSession implements + TaskDbSession { + +} Copied: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/LifeCycle.java (from rev 3185, jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/LifeCycle.java) =================================================================== --- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/LifeCycle.java (rev 0) +++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/LifeCycle.java 2008-12-05 01:28:25 UTC (rev 3210) @@ -0,0 +1,87 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.task.internal.model; + +import java.util.HashMap; +import java.util.Map; + +import org.jbpm.client.ClientProcessInstance; +import org.jbpm.model.Node; +import org.jbpm.pvm.internal.model.ExecutionImpl; +import org.jbpm.pvm.internal.model.NodeImpl; +import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; +import org.jbpm.task.TaskException; + +/** + * @author Tom Baeyens + */ +public class LifeCycle { + + private static LifeCycleParser lifeCycleParser = new LifeCycleParser(); + private static Map<String, ProcessDefinitionImpl> lifeCycleProcesses = new HashMap<String, ProcessDefinitionImpl>(); + + public static String initialise(TaskImpl task) { + ProcessDefinitionImpl lifeCycle = getLifeCycle(task); + Map<String, Object> lifeCycleVariables = new HashMap<String, Object>(); + lifeCycleVariables.put("task", task); + ClientProcessInstance lifeCycleExecution = lifeCycle.createProcessInstance(); + lifeCycleExecution.setVariables(lifeCycleVariables); + lifeCycleExecution.start(); + return lifeCycleExecution.getNode().getName(); + } + + public static ProcessDefinitionImpl getLifeCycle(TaskImpl task) { + if (task==null) { + throw new TaskException("task is null"); + } + String resource = task.getLifeCycleResource(); + if (resource==null) { + throw new TaskException("task "+task.getClass().getName()+" did'nt return a lifecycle"); + } + ProcessDefinitionImpl lifeCycleProcess; + synchronized (lifeCycleProcesses) { + lifeCycleProcess = lifeCycleProcesses.get(resource); + if (lifeCycleProcess==null) { + lifeCycleProcess = (ProcessDefinitionImpl) lifeCycleParser + .createParse() + .setResource(resource) + .execute() + .checkProblems("task lifecycle") + .getDocumentObject(); + lifeCycleProcesses.put(resource, lifeCycleProcess); + } + } + return lifeCycleProcess; + } + + protected void fireLifeCycleEvent(String eventName, TaskImpl task) { + ExecutionImpl lifeCycleExecution = new ExecutionImpl(); + ProcessDefinitionImpl lifeCycleProcess = getLifeCycle(task); + lifeCycleExecution.setProcessDefinition(lifeCycleProcess); + String state = task.getState(); + Node node = lifeCycleProcess.getNode(state); + lifeCycleExecution.setNode((NodeImpl) node); + lifeCycleExecution.signal(eventName); + task.state = lifeCycleExecution.getNode().getName(); + } + +} Property changes on: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/LifeCycle.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Copied: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/LifeCycleParser.java (from rev 3185, jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/LifeCycleParser.java) =================================================================== --- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/LifeCycleParser.java (rev 0) +++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/LifeCycleParser.java 2008-12-05 01:28:25 UTC (rev 3210) @@ -0,0 +1,109 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.task.internal.model; + +import java.util.List; + +import org.jbpm.pvm.internal.model.NodeImpl; +import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; +import org.jbpm.pvm.internal.util.XmlUtil; +import org.jbpm.pvm.internal.xml.Parse; +import org.jbpm.pvm.internal.xml.Parser; +import org.w3c.dom.Element; + +/** + * @author Tom Baeyens + */ +public class LifeCycleParser extends Parser { + + public Object parseDocumentElement(Element element, Parse parse) { + ProcessDefinitionImpl lifeCycleProcess = new ProcessDefinitionImpl(); + + List<Element> stateElements = XmlUtil.elements(element, "state"); + if (stateElements!=null) { + for (Element stateElement: stateElements) { + parseState(stateElement, lifeCycleProcess, parse); + } + for (Element stateElement: stateElements) { + parseTransitions(stateElement, lifeCycleProcess, parse); + } + } + + String initialStateName = null; + if (element.hasAttribute("initial")) { + initialStateName = element.getAttribute("initial"); + NodeImpl initial = (NodeImpl) lifeCycleProcess.getNode(initialStateName); + if (initial!=null) { + lifeCycleProcess.setInitial(initial); + } else { + parse.addProblem("initial "+initialStateName+" doesn't exist"); + } + } + + return lifeCycleProcess; + } + + public void parseTransitions(Element element, ProcessDefinitionImpl lifeCycleProcess, Parse parse) { + if (! element.hasAttribute("name")) { + parse.addProblem("state doesn't have a name: "+XmlUtil.toString(element)); + return; + } + String stateName = element.getAttribute("name"); + NodeImpl state = (NodeImpl) lifeCycleProcess.getNode(stateName); + + List<Element> transitionElements = XmlUtil.elements(element, "transition"); + if (transitionElements!=null) { + for (Element transitionElement: transitionElements) { + parseTransition(transitionElement, state, parse); + } + } + } + + public void parseTransition(Element element, NodeImpl state, Parse parse) { + if (! element.hasAttribute("name")) { + parse.addProblem("transition doesn't have a name: "+XmlUtil.toString(element)); + return; + } + String transitionName = element.getAttribute("name"); + if (! element.hasAttribute("to")) { + parse.addProblem("transition "+transitionName+" doesn't have a to attribute indicating the destination state: "+XmlUtil.toString(element)); + return; + } + String destinationName = element.getAttribute("to"); + NodeImpl destination = (NodeImpl) state.getProcessDefinition().getNode(destinationName); + if (destination!=null) { + state.createOutgoingTransition(destination, transitionName); + } else { + parse.addProblem("destination "+destinationName+" of "+transitionName+" is unknown"); + } + } + + public void parseState(Element element, ProcessDefinitionImpl lifeCycleProcess, Parse parse) { + if (! element.hasAttribute("name")) { + parse.addProblem("state doesn't have an id: "+XmlUtil.toString(element)); + return; + } + String stateName = element.getAttribute("name"); + NodeImpl state = lifeCycleProcess.createNode(stateName); + state.setBehaviour(new LifeCycleState()); + } +} Property changes on: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/LifeCycleParser.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Copied: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/LifeCycleState.java (from rev 3185, jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/LifeCycleState.java) =================================================================== --- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/LifeCycleState.java (rev 0) +++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/LifeCycleState.java 2008-12-05 01:28:25 UTC (rev 3210) @@ -0,0 +1,44 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.task.internal.model; + +import java.util.Map; + +import org.jbpm.activity.ActivityExecution; +import org.jbpm.activity.ExternalActivity; + +/** + * @author Tom Baeyens + */ +public class LifeCycleState implements ExternalActivity { + + private static final long serialVersionUID = 1L; + + public void execute(ActivityExecution execution) throws Exception { + execution.waitForSignal(); + } + + public void signal(ActivityExecution execution, String signalName, + Map<String, Object> parameters) throws Exception { + execution.take(signalName); + } +} Property changes on: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/LifeCycleState.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Copied: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/RoleImpl.java (from rev 3185, jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/RoleImpl.java) =================================================================== --- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/RoleImpl.java (rev 0) +++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/RoleImpl.java 2008-12-05 01:28:25 UTC (rev 3210) @@ -0,0 +1,81 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.task.internal.model; + +import java.io.Serializable; + +import org.jbpm.task.Role; + + +/** the relation between a task and a person. + * @author Tom Baeyens + */ +public class RoleImpl implements Serializable, Role { + + private static final long serialVersionUID = 1L; + + protected long dbid; + protected int dbversion; + protected String identityId; + protected String roleType; + protected String description; + protected TaskImpl task; + protected SwimlaneImpl swimlane; + + public String toString() { + return roleType.toString()+"("+identityId+")"; + } + + public TaskImpl getTask() { + return task; + } + public void setTask(TaskImpl task) { + this.task = task; + } + public String getDescription() { + return description; + } + public void setDescription(String description) { + this.description = description; + } + public long getDbid() { + return dbid; + } + public SwimlaneImpl getSwimlane() { + return swimlane; + } + public void setSwimlane(SwimlaneImpl swimlane) { + this.swimlane = swimlane; + } + public String getIdentityId() { + return identityId; + } + public void setIdentityId(String identityId) { + this.identityId = identityId; + } + public String getRoleType() { + return roleType; + } + public void setRoleType(String roleType) { + this.roleType = roleType; + } +} Property changes on: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/RoleImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Copied: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/SwimlaneDefinitionImpl.java (from rev 3185, jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/SwimlaneDefinitionImpl.java) =================================================================== --- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/SwimlaneDefinitionImpl.java (rev 0) +++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/SwimlaneDefinitionImpl.java 2008-12-05 01:28:25 UTC (rev 3210) @@ -0,0 +1,99 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.task.internal.model; + +import java.io.Serializable; + +import org.jbpm.pvm.internal.util.EqualsUtil; +import org.jbpm.task.SwimlaneDefinition; + +/** + * is a process role (aka participant). + */ +public class SwimlaneDefinitionImpl implements Serializable, SwimlaneDefinition { + + private static final long serialVersionUID = 1L; + + protected long dbid; + protected int dbversion; + protected String name = null; + + /** + * expression that resolves to 1 single actorId. + */ + protected String actorIdExpression = null; + + /** + * expression that resolves to a comma separated list of actorIds. + */ + protected String candidatesExpression = null; + + /** + * expression that resolves to an AssignmentHandler implementation. + */ + protected String assignmentExpression = null; + + // equals /////////////////////////////////////////////////////////////////// + // hack to support comparing hibernate proxies against the real objects + // since this always falls back to ==, we don't need to overwrite the hashcode + public boolean equals(Object o) { + return EqualsUtil.equals(this, o); + } + + public void setActorIdExpression(String actorIdExpression) { + // Note: combination of actorIdExpression and candidatesExpression is allowed + this.actorIdExpression = actorIdExpression; + this.assignmentExpression = null; + } + public void setCandidatesExpression(String pooledActorsExpression) { + // Note: combination of actorIdExpression and pooledActorsExpression is allowed + this.candidatesExpression = pooledActorsExpression; + this.assignmentExpression = null; + } + public void setAssignmentExpression(String assignmentExpression) { + // assignment expressions and assignmentDelegation are mutually exclusive + this.actorIdExpression = null; + this.candidatesExpression = null; + this.assignmentExpression = assignmentExpression; + } + + // getters and setters ////////////////////////////////////////////////////// + + public long getDbid() { + return dbid; + } + public void setName(String name) { + this.name = name; + } + public String getName() { + return name; + } + public String getActorIdExpression() { + return actorIdExpression; + } + public String getCandidatesExpression() { + return candidatesExpression; + } + public String getAssignmentExpression() { + return assignmentExpression; + } +} Property changes on: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/SwimlaneDefinitionImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Copied: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/SwimlaneImpl.java (from rev 3185, jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/SwimlaneImpl.java) =================================================================== --- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/SwimlaneImpl.java (rev 0) +++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/SwimlaneImpl.java 2008-12-05 01:28:25 UTC (rev 3210) @@ -0,0 +1,120 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.task.internal.model; + +import java.io.Serializable; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; + +import org.jbpm.pvm.internal.util.EqualsUtil; +import org.jbpm.task.Role; +import org.jbpm.task.Swimlane; +import org.jbpm.task.SwimlaneDefinition; +import org.jbpm.task.Task; +import org.jbpm.task.TaskException; + +/** + * runtime process role for a specific process instance. + */ +public class SwimlaneImpl implements Serializable, Swimlane { + + private static final long serialVersionUID = 1L; + + protected long dbid; + protected int dbversion; + protected String name = null; + protected String assignee = null; + protected Set<RoleImpl> candidates = null; + protected SwimlaneDefinition swimlaneDefinition = null; + + // assignment methods /////////////////////////////////////////////////////// + + public String getAssignee() { + return assignee; + } + + public void setAssignee(String assignee) { + this.assignee = assignee; + } + + // candidates /////////////////////////////////////////////////////////////// + + public Collection<Role> getCandidates() { + if (candidates==null) { + return Collections.EMPTY_LIST; + } + return (Collection)candidates; + } + + public Role createCandidate(String identityId) { + if (identityId==null) { + throw new TaskException("identityId is null"); + } + RoleImpl role = new RoleImpl(); + role.setIdentityId(identityId); + role.setRoleType(Task.ROLETYPE_CANDIDATE); + role.setSwimlane(this); + if (candidates==null) { + candidates = new HashSet<RoleImpl>(); + } + candidates.add(role); + return role; + } + + public void removeCandidate(Role candidate) { + if (candidate==null) { + throw new TaskException("candidate is null"); + } + if ( (candidates!=null) + && (candidates.remove(candidate)) + ) { + ((RoleImpl)candidate).setTask(null); + } + } + + // equals /////////////////////////////////////////////////////////////////// + // hack to support comparing hibernate proxies against the real objects + // since this always falls back to ==, we don't need to overwrite the hashcode + public boolean equals(Object o) { + return EqualsUtil.equals(this, o); + } + + // getters and setters ////////////////////////////////////////////////////// + + public long getDbid() { + return dbid; + } + public String getName() { + return name; + } + public SwimlaneDefinition getSwimlaneDefinition() { + return swimlaneDefinition; + } + public void setSwimlaneDefinition(SwimlaneDefinition swimlaneDefinition) { + this.swimlaneDefinition = swimlaneDefinition; + } + public void setName(String name) { + this.name = name; + } +} Property changes on: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/SwimlaneImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Copied: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/TaskDefinitionImpl.java (from rev 3185, jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/TaskDefinitionImpl.java) =================================================================== --- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/TaskDefinitionImpl.java (rev 0) +++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/TaskDefinitionImpl.java 2008-12-05 01:28:25 UTC (rev 3210) @@ -0,0 +1,144 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.task.internal.model; + +import java.io.Serializable; +import java.util.List; + +import org.jbpm.model.ObservableElement; +import org.jbpm.pvm.internal.model.ProcessElementImpl; +import org.jbpm.pvm.internal.util.Priority; +import org.jbpm.pvm.internal.wire.Descriptor; +import org.jbpm.task.TaskDefinition; + +/** + * defines a task and how the actor(s) must be calculated at runtime. + */ +public class TaskDefinitionImpl extends ProcessElementImpl implements Serializable, TaskDefinition { + + private static final long serialVersionUID = 1L; + + protected String name; + protected String description; + + /** @see #isBlocking() */ + protected boolean isBlocking; + + /** @see #isSignalling() */ + protected boolean isSignalling = true; + + protected String dueDateDuration; + protected List<TaskDefinitionImpl> subTaskDefinitions; + protected int priority = Priority.NORMAL; + protected SwimlaneDefinitionImpl swimlaneDefinition; + protected String assigneeExpression; + protected String candidatesExpression; + protected Descriptor assignerDescriptor; + + + public String getForm() { + return (String) (properties!=null ? properties.get("form") : null); + } + + public ObservableElement getParent() { + // TODO Auto-generated method stub + // huh ? + return null; + } + + public boolean hasEvent(String eventName) { + // TODO Auto-generated method stub + // huh ? + return false; + } + + + // getters and setters ////////////////////////////////////////////////////// + + public String getAssigneeExpression() { + return assigneeExpression; + } + public void setAssigneeExpression(String assigneeExpression) { + this.assigneeExpression = assigneeExpression; + } + public Descriptor getAssignerDescriptor() { + return assignerDescriptor; + } + public void setAssignerDescriptor(Descriptor assignerDescriptor) { + this.assignerDescriptor = assignerDescriptor; + } + public String getCandidatesExpression() { + return candidatesExpression; + } + public void setCandidatesExpression(String candidatesExpression) { + this.candidatesExpression = candidatesExpression; + } + public boolean isBlocking() { + return isBlocking; + } + public void setBlocking(boolean isBlocking) { + this.isBlocking = isBlocking; + } + public boolean isSignalling() { + return isSignalling; + } + public void setSignalling(boolean isSignalling) { + this.isSignalling = isSignalling; + } + public int getPriority() { + return priority; + } + public void setPriority(int priority) { + this.priority = priority; + } + public List<TaskDefinitionImpl> getSubTaskDefinitions() { + return subTaskDefinitions; + } + public void setSubTaskDefinitions(List<TaskDefinitionImpl> subTaskDefinitions) { + this.subTaskDefinitions = subTaskDefinitions; + } + public SwimlaneDefinitionImpl getSwimlaneDefinition() { + return swimlaneDefinition; + } + public void setSwimlaneDefinition(SwimlaneDefinitionImpl swimlaneDefinition) { + this.swimlaneDefinition = swimlaneDefinition; + } + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + public String getDescription() { + return description; + } + public void setDescription(String description) { + this.description = description; + } + public String getDueDateDuration() { + return dueDateDuration; + } + public void setDueDateDuration(String dueDateDuration) { + this.dueDateDuration = dueDateDuration; + } + +} Property changes on: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/TaskDefinitionImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Copied: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/TaskExecution.java (from rev 3185, jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/TaskExecution.java) =================================================================== --- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/TaskExecution.java (rev 0) +++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/TaskExecution.java 2008-12-05 01:28:25 UTC (rev 3210) @@ -0,0 +1,36 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.task.internal.model; + +import java.util.Map; + +import org.jbpm.task.Swimlane; +import org.jbpm.task.Task; + +/** + * @author Tom Baeyens + */ +public interface TaskExecution { + + Map<String, ? extends Task> getTasks(); + Map<String, ? extends Swimlane> getSwimlanes(); +} Property changes on: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/TaskExecution.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Copied: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/TaskImpl.java (from rev 3186, jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/TaskImpl.java) =================================================================== --- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/TaskImpl.java (rev 0) +++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/TaskImpl.java 2008-12-05 01:28:25 UTC (rev 3210) @@ -0,0 +1,420 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.task.internal.model; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Date; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.jbpm.Execution; +import org.jbpm.env.Environment; +import org.jbpm.model.Comment; +import org.jbpm.pvm.internal.cal.Duration; +import org.jbpm.pvm.internal.model.CommentImpl; +import org.jbpm.pvm.internal.model.ExecutionImpl; +import org.jbpm.pvm.internal.model.ScopeInstanceImpl; +import org.jbpm.pvm.internal.util.Clock; +import org.jbpm.pvm.internal.util.EqualsUtil; +import org.jbpm.pvm.internal.util.Priority; +import org.jbpm.pvm.internal.util.ReflectUtil; +import org.jbpm.task.Role; +import org.jbpm.task.Swimlane; +import org.jbpm.task.Task; +import org.jbpm.task.TaskDefinition; +import org.jbpm.task.TaskException; + +/** + * is one task instance that can be assigned to an actor (read: put in + * someones task list) and that can trigger the continuation of execution + * of the token upon completion. + */ +public class TaskImpl extends ScopeInstanceImpl implements Serializable, Task { + + private static final long serialVersionUID = 1L; + // private static final Logger log = Logger.getLogger(TaskImpl.class.getName()); + + // could be made configurable: + public static final String CONTEXTKEY_TASK_CLASS_NAME = "taskClassName"; + public static final String[] SEARCHORDER_TASK_CLASS_NAME = new String[]{ + // PvmEnvironment.CONTEXTNAME_APPLICATION + }; + + protected String id; + protected String name; + protected String description; + + protected String assignee; + protected Set<RoleImpl> roles; + + protected Date create; + protected Date dueDate; + protected Integer progress; + + // protected VariableMap variableMap; + protected List<CommentImpl> comments; + + protected int priority = Priority.NORMAL; + + protected String state; + + protected ExecutionImpl execution; + protected boolean isSignalling = true; + protected boolean isBlocking; + + protected TaskDefinitionImpl taskDefinition; + protected SwimlaneImpl swimlane; + + protected TaskImpl superTask; + protected Set<TaskImpl> subTasks; + + protected TaskImpl() { + } + + // creating a task + + public static TaskImpl create(String taskId) { + return create(taskId, null, null); + } + + public static TaskImpl create(String taskId, TaskDefinitionImpl taskDefinition) { + return create(taskId, taskDefinition, null); + } + + public static TaskImpl create(String taskId, TaskDefinitionImpl taskDefinition, ExecutionImpl execution) { + TaskImpl task = null; + // if a task class name is configured + Environment environment = Environment.getCurrent(); + String taskClassName = (environment!=null ? (String) environment.get(TaskImpl.CONTEXTKEY_TASK_CLASS_NAME, TaskImpl.SEARCHORDER_TASK_CLASS_NAME) : null); + if (taskClassName!=null) { + // dynamically instantiate it + ClassLoader classLoader = environment.getClassLoader(); + Class<?> taskClass = ReflectUtil.loadClass(classLoader, taskClassName); + task = (TaskImpl) ReflectUtil.newInstance(taskClass); + + // otherwise just use the default task implementation type + } else { + task = new TaskImpl(); + } + + task.create = Clock.getCurrentTime(); + + task.setId(taskId); + task.setTaskDefinition(taskDefinition); + task.setExecution(execution); + + // initialise the task state + task.state = LifeCycle.initialise(task); + + return task; + } + + public void setTaskDefinition(TaskDefinitionImpl taskDefinition) { + this.taskDefinition = taskDefinition; + if (taskDefinition!=null) { + this.name = taskDefinition.getName(); + this.description = taskDefinition.getDescription(); + this.isBlocking = taskDefinition.isBlocking(); + this.isSignalling = taskDefinition.isSignalling(); + this.priority = taskDefinition.getPriority(); + + String durationText = taskDefinition.getDueDateDuration(); + if (durationText!=null) { + this.dueDate = calculateDueDate(new Duration(durationText)); + } + } + } + + protected static Date calculateDueDate(Duration dueDate) { + // TODO + return null; + } + + // assigning a task ///////////////////////////////////////////////////////// + + public String getAssignee() { + return assignee; + } + + public void setAssignee(String assignee) { + this.assignee = assignee; + // TODO fire the assignment event + } + + // roles //////////////////////////////////////////////////////////////////// + + public Set<RoleImpl> getRoles() { + if (roles==null) { + return Collections.EMPTY_SET; + } + return roles; + } + + public Set<RoleImpl> getAllRoles() { + Set<RoleImpl> allRoles = null; + if (roles!=null) { + allRoles = new HashSet<RoleImpl>(roles); + } else { + allRoles = new HashSet<RoleImpl>(); + } + if (swimlane!=null) { + allRoles.addAll((Set)swimlane.getCandidates()); + } + return allRoles; + } + + public Role addRole(String identityId, String roleType) { + if (identityId==null) { + throw new TaskException("userId is null"); + } + if (roleType==null) { + throw new TaskException("roleType is null"); + } + RoleImpl role = new RoleImpl(); + role.setIdentityId(identityId); + role.setTask(this); + role.setRoleType(roleType); + if (roles==null) { + roles = new HashSet<RoleImpl>(); + } + roles.add(role); + return role; + } + + public void removeRole(Role role) { + if (role==null) { + throw new TaskException("role is null"); + } + if ( (roles!=null) + && (roles.remove(role)) + ) { + ((RoleImpl)role).setTask(null); + } + } + + // completion /////////////////////////////////////////////////////////////// + + public void submit() { + submit(null); + } + + public void submit(Map<String, Object> variables) { + } + + // comments ///////////////////////////////////////////////////////////////// + + public List<Comment> getComments() { + if (comments==null) { + return Collections.EMPTY_LIST; + } + return (List) comments; + } + + public Comment createComment(String commentText) { + if (comments==null) { + comments = new ArrayList<CommentImpl>(); + } + CommentImpl comment = new CommentImpl(commentText); + comments.add(comment); + return comment; + } + + public void removeComment(Comment comment) { + if (comment==null) { + throw new TaskException("comment is null"); + } + if (comments!=null) { + comments.remove(comment); + } + } + + // subtasks ///////////////////////////////////////////////////////////////// + + public Set<Task> getSubTasks() { + if (subTasks==null) { + return Collections.emptySet(); + } + return (Set) subTasks; + } + + public Task createSubTask(String name) { + if (subTasks==null) { + subTasks = new HashSet<TaskImpl>(); + } + TaskImpl subtask = new TaskImpl(); + subtask.setName(name); + addSubTask(subtask); + return subtask; + } + + public Task createSubTask(String subTaskId, TaskDefinition subTaskDefinition) { + if (subTaskDefinition==null) { + throw new TaskException("subtaskDefinition is null"); + } + if (subTasks==null) { + subTasks = new HashSet<TaskImpl>(); + } + TaskImpl subtask = create(subTaskId, taskDefinition); + addSubTask(subtask); + return subtask; + } + + public Task addSubTask(TaskImpl subtask) { + if (subTasks==null) { + subTasks = new HashSet<TaskImpl>(); + } + subtask.setSuperTask(this); + subTasks.add(subtask); + return subtask; + } + + public void removeSubTask(Task subtask) { + if (subtask==null) { + throw new TaskException("subtask is null"); + } + if ( (subTasks!=null) + && (subTasks.remove(subtask)) + ) { + ((TaskImpl)subtask).setSuperTask(null); + } + } + + // equals /////////////////////////////////////////////////////////////////// + // hack to support comparing hibernate proxies against the real objects + // since this always falls back to ==, we don't need to overwrite the hashcode + public boolean equals(Object o) { + return EqualsUtil.equals(this, o); + } + + public String getLifeCycleResource() { + // the default lifecycle can be overridden in subclasses + return "jbpm.task.default.lifecycle.xml"; + } + + // modified getters and setters ///////////////////////////////////////////// + public void setProgress(Integer progress) { + if ( (progress<0) + || (progress>100) + ) { + throw new TaskException("task progress is a percentage (integer) and must be expressed between 0 and 100"); + } + this.progress = progress; + } + + // getters and setters ////////////////////////////////////////////////////// + + public String getDescription() { + return description; + } + public void setDescription(String description) { + this.description = description; + } + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + public boolean isBlocking() { + return isBlocking; + } + public void setBlocking(boolean isBlocking) { + this.isBlocking = isBlocking; + } + public boolean isSignalling() { + return isSignalling; + } + public void setSignalling(boolean isSignalling) { + this.isSignalling = isSignalling; + } + public int getPriority() { + return priority; + } + public void setPriority(int priority) { + this.priority = priority; + } + public void setComments(List<CommentImpl> comments) { + this.comments = comments; + } + public Date getCreate() { + return create; + } + public void setCreate(Date create) { + this.create = create; + } + public Date getDueDate() { + return dueDate; + } + public void setDueDate(Date dueDate) { + this.dueDate = dueDate; + } + public ExecutionImpl getExecution() { + return execution; + } + public void setExecution(Execution execution) { + this.execution = (ExecutionImpl) execution; + } + public String getState() { + return state; + } + public Swimlane getSwimlane() { + return swimlane; + } + public void setSwimlane(SwimlaneImpl swimlane) { + this.swimlane = swimlane; + } + public long getDbid() { + return dbid; + } + public TaskDefinition getTaskDefinition() { + return taskDefinition; + } + public TaskImpl getSuperTask() { + return superTask; + } + public void setSuperTask(TaskImpl superTask) { + this.superTask = superTask; + } + public Integer getProgress() { + return progress; + } + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + + public String getAssignedUserId() { + // TODO Auto-generated method stub + return null; + } + + public void setAssignedUserId(String assignedUserId) { + // TODO Auto-generated method stub + + } +} Property changes on: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/TaskImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Copied: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/TaskServiceImpl.java (from rev 3186, jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/TaskServiceImpl.java) =================================================================== --- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/TaskServiceImpl.java (rev 0) +++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/TaskServiceImpl.java 2008-12-05 01:28:25 UTC (rev 3210) @@ -0,0 +1,95 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.task.internal.model; + +import java.util.List; + +import org.jbpm.TaskService; +import org.jbpm.cmd.CommandService; +import org.jbpm.task.Role; +import org.jbpm.task.Task; +import org.jbpm.task.internal.cmd.CreateTask; +import org.jbpm.task.internal.cmd.UpdateTask; + +/** + * @author Tom Baeyens + */ +public class TaskServiceImpl implements TaskService { + + protected CommandService commandService; + + public TaskServiceImpl() { + } + + public TaskServiceImpl(CommandService commandService) { + this.commandService = commandService; + } + + public void updateTask(Task task) { + commandService.execute(new UpdateTask(task)); + } + + public CommandService getCommandService() { + return commandService; + } + public void setCommandService(CommandService commandService) { + this.commandService = commandService; + } + + public void deleteTask(String taskId) { + // TODO Auto-generated method stub + + } + + public List<Task> getPersonalTaskList(String userId, int firstResult, int maxResults) { + // TODO Auto-generated method stub + return null; + } + + public Task getTask(String taskId) { + // TODO Auto-generated method stub + return null; + } + + public Task newTask(String taskId) { + return commandService.execute(new CreateTask(taskId)); + } + + public void submitTask(String taskId) { + // TODO Auto-generated method stub + } + + public List<Task> getGroupTaskList(String userId, int firstResult, int maxResults) { + // TODO Auto-generated method stub + return null; + } + + public List<String> getCandidates(String taskId) { + // TODO Auto-generated method stub + return null; + } + + public List<Role> getRoles(String taskId) { + // TODO Auto-generated method stub + return null; + } +} Property changes on: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/TaskServiceImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Copied: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/wire/binding/TaskDbSessionBinding.java (from rev 3185, jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/xml/TaskDbSessionBinding.java) =================================================================== --- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/wire/binding/TaskDbSessionBinding.java (rev 0) +++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/wire/binding/TaskDbSessionBinding.java 2008-12-05 01:28:25 UTC (rev 3210) @@ -0,0 +1,49 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.task.internal.wire.binding; + +import org.jbpm.pvm.internal.wire.binding.WireDescriptorBinding; +import org.jbpm.pvm.internal.xml.Parse; +import org.jbpm.pvm.internal.xml.Parser; +import org.jbpm.task.internal.wire.descriptor.HibernateTaskDbSessionDescriptor; +import org.w3c.dom.Element; + +/** + * @author Alejandro Guizar + */ +public class TaskDbSessionBinding extends WireDescriptorBinding { + + public TaskDbSessionBinding() { + super("task-db-session"); + } + + public Object parse(Element element, Parse parse, Parser parser) { + HibernateTaskDbSessionDescriptor descriptor = new HibernateTaskDbSessionDescriptor(); + + if (element.hasAttribute("session")) { + descriptor.setSessionName(element.getAttribute("session")); + } + + return descriptor; + } + +} Property changes on: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/wire/binding/TaskDbSessionBinding.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Copied: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/wire/binding/TaskServiceBinding.java (from rev 3185, jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/xml/TaskServiceBinding.java) =================================================================== --- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/wire/binding/TaskServiceBinding.java (rev 0) +++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/wire/binding/TaskServiceBinding.java 2008-12-05 01:28:25 UTC (rev 3210) @@ -0,0 +1,48 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.task.internal.wire.binding; + +import org.jbpm.cmd.CommandService; +import org.jbpm.pvm.internal.wire.binding.WireDescriptorBinding; +import org.jbpm.pvm.internal.wire.descriptor.ContextTypeRefDescriptor; +import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor; +import org.jbpm.pvm.internal.xml.Parse; +import org.jbpm.pvm.internal.xml.Parser; +import org.jbpm.task.internal.model.TaskServiceImpl; +import org.w3c.dom.Element; + +/** + * @author Tom Baeyens + */ +public class TaskServiceBinding extends WireDescriptorBinding { + + public TaskServiceBinding() { + super("task-service"); + } + + public Object parse(Element element, Parse parse, Parser parser) { + ObjectDescriptor descriptor = new ObjectDescriptor(TaskServiceImpl.class); + descriptor.addInjection("commandService", new ContextTypeRefDescriptor(CommandService.class)); + return descriptor; + } + +} Property changes on: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/wire/binding/TaskServiceBinding.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Copied: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/wire/descriptor/HibernateTaskDbSessionDescriptor.java (from rev 3185, jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/xml/TaskDbSessionDescriptor.java) =================================================================== --- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/wire/descriptor/HibernateTaskDbSessionDescriptor.java (rev 0) +++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/wire/descriptor/HibernateTaskDbSessionDescriptor.java 2008-12-05 01:28:25 UTC (rev 3210) @@ -0,0 +1,70 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.task.internal.wire.descriptor; + +import org.hibernate.Session; +import org.jbpm.pvm.internal.wire.WireContext; +import org.jbpm.pvm.internal.wire.WireDefinition; +import org.jbpm.pvm.internal.wire.WireException; +import org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor; +import org.jbpm.task.internal.hibernate.HibernateTaskDbSession; + +/** + * @author Tom Baeyens + */ +public class HibernateTaskDbSessionDescriptor extends AbstractDescriptor { + + private static final long serialVersionUID = 1L; + + private String sessionName; + + public Object construct(WireContext wireContext) { + return new HibernateTaskDbSession(); + } + + public void initialize(Object object, WireContext wireContext) { + // get the hibernate-session + Session session = null; + if (sessionName != null) { + session = (Session) wireContext.get(sessionName); + } else { + session = wireContext.get(Session.class); + } + + if (session == null) { + throw new WireException("couldn't find hibernate-session " + + (sessionName != null ? "'" + sessionName + "'" : "by type ") + + "to create pvm-db-session"); + } + + // inject the session + ((HibernateTaskDbSession) object).setSession(session); + } + + public Class<?> getType(WireDefinition wireDefinition) { + return HibernateTaskDbSession.class; + } + + public void setSessionName(String sessionName) { + this.sessionName = sessionName; + } +} Property changes on: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/wire/descriptor/HibernateTaskDbSessionDescriptor.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Copied: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/session/TaskDbSession.java (from rev 3185, jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/db/TaskDbSession.java) =================================================================== --- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/session/TaskDbSession.java (rev 0) +++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/session/TaskDbSession.java 2008-12-05 01:28:25 UTC (rev 3210) @@ -0,0 +1,33 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.task.session; + +import org.jbpm.session.DbSession; + +/** + * Persistence interface for tasks. + * @author Alejandro Guizar + */ +public interface TaskDbSession extends DbSession { + + // TODO +} Property changes on: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/session/TaskDbSession.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Modified: jbpm4/trunk/modules/task/src/main/resources/jbpm.task.hbm.xml =================================================================== --- jbpm4/trunk/modules/task/src/main/resources/jbpm.task.hbm.xml 2008-12-04 23:15:16 UTC (rev 3209) +++ jbpm4/trunk/modules/task/src/main/resources/jbpm.task.hbm.xml 2008-12-05 01:28:25 UTC (rev 3210) @@ -2,7 +2,7 @@ <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping auto-import="false" package="org.jbpm.task.impl" default-access="field"> +<hibernate-mapping auto-import="false" package="org.jbpm.task.internal.model" default-access="field">  <class name="TaskDefinitionImpl" discriminator-value="T"> @@ -157,7 +157,7 @@ <query name="findTasks"> <![CDATA[ select task - from org.jbpm.task.impl.TaskImpl as task + from org.jbpm.task.internal.model.TaskImpl as task ]]> </query> Modified: jbpm4/trunk/modules/task/src/main/resources/jbpm.task.wire.bindings.xml =================================================================== --- jbpm4/trunk/modules/task/src/main/resources/jbpm.task.wire.bindings.xml 2008-12-04 23:15:16 UTC (rev 3209) +++ jbpm4/trunk/modules/task/src/main/resources/jbpm.task.wire.bindings.xml 2008-12-05 01:28:25 UTC (rev 3210) @@ -1,6 +1,6 @@ <wire-bindings> - <binding tag="task-db-session" class="org.jbpm.task.xml.TaskDbSessionBinding" category="descriptor" /> - <binding tag="task-service" class="org.jbpm.task.xml.TaskServiceBinding" category="descriptor" /> + <binding class="org.jbpm.task.internal.wire.binding.TaskDbSessionBinding" /> + <binding class="org.jbpm.task.internal.wire.binding.TaskServiceBinding" /> </wire-bindings> Deleted: jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskDbTest.java =================================================================== --- jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskDbTest.java 2008-12-04 23:15:16 UTC (rev 3209) +++ jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskDbTest.java 2008-12-05 01:28:25 UTC (rev 3210) @@ -1,384 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jbpm.task; - -import org.jbpm.test.DbTestCase; - -/** - * @author Tom Baeyens - */ -public class TaskDbTest extends DbTestCase { - - public void testNothing() { - } - - /* - public void testTask() { - Date now = new Date(); - Date inFiveMinutes = new Date(now.getTime()+ (5*60*1000)); - - TaskImpl task; - try { - Clock.setCurrentTime(now); - task = TaskImpl.create(); - } finally { - Clock.setCurrentTime(null); - } - task.setName("hello"); - task.setDescription("say hello to your neighbour developer"); - task.setDueDate(inFiveMinutes); - task.setPriority(Priority.HIGHEST); - - task = reload(task, TaskImpl.class); - - assertEquals("hello", task.getName()); - assertEquals("say hello to your neighbour developer", task.getDescription()); - assertEquals(now, task.getCreate()); - assertEquals(inFiveMinutes, task.getDueDate()); - assertEquals(Priority.HIGHEST, task.getPriority()); - - } - - public void testTaskAssignment() { - TaskImpl task = TaskImpl.create(); - task.setAssignee("john doe"); - - task = reload(task, TaskImpl.class); - - assertEquals("john doe", task.getAssignee()); - } - - public void testTaskReassignmentAssignment() { - TaskImpl task = TaskImpl.create(); - task.setAssignee("johndoe"); - assertEquals("johndoe", task.getAssignee()); - - task = reload(task, TaskImpl.class); - - task.setAssignee("joesmoe"); - - task = reload(task, TaskImpl.class); - - assertEquals("joesmoe", task.getAssignee()); - } - - public void testTaskRoles() { - TaskImpl task = TaskImpl.create(); - - assertNotNull(task.getRoles()); - assertEquals(0, task.getRoles().size()); - - task.addRole("john doe", RoleType.CLIENT).setDescription("uses the result"); - task.addRole("joe smoe", RoleType.OWNER).setDescription("does what he wants"); - task.addRole("jack black", RoleType.CANDIDATE).setDescription("can take this task"); - task.addRole("jim slim", RoleType.VIEWER).setDescription("is allowed to see"); - task.addRole("jeff nef", RoleType.REPLACED_ASSIGNEE).setDescription("is sick"); - - task = reload(task, TaskImpl.class); - - Map<String, RoleImpl> roleMap = getRoleMap(task.getRoles()); - - assertEquals(RoleType.CLIENT, roleMap.get("john doe").getRoleType()); - assertEquals("uses the result", roleMap.get("john doe").getDescription()); - - assertEquals(RoleType.OWNER, roleMap.get("joe smoe").getRoleType()); - assertEquals("does what he wants", roleMap.get("joe smoe").getDescription()); - - assertEquals(RoleType.CANDIDATE, roleMap.get("jack black").getRoleType()); - assertEquals("can take this task", roleMap.get("jack black").getDescription()); - - assertEquals(RoleType.VIEWER, roleMap.get("jim slim").getRoleType()); - assertEquals("is allowed to see", roleMap.get("jim slim").getDescription()); - - assertEquals(RoleType.REPLACED_ASSIGNEE, roleMap.get("jeff nef").getRoleType()); - assertEquals("is sick", roleMap.get("jeff nef").getDescription()); - - assertEquals(5, roleMap.size()); - - task.removeRole(roleMap.get("john doe")); - - task = reload(task, TaskImpl.class); - - assertEquals(4, task.getRoles().size()); - task.removeRole(getRoleMap(task.getRoles()).get("joe smoe")); - - task = reload(task, TaskImpl.class); - - assertEquals(3, task.getRoles().size()); - task.removeRole(getRoleMap(task.getRoles()).get("jack black")); - - task = reload(task, TaskImpl.class); - - assertEquals(2, task.getRoles().size()); - task.removeRole(getRoleMap(task.getRoles()).get("jim slim")); - - task = reload(task, TaskImpl.class); - - assertEquals(1, task.getRoles().size()); - task.removeRole(getRoleMap(task.getRoles()).get("jeff nef")); - - task = reload(task, TaskImpl.class); - - assertEquals(0, getRoleMap(task.getRoles()).size()); - } - - public static Map<String, RoleImpl> getRoleMap(Set<RoleImpl> roles) { - Map<String, RoleImpl> roleMap = new HashMap<String, RoleImpl>(); - for (RoleImpl role: roles) { - roleMap.put(role.getIdentityId(), role); - } - return roleMap; - } - - public void testTaskAllRoles() { - SwimlaneImpl manager = new SwimlaneImpl(); - - manager.createCandidate("joe smoe").setDescription("too much tostesteron"); - manager.createCandidate("jack black").setDescription("the pigeon"); - manager.createCandidate("jim slim").setDescription("lame duck"); - - manager = reload(manager, SwimlaneImpl.class); - - TaskImpl task = TaskImpl.create(); - assertNotNull(task.getAllRoles()); - assertEquals(0, task.getAllRoles().size()); - - task.addRole("john doe", RoleType.CLIENT).setDescription("uses the result"); - assertEquals(1, task.getAllRoles().size()); - - task.addRole("jeff nef", RoleType.REPLACED_ASSIGNEE).setDescription("is sick"); - task.setSwimlane(manager); - - task = reload(task, TaskImpl.class); - - Map<String, RoleImpl> roleMap = getRoleMap(task.getAllRoles()); - - assertEquals(RoleType.CLIENT, roleMap.get("john doe").getRoleType()); - assertEquals("uses the result", roleMap.get("john doe").getDescription()); - - assertEquals(RoleType.CANDIDATE, roleMap.get("joe smoe").getRoleType()); - assertEquals("too much tostesteron", roleMap.get("joe smoe").getDescription()); - - assertEquals(RoleType.CANDIDATE, roleMap.get("jack black").getRoleType()); - assertEquals("the pigeon", roleMap.get("jack black").getDescription()); - - assertEquals(RoleType.CANDIDATE, roleMap.get("jim slim").getRoleType()); - assertEquals("lame duck", roleMap.get("jim slim").getDescription()); - - assertEquals(RoleType.REPLACED_ASSIGNEE, roleMap.get("jeff nef").getRoleType()); - assertEquals("is sick", roleMap.get("jeff nef").getDescription()); - - assertEquals(5, roleMap.size()); - - task.removeRole(roleMap.get("john doe")); - - task = reload(task, TaskImpl.class); - manager = environment.get(DbSession.class).get(SwimlaneImpl.class, manager.getDbid()); - - assertEquals(4, task.getAllRoles().size()); - manager.removeCandidate(getRoleMap(task.getAllRoles()).get("joe smoe")); - - task = reload(task, TaskImpl.class); - manager = environment.get(DbSession.class).get(SwimlaneImpl.class, manager.getDbid()); - - assertEquals(3, task.getAllRoles().size()); - manager.removeCandidate(getRoleMap(task.getAllRoles()).get("jack black")); - - task = reload(task, TaskImpl.class); - manager = environment.get(DbSession.class).get(SwimlaneImpl.class, manager.getDbid()); - - assertEquals(2, task.getAllRoles().size()); - manager.removeCandidate(getRoleMap(task.getAllRoles()).get("jim slim")); - - task = reload(task, TaskImpl.class); - manager = environment.get(DbSession.class).get(SwimlaneImpl.class, manager.getDbid()); - - assertEquals(1, task.getAllRoles().size()); - task.removeRole(getRoleMap(task.getAllRoles()).get("jeff nef")); - - task = reload(task, TaskImpl.class); - - assertEquals(0, task.getAllRoles().size()); - } - - public void testTaskComment() { - EnvironmentFactory environmentFactory = EnvironmentFactory.parseXmlString("<environment/>"); - TaskImpl task = TaskImpl.create(); - - Environment environment = environmentFactory.openEnvironment(); - try { - environment.setUserId("john doe"); - task.createComment("should I really do this ? yuk."); - } finally { - environment.close(); - } - - task = reload(task, TaskImpl.class); - - environment = environmentFactory.openEnvironment(); - try { - environment.setUserId("joe smoe"); - task.createComment("yes, you should really do it."); - } finally { - environment.close(); - } - - task = reload(task, TaskImpl.class); - - List<Comment> comments = task.getComments(); - assertNotNull(comments); - - assertEquals("should I really do this ? yuk.", comments.get(0).getMessage()); - assertEquals("john doe", comments.get(0).getUserId()); - - assertEquals("yes, you should really do it.", comments.get(1).getMessage()); - assertEquals("joe smoe", comments.get(1).getUserId()); - } - - public void testTaskCommentReplies() { - TaskImpl task = TaskImpl.create(); - Comment comment = task.createComment("hi, how are you?"); - Comment reply = comment.createReply("i'm fine, thanks"); - reply = reply.createReply("nice wheather, huh"); - reply.createReply("snow's great fun"); - - task = reload(task, TaskImpl.class); - - comment = task.createComment("are you going to the office?"); - reply = comment.createReply("no not now"); - reply = reply.createReply("when are you going"); - reply.createReply("later"); - - task = reload(task, TaskImpl.class); - - List<Comment> comments = task.getComments(); - assertEquals("hi, how are you?", comments.get(0).getMessage()); - assertEquals("i'm fine, thanks", comments.get(0).getReplies().get(0).getMessage()); - assertEquals("nice wheather, huh", comments.get(0).getReplies().get(0).getReplies().get(0).getMessage()); - assertEquals("snow's great fun", comments.get(0).getReplies().get(0).getReplies().get(0).getReplies().get(0).getMessage()); - - assertEquals("are you going to the office?", comments.get(1).getMessage()); - assertEquals("no not now", comments.get(1).getReplies().get(0).getMessage()); - assertEquals("when are you going", comments.get(1).getReplies().get(0).getReplies().get(0).getMessage()); - assertEquals("later", comments.get(1).getReplies().get(0).getReplies().get(0).getReplies().get(0).getMessage()); - - comment = task.getComments().get(0); - comment.removeReply(comment.getReplies().get(0)); - - task = reload(task, TaskImpl.class); - - assertEquals("hi, how are you?", comment.getMessage()); - assertTrue(comment.getReplies().isEmpty()); - assertEquals(2, task.getComments().size()); - - task.removeComment(task.getComments().get(1)); - - task = reload(task, TaskImpl.class); - - assertEquals(1, task.getComments().size()); - assertEquals("hi, how are you?", comment.getMessage()); - } - - public void testTaskWithDefinition() { - TaskDefinitionImpl taskDefinition = new TaskDefinitionImpl(); - taskDefinition.setName("hello"); - taskDefinition.setPriority(Priority.HIGH); - - taskDefinition = reload(taskDefinition, TaskDefinitionImpl.class); - - TaskImpl task = TaskImpl.create(taskDefinition); - - task = reload(task, TaskImpl.class); - - assertEquals("hello", task.getName()); - assertEquals(Priority.HIGH, task.getPriority()); - assertEquals("hello", task.getTaskDefinition().getName()); - } - - public void testSubTasks() { - TaskImpl improveWorld = TaskImpl.create(); - improveWorld.setName("improve the world"); - - improveWorld.createSubTask("try to automate everything"); - - improveWorld = reload(improveWorld, TaskImpl.class); - - improveWorld.createSubTask("discover the problem is in the workflow part"); - TaskImpl writeWorkflowEngine = (TaskImpl) improveWorld.createSubTask("write an open source workflow engine"); - writeWorkflowEngine.createSubTask("create a sf.net project"); - Task commitCode = writeWorkflowEngine.createSubTask("commit code to cvs"); - writeWorkflowEngine.createSubTask("nurture it and grow it"); - writeWorkflowEngine.createSubTask("harvest a beautiful project"); - - improveWorld.createSubTask("automate everything with workflow"); - improveWorld.createSubTask("create peace everywhere"); - - improveWorld = reload(improveWorld, TaskImpl.class); - - writeWorkflowEngine = environment.get(DbSession.class).get(TaskImpl.class, writeWorkflowEngine.getDbid()); - - Set<String> expectedSubtaskNames = new HashSet<String>(); - expectedSubtaskNames.add("try to automate everything"); - expectedSubtaskNames.add("discover the problem is in the workflow part"); - expectedSubtaskNames.add("write an open source workflow engine"); - expectedSubtaskNames.add("automate everything with workflow"); - expectedSubtaskNames.add("create peace everywhere"); - - Set<Task> subtasks = improveWorld.getSubTasks(); - Set<String> subtaskNames = new HashSet<String>(); - for (Task subtask: subtasks) { - subtaskNames.add(subtask.getName()); - } - - assertEquals(expectedSubtaskNames, subtaskNames); - - expectedSubtaskNames = new HashSet<String>(); - expectedSubtaskNames.add("create a sf.net project"); - expectedSubtaskNames.add("commit code to cvs"); - expectedSubtaskNames.add("nurture it and grow it"); - expectedSubtaskNames.add("harvest a beautiful project"); - - subtasks = writeWorkflowEngine.getSubTasks(); - subtaskNames = new HashSet<String>(); - for (Task subtask: subtasks) { - subtaskNames.add(subtask.getName()); - } - - assertEquals(expectedSubtaskNames, subtaskNames); - - writeWorkflowEngine = reload(writeWorkflowEngine, TaskImpl.class); - commitCode = environment.get(DbSession.class).get(TaskImpl.class, commitCode.getDbid()); - writeWorkflowEngine.removeSubTask(commitCode); - expectedSubtaskNames.remove("commit code to cvs"); - - writeWorkflowEngine = reload(writeWorkflowEngine, TaskImpl.class); - - subtasks = writeWorkflowEngine.getSubTasks(); - subtaskNames = new HashSet<String>(); - for (Task subtask: subtasks) { - subtaskNames.add(subtask.getName()); - } - - assertEquals(expectedSubtaskNames, subtaskNames); - } - */ -} Modified: jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskServiceTest.java =================================================================== --- jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskServiceTest.java 2008-12-04 23:15:16 UTC (rev 3209) +++ jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskServiceTest.java 2008-12-05 01:28:25 UTC (rev 3210) @@ -24,36 +24,14 @@ import org.jbpm.test.DbTestCase; /** - * @author Tom Baeyens + * @author Alejandro Guizar */ public class TaskServiceTest extends DbTestCase { - public void testTaskService() { - /* - Task task = taskService.createTask(); - task.setName("doing the dishes"); - Date now = new Date(); - task.setDueDate(now); - taskService.updateTask(task); - - long taskDbid = task.getDbid(); - task = taskService.getTask(taskDbid); - assertEquals("doing the dishes", task.getName()); - assertEquals(now, task.getDueDate()); - - taskService.deleteTask(taskDbid); - - // verify that the task table is empty - CommandService commandService = null; - commandService.execute(new Command() { - public Object execute(Environment environment) throws Exception { - Session session = environment.get(Session.class); - List tasks = session.createQuery("from "+TaskImpl.class.getName()).list(); - assertEquals(0, tasks.size()); - return null; - } - }); - */ + public void testNewTask() { + String taskId = getName(); + Task task = createTask(taskId); + assertEquals(taskId, task.getId()); } } Deleted: jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskTest.java =================================================================== --- jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskTest.java 2008-12-04 23:15:16 UTC (rev 3209) +++ jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskTest.java 2008-12-05 01:28:25 UTC (rev 3210) @@ -1,312 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jbpm.task; - -import java.util.Date; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; - -import org.jbpm.pvm.internal.util.Clock; -import org.jbpm.pvm.internal.util.Priority; -import org.jbpm.task.impl.RoleImpl; -import org.jbpm.task.impl.SwimlaneImpl; -import org.jbpm.task.impl.TaskImpl; -import org.jbpm.test.JbpmTestCase; - -/** - * @author Tom Baeyens - */ -public class TaskTest extends JbpmTestCase { - - public void testTask() { - Date now = new Date(); - Date inFiveMinutes = new Date(now.getTime()+ (5*60*1000)); - - TaskImpl task; - try { - Clock.setCurrentTime(now); - task = TaskImpl.create(getName()); - } finally { - Clock.setCurrentTime(null); - } - task.setName("hello"); - task.setDescription("say hello to your neighbour developer"); - task.setDueDate(inFiveMinutes); - task.setPriority(Priority.HIGHEST); - - assertEquals("hello", task.getName()); - assertEquals("say hello to your neighbour developer", task.getDescription()); - assertEquals(now, task.getCreate()); - assertEquals(inFiveMinutes, task.getDueDate()); - assertEquals(Priority.HIGHEST, task.getPriority()); - } - - public void testTaskAssignment() { - TaskImpl task = TaskImpl.create(getName()); - task.setAssignee("john doe"); - assertEquals("john doe", task.getAssignee()); - } - - public void testTaskReassignmentAssignment() { - TaskImpl task = TaskImpl.create(getName()); - task.setAssignee("johndoe"); - assertEquals("johndoe", task.getAssignee()); - task.setAssignee("joesmoe"); - assertEquals("joesmoe", task.getAssignee()); - } - - public void testTaskRoles() { - TaskImpl task = TaskImpl.create(getName()); - - assertNotNull(task.getRoles()); - assertEquals(0, task.getRoles().size()); - - task.addRole("john doe", Task.ROLETYPE_CLIENT).setDescription("uses the result"); - task.addRole("joe smoe", Task.ROLETYPE_OWNER).setDescription("does what he wants"); - task.addRole("jack black", Task.ROLETYPE_CANDIDATE).setDescription("can take this task"); - task.addRole("jim slim", Task.ROLETYPE_VIEWER).setDescription("is allowed to see"); - task.addRole("jeff nef", Task.ROLETYPE_REPLACED_ASSIGNEE).setDescription("is sick"); - - Set<RoleImpl> roles = task.getRoles(); - Map<String, RoleImpl> roleMap = new HashMap<String, RoleImpl>(); - for (RoleImpl role: roles) { - roleMap.put(role.getIdentityId(), role); - } - - assertEquals(Task.ROLETYPE_CLIENT, roleMap.get("john doe").getRoleType()); - assertEquals("uses the result", roleMap.get("john doe").getDescription()); - - assertEquals(Task.ROLETYPE_OWNER, roleMap.get("joe smoe").getRoleType()); - assertEquals("does what he wants", roleMap.get("joe smoe").getDescription()); - - assertEquals(Task.ROLETYPE_CANDIDATE, roleMap.get("jack black").getRoleType()); - assertEquals("can take this task", roleMap.get("jack black").getDescription()); - - assertEquals(Task.ROLETYPE_VIEWER, roleMap.get("jim slim").getRoleType()); - assertEquals("is allowed to see", roleMap.get("jim slim").getDescription()); - - assertEquals(Task.ROLETYPE_REPLACED_ASSIGNEE, roleMap.get("jeff nef").getRoleType()); - assertEquals("is sick", roleMap.get("jeff nef").getDescription()); - - assertEquals(5, roles.size()); - - task.removeRole(roleMap.get("john doe")); - assertEquals(4, task.getRoles().size()); - task.removeRole(roleMap.get("joe smoe")); - assertEquals(3, task.getRoles().size()); - task.removeRole(roleMap.get("jack black")); - assertEquals(2, task.getRoles().size()); - task.removeRole(roleMap.get("jim slim")); - assertEquals(1, task.getRoles().size()); - task.removeRole(roleMap.get("jeff nef")); - assertEquals(0, roles.size()); - } - - public void testTaskAllRoles() { - TaskImpl task = TaskImpl.create(getName()); - - assertNotNull(task.getAllRoles()); - assertEquals(0, task.getAllRoles().size()); - - task.addRole("john doe", Task.ROLETYPE_CLIENT).setDescription("uses the result"); - - SwimlaneImpl manager = new SwimlaneImpl(); - task.setSwimlane(manager); - - manager.createCandidate("joe smoe").setDescription("tostesteron ambition"); - manager.createCandidate("jack black").setDescription("the pigeon"); - manager.createCandidate("jim slim").setDescription("lame duck"); - - task.addRole("jeff nef", Task.ROLETYPE_REPLACED_ASSIGNEE).setDescription("is sick"); - - Set<RoleImpl> roles = task.getAllRoles(); - Map<String, RoleImpl> roleMap = new HashMap<String, RoleImpl>(); - for (RoleImpl role: roles) { - roleMap.put(role.getIdentityId(), role); - } - - assertEquals(Task.ROLETYPE_CLIENT, roleMap.get("john doe").getRoleType()); - assertEquals("uses the result", roleMap.get("john doe").getDescription()); - - assertEquals(Task.ROLETYPE_CANDIDATE, roleMap.get("joe smoe").getRoleType()); - assertEquals("tostesteron ambition", roleMap.get("joe smoe").getDescription()); - - assertEquals(Task.ROLETYPE_CANDIDATE, roleMap.get("jack black").getRoleType()); - assertEquals("the pigeon", roleMap.get("jack black").getDescription()); - - assertEquals(Task.ROLETYPE_CANDIDATE, roleMap.get("jim slim").getRoleType()); - assertEquals("lame duck", roleMap.get("jim slim").getDescription()); - - assertEquals(Task.ROLETYPE_REPLACED_ASSIGNEE, roleMap.get("jeff nef").getRoleType()); - assertEquals("is sick", roleMap.get("jeff nef").getDescription()); - - assertEquals(5, roles.size()); - - task.removeRole(roleMap.get("john doe")); - assertEquals(4, task.getAllRoles().size()); - manager.removeCandidate(roleMap.get("joe smoe")); - assertEquals(3, task.getAllRoles().size()); - manager.removeCandidate(roleMap.get("jack black")); - assertEquals(2, task.getAllRoles().size()); - manager.removeCandidate(roleMap.get("jim slim")); - assertEquals(1, task.getAllRoles().size()); - task.removeRole(roleMap.get("jeff nef")); - assertEquals(0, task.getAllRoles().size()); - } - - /* - public void testTaskComment() { - EnvironmentFactory environmentFactory = EnvironmentFactory.parseXmlString("<environment/>"); - TaskImpl task = TaskImpl.create(); - - Environment environment = environmentFactory.openEnvironment(); - try { - environment.setUserId("john doe"); - task.createComment("should I really do this ? yuk."); - } finally { - environment.close(); - } - - environment = environmentFactory.openEnvironment(); - try { - environment.setUserId("joe smoe"); - task.createComment("yes, you should really do it."); - } finally { - environment.close(); - } - - List<Comment> comments = task.getComments(); - assertNotNull(comments); - - assertEquals("should I really do this ? yuk.", comments.get(0).getMessage()); - assertEquals("john doe", comments.get(0).getUserId()); - - assertEquals("yes, you should really do it.", comments.get(1).getMessage()); - assertEquals("joe smoe", comments.get(1).getUserId()); - } - - public void testTaskCommentReplies() { - TaskImpl task = TaskImpl.create(); - Comment comment = task.createComment("hi, how are you?"); - Comment reply = comment.createReply("i'm fine, thanks"); - reply = reply.createReply("nice wheather, huh"); - reply.createReply("snow's great fun"); - - comment = task.createComment("are you going to the office?"); - reply = comment.createReply("no not now"); - reply = reply.createReply("when are you going"); - reply.createReply("later"); - - List<Comment> comments = task.getComments(); - assertEquals("hi, how are you?", comments.get(0).getMessage()); - assertEquals("i'm fine, thanks", comments.get(0).getReplies().get(0).getMessage()); - assertEquals("nice wheather, huh", comments.get(0).getReplies().get(0).getReplies().get(0).getMessage()); - assertEquals("snow's great fun", comments.get(0).getReplies().get(0).getReplies().get(0).getReplies().get(0).getMessage()); - - assertEquals("are you going to the office?", comments.get(1).getMessage()); - assertEquals("no not now", comments.get(1).getReplies().get(0).getMessage()); - assertEquals("when are you going", comments.get(1).getReplies().get(0).getReplies().get(0).getMessage()); - assertEquals("later", comments.get(1).getReplies().get(0).getReplies().get(0).getReplies().get(0).getMessage()); - - comment = task.getComments().get(0); - comment.removeReply(comment.getReplies().get(0)); - - assertEquals("hi, how are you?", comment.getMessage()); - assertTrue(comment.getReplies().isEmpty()); - assertEquals(2, task.getComments().size()); - - task.removeComment(task.getComments().get(1)); - - assertEquals(1, task.getComments().size()); - assertEquals("hi, how are you?", comment.getMessage()); - } - - public void testTaskWithDefinition() { - TaskDefinitionImpl taskDefinition = new TaskDefinitionImpl(); - taskDefinition.setName("hello"); - taskDefinition.setPriority(Priority.HIGH); - - TaskImpl task = TaskImpl.create(taskDefinition); - assertEquals("hello", task.getName()); - assertEquals(Priority.HIGH, task.getPriority()); - assertEquals("hello", task.getTaskDefinition().getName()); - } - - public void testSubTasks() { - TaskImpl improveWorld = TaskImpl.create(); - improveWorld.setName("improve the world"); - - improveWorld.createSubTask("try to automate everything"); - improveWorld.createSubTask("discover the problem is in the workflow part"); - Task writeWorkflowEngine = improveWorld.createSubTask("write an open source workflow engine"); - writeWorkflowEngine.createSubTask("create a sf.net project"); - Task commitCode = writeWorkflowEngine.createSubTask("commit code to cvs"); - writeWorkflowEngine.createSubTask("nurture it and grow it"); - writeWorkflowEngine.createSubTask("harvest a beautiful project"); - - improveWorld.createSubTask("automate everything with workflow"); - improveWorld.createSubTask("create peace everywhere"); - - Set<String> expectedSubtaskNames = new HashSet<String>(); - expectedSubtaskNames.add("try to automate everything"); - expectedSubtaskNames.add("discover the problem is in the workflow part"); - expectedSubtaskNames.add("write an open source workflow engine"); - expectedSubtaskNames.add("automate everything with workflow"); - expectedSubtaskNames.add("create peace everywhere"); - - Set<Task> subtasks = improveWorld.getSubTasks(); - Set<String> subtaskNames = new HashSet<String>(); - for (Task subtask: subtasks) { - subtaskNames.add(subtask.getName()); - } - - assertEquals(expectedSubtaskNames, subtaskNames); - - expectedSubtaskNames = new HashSet<String>(); - expectedSubtaskNames.add("create a sf.net project"); - expectedSubtaskNames.add("commit code to cvs"); - expectedSubtaskNames.add("nurture it and grow it"); - expectedSubtaskNames.add("harvest a beautiful project"); - - subtasks = writeWorkflowEngine.getSubTasks(); - subtaskNames = new HashSet<String>(); - for (Task subtask: subtasks) { - subtaskNames.add(subtask.getName()); - } - - assertEquals(expectedSubtaskNames, subtaskNames); - - writeWorkflowEngine.removeSubTask(commitCode); - - expectedSubtaskNames.remove("commit code to cvs"); - - subtasks = writeWorkflowEngine.getSubTasks(); - subtaskNames = new HashSet<String>(); - for (Task subtask: subtasks) { - subtaskNames.add(subtask.getName()); - } - - assertEquals(expectedSubtaskNames, subtaskNames); - } - */ -} Copied: jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/internal/model/TaskTest.java (from rev 3186, jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskTest.java) =================================================================== --- jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/internal/model/TaskTest.java (rev 0) +++ jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/internal/model/TaskTest.java 2008-12-05 01:28:25 UTC (rev 3210) @@ -0,0 +1,313 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.task.internal.model; + +import java.util.Date; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +import org.jbpm.pvm.internal.util.Clock; +import org.jbpm.pvm.internal.util.Priority; +import org.jbpm.task.Task; +import org.jbpm.task.internal.model.RoleImpl; +import org.jbpm.task.internal.model.SwimlaneImpl; +import org.jbpm.task.internal.model.TaskImpl; +import org.jbpm.test.JbpmTestCase; + +/** + * @author Tom Baeyens + */ +public class TaskTest extends JbpmTestCase { + + public void testTask() { + Date now = new Date(); + Date inFiveMinutes = new Date(now.getTime()+ (5*60*1000)); + + TaskImpl task; + try { + Clock.setCurrentTime(now); + task = TaskImpl.create(getName()); + } finally { + Clock.setCurrentTime(null); + } + task.setName("hello"); + task.setDescription("say hello to your neighbour developer"); + task.setDueDate(inFiveMinutes); + task.setPriority(Priority.HIGHEST); + + assertEquals("hello", task.getName()); + assertEquals("say hello to your neighbour developer", task.getDescription()); + assertEquals(now, task.getCreate()); + assertEquals(inFiveMinutes, task.getDueDate()); + assertEquals(Priority.HIGHEST, task.getPriority()); + } + + public void testTaskAssignment() { + TaskImpl task = TaskImpl.create(getName()); + task.setAssignee("john doe"); + assertEquals("john doe", task.getAssignee()); + } + + public void testTaskReassignmentAssignment() { + TaskImpl task = TaskImpl.create(getName()); + task.setAssignee("johndoe"); + assertEquals("johndoe", task.getAssignee()); + task.setAssignee("joesmoe"); + assertEquals("joesmoe", task.getAssignee()); + } + + public void testTaskRoles() { + TaskImpl task = TaskImpl.create(getName()); + + assertNotNull(task.getRoles()); + assertEquals(0, task.getRoles().size()); + + task.addRole("john doe", Task.ROLETYPE_CLIENT).setDescription("uses the result"); + task.addRole("joe smoe", Task.ROLETYPE_OWNER).setDescription("does what he wants"); + task.addRole("jack black", Task.ROLETYPE_CANDIDATE).setDescription("can take this task"); + task.addRole("jim slim", Task.ROLETYPE_VIEWER).setDescription("is allowed to see"); + task.addRole("jeff nef", Task.ROLETYPE_REPLACED_ASSIGNEE).setDescription("is sick"); + + Set<RoleImpl> roles = task.getRoles(); + Map<String, RoleImpl> roleMap = new HashMap<String, RoleImpl>(); + for (RoleImpl role: roles) { + roleMap.put(role.getIdentityId(), role); + } + + assertEquals(Task.ROLETYPE_CLIENT, roleMap.get("john doe").getRoleType()); + assertEquals("uses the result", roleMap.get("john doe").getDescription()); + + assertEquals(Task.ROLETYPE_OWNER, roleMap.get("joe smoe").getRoleType()); + assertEquals("does what he wants", roleMap.get("joe smoe").getDescription()); + + assertEquals(Task.ROLETYPE_CANDIDATE, roleMap.get("jack black").getRoleType()); + assertEquals("can take this task", roleMap.get("jack black").getDescription()); + + assertEquals(Task.ROLETYPE_VIEWER, roleMap.get("jim slim").getRoleType()); + assertEquals("is allowed to see", roleMap.get("jim slim").getDescription()); + + assertEquals(Task.ROLETYPE_REPLACED_ASSIGNEE, roleMap.get("jeff nef").getRoleType()); + assertEquals("is sick", roleMap.get("jeff nef").getDescription()); + + assertEquals(5, roles.size()); + + task.removeRole(roleMap.get("john doe")); + assertEquals(4, task.getRoles().size()); + task.removeRole(roleMap.get("joe smoe")); + assertEquals(3, task.getRoles().size()); + task.removeRole(roleMap.get("jack black")); + assertEquals(2, task.getRoles().size()); + task.removeRole(roleMap.get("jim slim")); + assertEquals(1, task.getRoles().size()); + task.removeRole(roleMap.get("jeff nef")); + assertEquals(0, roles.size()); + } + + public void testTaskAllRoles() { + TaskImpl task = TaskImpl.create(getName()); + + assertNotNull(task.getAllRoles()); + assertEquals(0, task.getAllRoles().size()); + + task.addRole("john doe", Task.ROLETYPE_CLIENT).setDescription("uses the result"); + + SwimlaneImpl manager = new SwimlaneImpl(); + task.setSwimlane(manager); + + manager.createCandidate("joe smoe").setDescription("tostesteron ambition"); + manager.createCandidate("jack black").setDescription("the pigeon"); + manager.createCandidate("jim slim").setDescription("lame duck"); + + task.addRole("jeff nef", Task.ROLETYPE_REPLACED_ASSIGNEE).setDescription("is sick"); + + Set<RoleImpl> roles = task.getAllRoles(); + Map<String, RoleImpl> roleMap = new HashMap<String, RoleImpl>(); + for (RoleImpl role: roles) { + roleMap.put(role.getIdentityId(), role); + } + + assertEquals(Task.ROLETYPE_CLIENT, roleMap.get("john doe").getRoleType()); + assertEquals("uses the result", roleMap.get("john doe").getDescription()); + + assertEquals(Task.ROLETYPE_CANDIDATE, roleMap.get("joe smoe").getRoleType()); + assertEquals("tostesteron ambition", roleMap.get("joe smoe").getDescription()); + + assertEquals(Task.ROLETYPE_CANDIDATE, roleMap.get("jack black").getRoleType()); + assertEquals("the pigeon", roleMap.get("jack black").getDescription()); + + assertEquals(Task.ROLETYPE_CANDIDATE, roleMap.get("jim slim").getRoleType()); + assertEquals("lame duck", roleMap.get("jim slim").getDescription()); + + assertEquals(Task.ROLETYPE_REPLACED_ASSIGNEE, roleMap.get("jeff nef").getRoleType()); + assertEquals("is sick", roleMap.get("jeff nef").getDescription()); + + assertEquals(5, roles.size()); + + task.removeRole(roleMap.get("john doe")); + assertEquals(4, task.getAllRoles().size()); + manager.removeCandidate(roleMap.get("joe smoe")); + assertEquals(3, task.getAllRoles().size()); + manager.removeCandidate(roleMap.get("jack black")); + assertEquals(2, task.getAllRoles().size()); + manager.removeCandidate(roleMap.get("jim slim")); + assertEquals(1, task.getAllRoles().size()); + task.removeRole(roleMap.get("jeff nef")); + assertEquals(0, task.getAllRoles().size()); + } + + /* + public void testTaskComment() { + EnvironmentFactory environmentFactory = EnvironmentFactory.parseXmlString("<environment/>"); + TaskImpl task = TaskImpl.create(); + + Environment environment = environmentFactory.openEnvironment(); + try { + environment.setUserId("john doe"); + task.createComment("should I really do this ? yuk."); + } finally { + environment.close(); + } + + environment = environmentFactory.openEnvironment(); + try { + environment.setUserId("joe smoe"); + task.createComment("yes, you should really do it."); + } finally { + environment.close(); + } + + List<Comment> comments = task.getComments(); + assertNotNull(comments); + + assertEquals("should I really do this ? yuk.", comments.get(0).getMessage()); + assertEquals("john doe", comments.get(0).getUserId()); + + assertEquals("yes, you should really do it.", comments.get(1).getMessage()); + assertEquals("joe smoe", comments.get(1).getUserId()); + } + + public void testTaskCommentReplies() { + TaskImpl task = TaskImpl.create(); + Comment comment = task.createComment("hi, how are you?"); + Comment reply = comment.createReply("i'm fine, thanks"); + reply = reply.createReply("nice wheather, huh"); + reply.createReply("snow's great fun"); + + comment = task.createComment("are you going to the office?"); + reply = comment.createReply("no not now"); + reply = reply.createReply("when are you going"); + reply.createReply("later"); + + List<Comment> comments = task.getComments(); + assertEquals("hi, how are you?", comments.get(0).getMessage()); + assertEquals("i'm fine, thanks", comments.get(0).getReplies().get(0).getMessage()); + assertEquals("nice wheather, huh", comments.get(0).getReplies().get(0).getReplies().get(0).getMessage()); + assertEquals("snow's great fun", comments.get(0).getReplies().get(0).getReplies().get(0).getReplies().get(0).getMessage()); + + assertEquals("are you going to the office?", comments.get(1).getMessage()); + assertEquals("no not now", comments.get(1).getReplies().get(0).getMessage()); + assertEquals("when are you going", comments.get(1).getReplies().get(0).getReplies().get(0).getMessage()); + assertEquals("later", comments.get(1).getReplies().get(0).getReplies().get(0).getReplies().get(0).getMessage()); + + comment = task.getComments().get(0); + comment.removeReply(comment.getReplies().get(0)); + + assertEquals("hi, how are you?", comment.getMessage()); + assertTrue(comment.getReplies().isEmpty()); + assertEquals(2, task.getComments().size()); + + task.removeComment(task.getComments().get(1)); + + assertEquals(1, task.getComments().size()); + assertEquals("hi, how are you?", comment.getMessage()); + } + + public void testTaskWithDefinition() { + TaskDefinitionImpl taskDefinition = new TaskDefinitionImpl(); + taskDefinition.setName("hello"); + taskDefinition.setPriority(Priority.HIGH); + + TaskImpl task = TaskImpl.create(taskDefinition); + assertEquals("hello", task.getName()); + assertEquals(Priority.HIGH, task.getPriority()); + assertEquals("hello", task.getTaskDefinition().getName()); + } + + public void testSubTasks() { + TaskImpl improveWorld = TaskImpl.create(); + improveWorld.setName("improve the world"); + + improveWorld.createSubTask("try to automate everything"); + improveWorld.createSubTask("discover the problem is in the workflow part"); + Task writeWorkflowEngine = improveWorld.createSubTask("write an open source workflow engine"); + writeWorkflowEngine.createSubTask("create a sf.net project"); + Task commitCode = writeWorkflowEngine.createSubTask("commit code to cvs"); + writeWorkflowEngine.createSubTask("nurture it and grow it"); + writeWorkflowEngine.createSubTask("harvest a beautiful project"); + + improveWorld.createSubTask("automate everything with workflow"); + improveWorld.createSubTask("create peace everywhere"); + + Set<String> expectedSubtaskNames = new HashSet<String>(); + expectedSubtaskNames.add("try to automate everything"); + expectedSubtaskNames.add("discover the problem is in the workflow part"); + expectedSubtaskNames.add("write an open source workflow engine"); + expectedSubtaskNames.add("automate everything with workflow"); + expectedSubtaskNames.add("create peace everywhere"); + + Set<Task> subtasks = improveWorld.getSubTasks(); + Set<String> subtaskNames = new HashSet<String>(); + for (Task subtask: subtasks) { + subtaskNames.add(subtask.getName()); + } + + assertEquals(expectedSubtaskNames, subtaskNames); + + expectedSubtaskNames = new HashSet<String>(); + expectedSubtaskNames.add("create a sf.net project"); + expectedSubtaskNames.add("commit code to cvs"); + expectedSubtaskNames.add("nurture it and grow it"); + expectedSubtaskNames.add("harvest a beautiful project"); + + subtasks = writeWorkflowEngine.getSubTasks(); + subtaskNames = new HashSet<String>(); + for (Task subtask: subtasks) { + subtaskNames.add(subtask.getName()); + } + + assertEquals(expectedSubtaskNames, subtaskNames); + + writeWorkflowEngine.removeSubTask(commitCode); + + expectedSubtaskNames.remove("commit code to cvs"); + + subtasks = writeWorkflowEngine.getSubTasks(); + subtaskNames = new HashSet<String>(); + for (Task subtask: subtasks) { + subtaskNames.add(subtask.getName()); + } + + assertEquals(expectedSubtaskNames, subtaskNames); + } + */ +} Property changes on: jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/internal/model/TaskTest.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Modified: jbpm4/trunk/modules/task/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/task/src/test/resources/jbpm.cfg.xml 2008-12-04 23:15:16 UTC (rev 3209) +++ jbpm4/trunk/modules/task/src/test/resources/jbpm.cfg.xml 2008-12-05 01:28:25 UTC (rev 3210) @@ -3,7 +3,7 @@ <jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> <process-engine> - + <deployer-manager> <assign-file-type> <file extension=".jpdl.xml" type="jpdl" /> @@ -12,17 +12,18 @@ <check-problems /> <save /> </deployer-manager> - + <process-service /> <execution-service /> <management-service /> - + <task-service /> + <command-service> <retry-interceptor /> <environment-interceptor /> <standard-transaction-interceptor /> </command-service> - + <hibernate-configuration> <properties resource="hibernate.properties" /> <mapping resource="jbpm.pvm.typedefs.hbm.xml" /> @@ -32,12 +33,12 @@ <mapping resource="jbpm.pvm.variable.hbm.xml" /> <mapping resource="jbpm.pvm.job.hbm.xml" /> <mapping resource="jbpm.task.hbm.xml" /> - <cache-configuration resource="jbpm.pvm.cache.xml" - usage="nonstrict-read-write" /> + <cache-configuration resource="jbpm.pvm.cache.xml" + usage="nonstrict-read-write" /> </hibernate-configuration> - + <hibernate-session-factory /> - + <job-executor auto-start="false" /> <job-test-helper /> @@ -45,14 +46,14 @@ <variable-types resource="jbpm.pvm.types.xml" /> <business-calendar> - <monday hours="9:00-12:00 and 12:30-17:00"/> - <tuesday hours="9:00-12:00 and 12:30-17:00"/> - <wednesday hours="9:00-12:00 and 12:30-17:00"/> - <thursday hours="9:00-12:00 and 12:30-17:00"/> - <friday hours="9:00-12:00 and 12:30-17:00"/> - <holiday period="01/07/2008 - 31/08/2008"/> + <monday hours="9:00-12:00 and 12:30-17:00" /> + <tuesday hours="9:00-12:00 and 12:30-17:00" /> + <wednesday hours="9:00-12:00 and 12:30-17:00" /> + <thursday hours="9:00-12:00 and 12:30-17:00" /> + <friday hours="9:00-12:00 and 12:30-17:00" /> + <holiday period="01/07/2008 - 31/08/2008" /> </business-calendar> - + </process-engine> <environment> @@ -62,6 +63,7 @@ <job-db-session /> <message-session /> <timer-session /> + <task-db-session /> </environment> </jbpm-configuration> Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/DbTestCase.java =================================================================== --- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/DbTestCase.java 2008-12-04 23:15:16 UTC (rev 3209) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/DbTestCase.java 2008-12-05 01:28:25 UTC (rev 3210) @@ -31,8 +31,8 @@ import org.jbpm.ProcessEngine; import org.jbpm.ProcessService; import org.jbpm.TaskService; +import org.jbpm.task.Task; - /** * @author Tom Baeyens */ @@ -46,8 +46,9 @@ protected TaskService taskService; protected List<ProcessDefinition> processDefinitions; + protected List<Task> tasks; - public void setUp() throws Exception { + protected void setUp() throws Exception { super.setUp(); initializeProcessEngine(); @@ -55,6 +56,7 @@ processService = processEngine.getProcessService(); executionService = processEngine.getExecutionService(); managementService = processEngine.getManagementService(); + taskService = processEngine.getTaskService(); } protected synchronized void initializeProcessEngine() { @@ -72,7 +74,7 @@ } } - public void tearDown() throws Exception { + protected void tearDown() throws Exception { if (processDefinitions!=null) { for (ProcessDefinition processDefinition : processDefinitions) { processService.deleteProcessDefinitionAndInstances(processDefinition.getId()); @@ -103,4 +105,15 @@ return null; } + + public Task createTask(String taskId) { + Task task = taskService.newTask(taskId); + + if (tasks == null) { + tasks = new ArrayList<Task>(); + } + tasks.add(task); + + return task; + } } Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java =================================================================== --- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2008-12-04 23:15:16 UTC (rev 3209) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2008-12-05 01:28:25 UTC (rev 3210) @@ -39,13 +39,13 @@ static protected Log log = Log.getLog(JbpmTestCase.class.getName()); - public void setUp() throws Exception { + protected void setUp() throws Exception { assertNull(Environment.getCurrent()); LogFormatter.resetIndentation(); log.info("=== starting "+getName()+" ============================="); } - public void tearDown() throws Exception { + protected void tearDown() throws Exception { log.info("=== ending "+getName()+" =============================\n"); assertNull(Environment.getCurrent()); } @@ -54,7 +54,7 @@ if ( (value==null) || (value.indexOf(expected)==-1) ) { - throw new AssertionFailedError("expected presence of '"+expected+"' but was '"+value+"'"); + fail("expected presence of '"+expected+"' but was '"+value+"'"); } }

15 years, 6 months

1
0
0 / 0

JBoss JBPM SVN: r3209 - in projects/gwt-console/trunk: server and 1 other directories.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-12-04 18:15:16 -0500 (Thu, 04 Dec 2008) New Revision: 3209 Added: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ReportFacade.java Modified: projects/gwt-console/trunk/gwt-parent.iml projects/gwt-console/trunk/server/gwt-server.iml projects/gwt-console/trunk/server/pom.xml projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ConsoleServerApplication.java projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java Log: Birt service facade, first cut Modified: projects/gwt-console/trunk/gwt-parent.iml =================================================================== --- projects/gwt-console/trunk/gwt-parent.iml 2008-12-04 23:14:38 UTC (rev 3208) +++ projects/gwt-console/trunk/gwt-parent.iml 2008-12-04 23:15:16 UTC (rev 3209) @@ -16,6 +16,7 @@ <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="jbpm3-identity" exported="" /> <orderEntry type="module" module-name="jbpm3-enterprise" exported="" /> + <orderEntry type="module" module-name="Balalaika" exported="" /> <orderEntry type="module" module-name="jbpm3-core" exported="" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.slf4j:slf4j-simple:jar:1.5.2:compile"> @@ -126,15 +127,6 @@ </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.sun.xml.stream:sjsxp:jar:1.0.1:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/sun/xml/stream/sjsxp/1.0.1/sjsxp-1.0.1.jar!/" /> @@ -423,26 +415,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jbpm.jbpm3:jbpm-core:jar:3.3.0-SNAPSHOT:provided"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jbpm/jbpm3/jbpm-core/3.3.0-SNAPSHOT/jbpm-core-3.3.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jbpm/jbpm3/jbpm-core/3.3.0-SNAPSHOT/jbpm-core-3.3.0-SNAPSHOT-sources.jar!/" /> - </SOURCES> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: commons-codec:commons-codec:jar:1.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-codec/commons-codec/1.2/commons-codec-1.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <library name="M2 Dep: pdfbox:pdfbox:jar:0.6.4:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/pdfbox/pdfbox/0.6.4/pdfbox-0.6.4.jar!/" /> @@ -577,6 +549,276 @@ <SOURCES /> </library> </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: mysql:mysql-connector-java:jar:5.1.6:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/mysql/mysql-connector-java/5.1.6/mysql-connector-java-5.1.6.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: sun-jaxb:jaxb-api:jar:2.1.4:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/sun-jaxb/jaxb-api/2.1.4/jaxb-api-2.1.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.eclipse.birt:coreapi:jar:2.2.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/coreapi/2.2.2/coreapi-2.2.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.eclipse.birt:dataadapterapi:jar:2.2.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/dataadapterapi/2.2.2/dataadapterapi-2.2.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.eclipse.birt:chartengineapi:jar:2.2.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/chartengineapi/2.2.2/chartengineapi-2.2.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss:jboss-reflect:jar:2.0.0.CR1:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/jboss-reflect/2.0.0.CR1/jboss-reflect-2.0.0.CR1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.eclipse.birt:dteapi:jar:2.2.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/dteapi/2.2.2/dteapi-2.2.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: apache-xerces:xml-apis:jar:2.9.1:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/apache-xerces/xml-apis/2.9.1/xml-apis-2.9.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss:jboss-mdr:jar:2.0.0.CR1:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/jboss-mdr/2.0.0.CR1/jboss-mdr-2.0.0.CR1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.eclipse.birt:scriptapi:jar:2.2.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/scriptapi/2.2.2/scriptapi-2.2.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss:jbossxb:jar:2.0.0.CR13:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/jbossxb/2.0.0.CR13/jbossxb-2.0.0.CR13.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.microcontainer:jboss-dependency:jar:2.0.0.CR1:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/microcontainer/jboss-dependency/2.0.0.CR1/jboss-dependency-2.0.0.CR1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.bpm:bpm-spec-api:jar:1.0.0-SNAPSHOT:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/bpm/bpm-spec-api/1.0.0-SNAPSHOT/bpm-spec-api-1.0.0-SNAPSHOT.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: wutka-dtdparser:dtdparser121:jar:1.2.1:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.eclipse.birt:engineapi:jar:2.2.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/engineapi/2.2.2/engineapi-2.2.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.microcontainer:jboss-kernel:jar:2.0.0.CR1:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/microcontainer/jboss-kernel/2.0.0.CR1/jboss-kernel-2.0.0.CR1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: apache-xerces:xercesImpl:jar:2.9.1:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/apache-xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.slf4j:slf4j-api:jar:1.5.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/slf4j/slf4j-api/1.5.3/slf4j-api-1.5.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.eclipse.birt:modelapi:jar:2.2.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/modelapi/2.2.2/modelapi-2.2.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.ibm.icu:icu4j:jar:3.6.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/ibm/icu/icu4j/3.6.1/icu4j-3.6.1.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 /> + </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-xmi:jar:2.2.2.v200702131851:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/emf/ecore-xmi/2.2.2.v200702131851/ecore-xmi-2.2.2.v200702131851.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.w3c:flute:jar:1.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/w3c/flute/1.2/flute-1.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: commons-discovery:commons-discovery:jar:0.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-discovery/commons-discovery/0.2/commons-discovery-0.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.eclipse.emf:common:jar:2.2.1.v200702131851:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/emf/common/2.2.1.v200702131851/common-2.2.1.v200702131851.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: commons-cli:commons-cli:jar:1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-cli/commons-cli/1.0/commons-cli-1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.w3c:sac:jar:1.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/w3c/sac/1.3/sac-1.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.eclipse.emf:ecore:jar:2.2.2.v200702131851:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/emf/ecore/2.2.2.v200702131851/ecore-2.2.2.v200702131851.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.lowagie:itext:jar:1.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/lowagie/itext/1.3/itext-1.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: projects/gwt-console/trunk/server/gwt-server.iml =================================================================== --- projects/gwt-console/trunk/server/gwt-server.iml 2008-12-04 23:14:38 UTC (rev 3208) +++ projects/gwt-console/trunk/server/gwt-server.iml 2008-12-04 23:15:16 UTC (rev 3209) @@ -9,10 +9,12 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="gwt-rpc" /> <orderEntry type="module" module-name="jbpm3-identity" /> <orderEntry type="module" module-name="jbpm3-enterprise" /> + <orderEntry type="module" module-name="gwt-parent" /> + <orderEntry type="module" module-name="Balalaika" /> <orderEntry type="module" module-name="jbpm3-core" /> - <orderEntry type="module" module-name="gwt-parent" /> <orderEntry type="module-library"> <library name="M2 Dep: org.slf4j:slf4j-simple:jar:1.5.2:compile"> <CLASSES> @@ -113,15 +115,6 @@ </library> </orderEntry> <orderEntry type="module-library"> - <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"> <library name="M2 Dep: com.sun.xml.stream:sjsxp:jar:1.0.1:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/sun/xml/stream/sjsxp/1.0.1/sjsxp-1.0.1.jar!/" /> @@ -401,26 +394,6 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.jbpm.jbpm3:jbpm-core:jar:3.3.0-SNAPSHOT:provided"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm3/jbpm-core/3.3.0-SNAPSHOT/jbpm-core-3.3.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm3/jbpm-core/3.3.0-SNAPSHOT/jbpm-core-3.3.0-SNAPSHOT-sources.jar!/" /> - </SOURCES> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: commons-codec:commons-codec:jar:1.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-codec/commons-codec/1.2/commons-codec-1.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> <library name="M2 Dep: pdfbox:pdfbox:jar:0.6.4:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/pdfbox/pdfbox/0.6.4/pdfbox-0.6.4.jar!/" /> @@ -537,7 +510,276 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module" module-name="gwt-rpc" /> + <orderEntry type="module-library"> + <library name="M2 Dep: mysql:mysql-connector-java:jar:5.1.6:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/mysql/mysql-connector-java/5.1.6/mysql-connector-java-5.1.6.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: sun-jaxb:jaxb-api:jar:2.1.4:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/sun-jaxb/jaxb-api/2.1.4/jaxb-api-2.1.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.eclipse.birt:coreapi:jar:2.2.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/birt/coreapi/2.2.2/coreapi-2.2.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.eclipse.birt:dataadapterapi:jar:2.2.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/birt/dataadapterapi/2.2.2/dataadapterapi-2.2.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.eclipse.birt:chartengineapi:jar:2.2.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/birt/chartengineapi/2.2.2/chartengineapi-2.2.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss:jboss-reflect:jar:2.0.0.CR1:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jboss-reflect/2.0.0.CR1/jboss-reflect-2.0.0.CR1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.eclipse.birt:dteapi:jar:2.2.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/birt/dteapi/2.2.2/dteapi-2.2.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: apache-xerces:xml-apis:jar:2.9.1:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/apache-xerces/xml-apis/2.9.1/xml-apis-2.9.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss:jboss-mdr:jar:2.0.0.CR1:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jboss-mdr/2.0.0.CR1/jboss-mdr-2.0.0.CR1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.eclipse.birt:scriptapi:jar:2.2.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/birt/scriptapi/2.2.2/scriptapi-2.2.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss:jbossxb:jar:2.0.0.CR13:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jbossxb/2.0.0.CR13/jbossxb-2.0.0.CR13.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss.microcontainer:jboss-dependency:jar:2.0.0.CR1:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/microcontainer/jboss-dependency/2.0.0.CR1/jboss-dependency-2.0.0.CR1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss.bpm:bpm-spec-api:jar:1.0.0-SNAPSHOT:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/bpm/bpm-spec-api/1.0.0-SNAPSHOT/bpm-spec-api-1.0.0-SNAPSHOT.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: wutka-dtdparser:dtdparser121:jar:1.2.1:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.eclipse.birt:engineapi:jar:2.2.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/birt/engineapi/2.2.2/engineapi-2.2.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss.microcontainer:jboss-kernel:jar:2.0.0.CR1:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/microcontainer/jboss-kernel/2.0.0.CR1/jboss-kernel-2.0.0.CR1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: apache-xerces:xercesImpl:jar:2.9.1:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/apache-xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.slf4j:slf4j-api:jar:1.5.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/slf4j/slf4j-api/1.5.3/slf4j-api-1.5.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.eclipse.birt:modelapi:jar:2.2.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/birt/modelapi/2.2.2/modelapi-2.2.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.ibm.icu:icu4j:jar:3.6.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/ibm/icu/icu4j/3.6.1/icu4j-3.6.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-codec:commons-codec:jar:1.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <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"> + <library name="M2 Dep: org.eclipse.emf:ecore-xmi:jar:2.2.2.v200702131851:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/emf/ecore-xmi/2.2.2.v200702131851/ecore-xmi-2.2.2.v200702131851.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <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"> + <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"> + <library name="M2 Dep: org.eclipse.emf:common:jar:2.2.1.v200702131851:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/emf/common/2.2.1.v200702131851/common-2.2.1.v200702131851.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <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"> + <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"> + <library name="M2 Dep: org.eclipse.emf:ecore:jar:2.2.2.v200702131851:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/emf/ecore/2.2.2.v200702131851/ecore-2.2.2.v200702131851.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <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/server/pom.xml =================================================================== --- projects/gwt-console/trunk/server/pom.xml 2008-12-04 23:14:38 UTC (rev 3208) +++ projects/gwt-console/trunk/server/pom.xml 2008-12-04 23:15:16 UTC (rev 3209) @@ -19,7 +19,8 @@  <properties> - <jboss.bpm.spec.version>1.0.0-SNAPSHOT</jboss.bpm.spec.version> + <jboss.bpm.spec.version>1.0.0-SNAPSHOT</jboss.bpm.spec.version> + <balalaika.version>1.0.0-SNAPSHOT</balalaika.version> </properties> <dependencies> @@ -52,6 +53,11 @@ <version>${jboss.bpm.spec.version}</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.jbpm</groupId> + <artifactId>balalaika-core</artifactId> + <version>${balalaika.version}</version> + </dependency>  <dependency> Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ConsoleServerApplication.java =================================================================== --- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ConsoleServerApplication.java 2008-12-04 23:14:38 UTC (rev 3208) +++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ConsoleServerApplication.java 2008-12-04 23:15:16 UTC (rev 3209) @@ -41,6 +41,7 @@ singletons.add(new UserMgmtFacade()); singletons.add(new JBPM3MgmtFacade()); singletons.add(new TestFacade()); + singletons.add(new ReportFacade()); } @Override 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 2008-12-04 23:14:38 UTC (rev 3208) +++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java 2008-12-04 23:15:16 UTC (rev 3209) @@ -50,8 +50,7 @@ { private static final Log log = LogFactory.getLog(ProcessMgmtFacade.class); private ProcessManagement processManagement; - private ExtensionManagement managementExtension; - + private ProcessManagement getProcessManagement() { if(null==this.processManagement) @@ -64,19 +63,6 @@ return this.processManagement; } - private ExtensionManagement getManagementExtension() - { - if(null==this.managementExtension) - { - ManagementFactory factory = ManagementFactory.newInstance(); - this.managementExtension = factory.createExtensionManagement(); - } - - return this.managementExtension; - - } - - @GET @Path("definitions") @Produces("application/json") Added: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ReportFacade.java =================================================================== --- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ReportFacade.java (rev 0) +++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ReportFacade.java 2008-12-04 23:15:16 UTC (rev 3209) @@ -0,0 +1,99 @@ +/* + * 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; + +import org.jboss.balalaika.BirtService; +import org.jboss.balalaika.RenderMetaData; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import javax.ws.rs.*; +import javax.ws.rs.core.Response; +import java.io.*; + +/** + * BIRT integration facade. + * + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +@Path("report") +public class ReportFacade +{ + private static final Log log = LogFactory.getLog(ReportFacade.class); + private BirtService birtService; + + public ReportFacade() + { + // TODO: configuration + this.birtService = new BirtService(); + this.birtService.create(); + } + + @GET + @Path("view/{fileName}") + @Produces("text/html") + public Response viewReportHtml( + @PathParam("fileName") + String fileName + ) + { + RenderMetaData renderMeta = new RenderMetaData(); + renderMeta.setReportName(fileName); + renderMeta.setFormat(RenderMetaData.Format.HTML); + renderMeta.setClassloader(Thread.currentThread().getContextClassLoader()); + + String outputFileName = birtService.render(renderMeta); + String absoluteFile = birtService.getIConfig().getOutputDir() + outputFileName; + log.info("Render " + absoluteFile); + + File f = new File(absoluteFile); + return Response.ok(bytesFromFile(f)).type("text/html").build(); + } + + public static byte[] bytesFromFile(File file) + { + try + { + InputStream is = new FileInputStream(file); + long length = file.length(); + + byte[] bytes = new byte[(int)length]; + int offset = 0; + int numRead = 0; + while (offset < bytes.length && (numRead=is.read(bytes, + offset, bytes.length-offset)) >= 0) { + offset += numRead; + } + if (offset < bytes.length) { + throw new IOException("Could not completely read file " + + file.getName()); + } + is.close(); + return bytes; + } + catch (IOException e) + { + throw new RuntimeException("Failed to read file " + file); + } + } + +}

15 years, 6 months

1
0
0 / 0

JBoss JBPM SVN: r3208 - in projects/balalaika/trunk: core and 1 other directories.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-12-04 18:14:38 -0500 (Thu, 04 Dec 2008) New Revision: 3208 Modified: projects/balalaika/trunk/Balalaika.iws projects/balalaika/trunk/core/pom.xml projects/balalaika/trunk/core/src/main/java/org/jboss/balalaika/BirtService.java Log: Add missing dependencies Modified: projects/balalaika/trunk/Balalaika.iws =================================================================== --- projects/balalaika/trunk/Balalaika.iws 2008-12-04 22:00:34 UTC (rev 3207) +++ projects/balalaika/trunk/Balalaika.iws 2008-12-04 23:14:38 UTC (rev 3208) @@ -18,7 +18,6 @@ <component name="ChangeListManager"> <list default="true" name="Default" comment=""> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Balalaika.iws" afterPath="$PROJECT_DIR$/Balalaika.iws" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/core/pom.xml" afterPath="$PROJECT_DIR$/core/pom.xml" /> </list> </component> <component name="ChangeListSynchronizer" /> @@ -146,7 +145,7 @@ <file leaf-file-name="BirtService.java" pinned="false" current="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/core/src/main/java/org/jboss/balalaika/BirtService.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="43" column="42" selection-start="1489" selection-end="1489" vertical-scroll-proportion="0.54738563"> + <state line="31" column="13" selection-start="1255" selection-end="1255" vertical-scroll-proportion="0.2875817"> <folding> <element signature="imports" expanded="true" /> </folding> @@ -165,19 +164,10 @@ </provider> </entry> </file> - <file leaf-file-name="IReportEngineFactory.class" pinned="false" current="false" current-in-tab="false"> - <entry file="jar:///Users/hbraun/dev/env/birt-runtime-2_2_2/ReportEngine/lib/engineapi.jar!/org/eclipse/birt/report/engine/api/IReportEngineFactory.class"> - <provider selected="true" editor-type-id="text-editor"> - <state line="5" column="17" selection-start="176" selection-end="176" vertical-scroll-proportion="0.104575165"> - <folding /> - </state> - </provider> - </entry> - </file> <file leaf-file-name="pom.xml" pinned="false" current="true" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/core/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="36" column="21" selection-start="1125" selection-end="1125" vertical-scroll-proportion="0.4248366"> + <state line="5" column="29" selection-start="340" selection-end="354" vertical-scroll-proportion="0.13071896"> <folding /> </state> </provider> @@ -734,12 +724,10 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/core/src/main/java/org/jboss/balalaika/BirtService.java"> + <entry file="jar:///Users/hbraun/dev/env/birt-runtime-2_2_2/ReportEngine/lib/engineapi.jar!/org/eclipse/birt/report/engine/api/IReportEngineFactory.class"> <provider selected="true" editor-type-id="text-editor"> - <state line="43" column="42" selection-start="1489" selection-end="1489" vertical-scroll-proportion="0.54738563"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="5" column="17" selection-start="176" selection-end="176" vertical-scroll-proportion="0.104575165"> + <folding /> </state> </provider> </entry> @@ -752,16 +740,18 @@ </state> </provider> </entry> - <entry file="jar:///Users/hbraun/dev/env/birt-runtime-2_2_2/ReportEngine/lib/engineapi.jar!/org/eclipse/birt/report/engine/api/IReportEngineFactory.class"> + <entry file="file://$PROJECT_DIR$/core/src/main/java/org/jboss/balalaika/BirtService.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="5" column="17" selection-start="176" selection-end="176" vertical-scroll-proportion="0.104575165"> - <folding /> + <state line="31" column="13" selection-start="1255" selection-end="1255" vertical-scroll-proportion="0.2875817"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/core/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="36" column="21" selection-start="1125" selection-end="1125" vertical-scroll-proportion="0.4248366"> + <state line="5" column="29" selection-start="340" selection-end="354" vertical-scroll-proportion="0.13071896"> <folding /> </state> </provider> Modified: projects/balalaika/trunk/core/pom.xml =================================================================== --- projects/balalaika/trunk/core/pom.xml 2008-12-04 22:00:34 UTC (rev 3207) +++ projects/balalaika/trunk/core/pom.xml 2008-12-04 23:14:38 UTC (rev 3208) @@ -36,6 +36,12 @@ <groupId>org.eclipse.birt</groupId> <artifactId>engineapi</artifactId> <version>${birt.version}</version> + <exclusions> + <exclusion> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -74,7 +80,98 @@ <version>${birt.version}</version> </dependency> +  + + <dependency> + <groupId>org.eclipse.emf</groupId> + <artifactId>ecore</artifactId> + <version>2.2.2.v200702131851</version> + </dependency> + + <dependency> + <groupId>org.eclipse.emf</groupId> + <artifactId>ecore-xmi</artifactId> + <version>2.2.2.v200702131851</version> + </dependency> + + <dependency> + <groupId>org.eclipse.emf</groupId> + <artifactId>common</artifactId> + <version>2.2.1.v200702131851</version> + </dependency> + +  + + <dependency> + <groupId>org.w3c</groupId> + <artifactId>flute</artifactId> + <version>1.2</version> + </dependency> + + <dependency> + <groupId>org.w3c</groupId> + <artifactId>sac</artifactId> + <version>1.3</version> + </dependency> + +  + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.3</version> +  + <exclusions> + <exclusion> + <artifactId>junit</artifactId> + <groupId>junit</groupId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> + <version>1.0</version> +  + <exclusions> + <exclusion> + <artifactId>commons-lang</artifactId> + <groupId>commons-lang</groupId> + </exclusion> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>commons-discovery</groupId> + <artifactId>commons-discovery</artifactId> + <version>0.2</version> + </dependency> + +  + <dependency> + <groupId>com.lowagie</groupId> + <artifactId>itext</artifactId> + <version>1.3</version> + </dependency> + + <dependency> + <groupId>com.ibm.icu</groupId> + <artifactId>icu4j</artifactId> + <version>3.6.1</version> + </dependency> + + <dependency> + <groupId>rhino</groupId> + <artifactId>js</artifactId> + <version>1.6R2</version> + </dependency> + </dependencies> + </project> Modified: projects/balalaika/trunk/core/src/main/java/org/jboss/balalaika/BirtService.java =================================================================== --- projects/balalaika/trunk/core/src/main/java/org/jboss/balalaika/BirtService.java 2008-12-04 22:00:34 UTC (rev 3207) +++ projects/balalaika/trunk/core/src/main/java/org/jboss/balalaika/BirtService.java 2008-12-04 23:14:38 UTC (rev 3208) @@ -126,6 +126,11 @@ return outputFileName; } + public IntegrationConfig getIConfig() + { + return iConfig; + } + private static String extactReportName(String reportFile) { return reportFile.substring( 0, reportFile.indexOf("."));

15 years, 6 months

1
0
0 / 0

JBoss JBPM SVN: r3207 - in projects/balalaika/trunk: core and 1 other directory.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-12-04 17:00:34 -0500 (Thu, 04 Dec 2008) New Revision: 3207 Modified: projects/balalaika/trunk/Balalaika.iws projects/balalaika/trunk/core/pom.xml Log: Provide maven artifacts for BIRT API's Modified: projects/balalaika/trunk/Balalaika.iws =================================================================== --- projects/balalaika/trunk/Balalaika.iws 2008-12-04 21:17:58 UTC (rev 3206) +++ projects/balalaika/trunk/Balalaika.iws 2008-12-04 22:00:34 UTC (rev 3207) @@ -17,35 +17,8 @@ </component> <component name="ChangeListManager"> <list default="true" name="Default" comment=""> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/oda/src/main" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/oda/src/main/resources" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/core/src/main/resources" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/oda/src/main/java/org/eclipse/birt/report/data/oda" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/core/src/main/java/org" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/oda" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/oda/src/main/java/org/eclipse" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/oda/src/main/resources/plugin.xml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/core/src/main/java/org/jboss/balalaika" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/core/src/main/java/org/jboss/balalaika/ConfigAdapter.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/oda/src" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/core/src/main/java/org/jboss/balalaika/BirtEngineFactory.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/core/src/main/java/org/jboss/balalaika/BirtService.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/core/src/main/java/org/jboss/balalaika/RenderMetaData.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/core/src/main/java/org/jboss" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/oda/src/main/java/org/eclipse/birt/report/data" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/oda/src/main/java/org/eclipse/birt/report/data/oda/subjdbc/SubOdaJdbcDriver.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Balalaika.iws" afterPath="$PROJECT_DIR$/Balalaika.iws" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/oda/src/main/java/org/eclipse/birt/report" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/oda/src/main/java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/core/src/main/java/org/jboss/balalaika/IntegrationConfig.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/oda/pom.xml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/oda/src/main/java/org" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/oda/src/main/java/org/eclipse/birt/report/data/oda/subjdbc" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/core/src/main/resources/sample.rptdesign" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/core/core.iml" afterPath="" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/oda/src/main/java/org/eclipse/birt/report/data/oda/subjdbc/AppContextDBConnection.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/parent.iml" afterPath="$PROJECT_DIR$/parent.iml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/oda/src/main/java/org/eclipse/birt" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/core/pom.xml" afterPath="$PROJECT_DIR$/core/pom.xml" /> </list> </component> <component name="ChangeListSynchronizer" /> @@ -173,7 +146,7 @@ <file leaf-file-name="BirtService.java" pinned="false" current="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/core/src/main/java/org/jboss/balalaika/BirtService.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="27" column="7" selection-start="1168" selection-end="1168" vertical-scroll-proportion="0.18300654"> + <state line="43" column="42" selection-start="1489" selection-end="1489" vertical-scroll-proportion="0.54738563"> <folding> <element signature="imports" expanded="true" /> </folding> @@ -181,19 +154,10 @@ </provider> </entry> </file> - <file leaf-file-name="RenderMetaData.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/core/src/main/java/org/jboss/balalaika/RenderMetaData.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="33" column="0" selection-start="1275" selection-end="1275" vertical-scroll-proportion="0.33173844"> - <folding /> - </state> - </provider> - </entry> - </file> <file leaf-file-name="BirtEngineFactory.java" pinned="false" current="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/core/src/main/java/org/jboss/balalaika/BirtEngineFactory.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="50" column="71" selection-start="2043" selection-end="2043" vertical-scroll-proportion="0.7448166"> + <state line="42" column="22" selection-start="1688" selection-end="1688" vertical-scroll-proportion="0.54066986"> <folding> <element signature="imports" expanded="true" /> </folding> @@ -201,33 +165,24 @@ </provider> </entry> </file> - <file leaf-file-name="ConfigAdapter.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/core/src/main/java/org/jboss/balalaika/ConfigAdapter.java"> + <file leaf-file-name="IReportEngineFactory.class" pinned="false" current="false" current-in-tab="false"> + <entry file="jar:///Users/hbraun/dev/env/birt-runtime-2_2_2/ReportEngine/lib/engineapi.jar!/org/eclipse/birt/report/engine/api/IReportEngineFactory.class"> <provider selected="true" editor-type-id="text-editor"> - <state line="26" column="13" selection-start="1130" selection-end="1130" vertical-scroll-proportion="0.15686275"> + <state line="5" column="17" selection-start="176" selection-end="176" vertical-scroll-proportion="0.104575165"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false"> + <file leaf-file-name="pom.xml" pinned="false" current="true" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/core/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="20" column="25" selection-start="695" selection-end="695" vertical-scroll-proportion="0.52287585"> + <state line="36" column="21" selection-start="1125" selection-end="1125" vertical-scroll-proportion="0.4248366"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="pom.xml" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/pom.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state line="24" column="27" selection-start="796" selection-end="796" vertical-scroll-proportion="0.627451"> - <folding /> - </state> - </provider> - </entry> - </file> </leaf> </component> <component name="FindManager"> @@ -343,6 +298,84 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="Balalaika.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="parent" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/core" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="Balalaika.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="parent" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/core" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/core/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/core/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="Balalaika.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="parent" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/core" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/core/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/core/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/core/src/main/java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/core/src/main/java/org/jboss/balalaika" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> </subPane> </component> <component name="ProjectReloadState"> @@ -637,7 +670,7 @@ <component name="com.intellij.ide.util.scopeChooser.ScopeChooserConfigurable" proportions="" version="1"> <option name="myLastEditedConfigurable" /> </component> - <component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.11111111" version="1"> + <component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.19857594,0.5" version="1"> <option name="myPlainMode" value="false" /> <option name="myLastEditedConfigurable" value="parent" /> </component> @@ -673,92 +706,66 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/oda/src/main/resources/plugin.properties"> + <entry file="jar:///Users/hbraun/dev/env/birt-runtime-2_2_2/ReportEngine/plugins/org.eclipse.birt.report.data.oda.jdbc_2.2.2.r22x_v20071206/oda-jdbc.jar!/org/eclipse/birt/report/data/oda/jdbc/Connection.class"> <provider selected="true" editor-type-id="text-editor"> - <state line="19" column="40" selection-start="905" selection-end="905" vertical-scroll-proportion="0.3875598"> + <state line="11" column="10" selection-start="512" selection-end="512" vertical-scroll-proportion="0.026143791"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/oda/pom.xml"> + <entry file="file://$PROJECT_DIR$/core/src/main/java/org/jboss/balalaika/RenderMetaData.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="27" column="27" selection-start="854" selection-end="854" vertical-scroll-proportion="0.65849674"> + <state line="33" column="0" selection-start="1275" selection-end="1275" vertical-scroll-proportion="0.33173844"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/oda/src/main/resources/plugin.xml"> + <entry file="file://$PROJECT_DIR$/core/src/main/java/org/jboss/balalaika/ConfigAdapter.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="11" column="48" selection-start="0" selection-end="10959" vertical-scroll-proportion="0.28070176"> - <folding> - <element signature="tag#properties#0;tag#dataSource#0;tag#extension#0;tag#plugin#0" expanded="false" /> - <element signature="tag#dataSet#0;tag#extension#0;tag#plugin#0" expanded="false" /> - <element signature="tag#dataSet#1;tag#extension#0;tag#plugin#0" expanded="false" /> - <element signature="tag#extension#1;tag#plugin#0" expanded="false" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/oda/src/main/java/org/eclipse/birt/report/data/oda/subjdbc/SubOdaJdbcDriver.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="35" column="13" selection-start="1476" selection-end="1476" vertical-scroll-proportion="0.2551834"> + <state line="26" column="13" selection-start="1130" selection-end="1130" vertical-scroll-proportion="0.15686275"> <folding /> </state> </provider> </entry> - <entry file="jar:///Users/hbraun/dev/env/birt-runtime-2_2_2/ReportEngine/plugins/org.eclipse.birt.report.data.oda.jdbc_2.2.2.r22x_v20071206/oda-jdbc.jar!/org/eclipse/birt/report/data/oda/jdbc/Connection.class"> + <entry file="file://$PROJECT_DIR$/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="11" column="10" selection-start="512" selection-end="512" vertical-scroll-proportion="0.026143791"> + <state line="24" column="27" selection-start="796" selection-end="796" vertical-scroll-proportion="0.627451"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/core/src/main/java/org/jboss/balalaika/BirtEngineFactory.java"> + <entry file="file://$PROJECT_DIR$/core/src/main/java/org/jboss/balalaika/BirtService.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="50" column="71" selection-start="2043" selection-end="2043" vertical-scroll-proportion="0.7448166"> + <state line="43" column="42" selection-start="1489" selection-end="1489" vertical-scroll-proportion="0.54738563"> <folding> <element signature="imports" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/core/src/main/java/org/jboss/balalaika/RenderMetaData.java"> + <entry file="file://$PROJECT_DIR$/core/src/main/java/org/jboss/balalaika/BirtEngineFactory.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="33" column="0" selection-start="1275" selection-end="1275" vertical-scroll-proportion="0.33173844"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/core/src/main/java/org/jboss/balalaika/BirtService.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="27" column="7" selection-start="1168" selection-end="1168" vertical-scroll-proportion="0.18300654"> + <state line="42" column="22" selection-start="1688" selection-end="1688" vertical-scroll-proportion="0.54066986"> <folding> <element signature="imports" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/core/pom.xml"> + <entry file="jar:///Users/hbraun/dev/env/birt-runtime-2_2_2/ReportEngine/lib/engineapi.jar!/org/eclipse/birt/report/engine/api/IReportEngineFactory.class"> <provider selected="true" editor-type-id="text-editor"> - <state line="20" column="25" selection-start="695" selection-end="695" vertical-scroll-proportion="0.52287585"> + <state line="5" column="17" selection-start="176" selection-end="176" vertical-scroll-proportion="0.104575165"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/core/src/main/java/org/jboss/balalaika/ConfigAdapter.java"> + <entry file="file://$PROJECT_DIR$/core/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="26" column="13" selection-start="1130" selection-end="1130" vertical-scroll-proportion="0.15686275"> + <state line="36" column="21" selection-start="1125" selection-end="1125" vertical-scroll-proportion="0.4248366"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/pom.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state line="24" column="27" selection-start="796" selection-end="796" vertical-scroll-proportion="0.627451"> - <folding /> - </state> - </provider> - </entry> </component> </project> Modified: projects/balalaika/trunk/core/pom.xml =================================================================== --- projects/balalaika/trunk/core/pom.xml 2008-12-04 21:17:58 UTC (rev 3206) +++ projects/balalaika/trunk/core/pom.xml 2008-12-04 22:00:34 UTC (rev 3207) @@ -5,18 +5,18 @@ <groupId>org.jbpm</groupId> <artifactId>balalaika-core</artifactId> <version>1.0.0-SNAPSHOT</version> - <packaging>pom</packaging> + <packaging>jar</packaging>  <parent> <groupId>org.jbpm</groupId> - <artifactId>balalaika-parent</artifactId> + <artifactId>balalaika-parent</artifactId> <version>1.0.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <properties> - + <birt.version>2.2.2</birt.version> </properties> <dependencies> @@ -24,7 +24,6 @@ <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - </dependency> <dependency> @@ -33,6 +32,48 @@ <scope>test</scope> </dependency> + <dependency> + <groupId>org.eclipse.birt</groupId> + <artifactId>engineapi</artifactId> + <version>${birt.version}</version> + </dependency> + + <dependency> + <groupId>org.eclipse.birt</groupId> + <artifactId>chartengineapi</artifactId> + <version>${birt.version}</version> + </dependency> + + <dependency> + <groupId>org.eclipse.birt</groupId> + <artifactId>coreapi</artifactId> + <version>${birt.version}</version> + </dependency> + + <dependency> + <groupId>org.eclipse.birt</groupId> + <artifactId>dataadapterapi</artifactId> + <version>${birt.version}</version> + </dependency> + + <dependency> + <groupId>org.eclipse.birt</groupId> + <artifactId>modelapi</artifactId> + <version>${birt.version}</version> + </dependency> + + <dependency> + <groupId>org.eclipse.birt</groupId> + <artifactId>scriptapi</artifactId> + <version>${birt.version}</version> + </dependency> + + <dependency> + <groupId>org.eclipse.birt</groupId> + <artifactId>dteapi</artifactId> + <version>${birt.version}</version> + </dependency> + </dependencies>

15 years, 6 months

1
0
0 / 0

JBoss JBPM SVN: r3206 - in projects/balalaika/trunk: core and 6 other directories.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-12-04 16:17:58 -0500 (Thu, 04 Dec 2008) New Revision: 3206 Added: projects/balalaika/trunk/core/src/main/java/org/ projects/balalaika/trunk/core/src/main/java/org/jboss/ projects/balalaika/trunk/core/src/main/java/org/jboss/balalaika/ projects/balalaika/trunk/core/src/main/java/org/jboss/balalaika/BirtEngineFactory.java projects/balalaika/trunk/core/src/main/java/org/jboss/balalaika/BirtService.java projects/balalaika/trunk/core/src/main/java/org/jboss/balalaika/ConfigAdapter.java projects/balalaika/trunk/core/src/main/java/org/jboss/balalaika/IntegrationConfig.java projects/balalaika/trunk/core/src/main/java/org/jboss/balalaika/RenderMetaData.java projects/balalaika/trunk/core/src/main/resources/ projects/balalaika/trunk/core/src/main/resources/sample.rptdesign Removed: projects/balalaika/trunk/core/core.iml projects/balalaika/trunk/parent.iml Modified: projects/balalaika/trunk/Balalaika.iws Log: we'll see how it goes... Modified: projects/balalaika/trunk/Balalaika.iws =================================================================== --- projects/balalaika/trunk/Balalaika.iws 2008-12-04 20:48:14 UTC (rev 3205) +++ projects/balalaika/trunk/Balalaika.iws 2008-12-04 21:17:58 UTC (rev 3206) @@ -16,7 +16,37 @@ <option name="USER" value="" /> </component> <component name="ChangeListManager"> - <list default="true" name="Default" comment="" /> + <list default="true" name="Default" comment=""> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/oda/src/main" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/oda/src/main/resources" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/core/src/main/resources" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/oda/src/main/java/org/eclipse/birt/report/data/oda" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/core/src/main/java/org" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/oda" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/oda/src/main/java/org/eclipse" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/oda/src/main/resources/plugin.xml" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/core/src/main/java/org/jboss/balalaika" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/core/src/main/java/org/jboss/balalaika/ConfigAdapter.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/oda/src" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/core/src/main/java/org/jboss/balalaika/BirtEngineFactory.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/core/src/main/java/org/jboss/balalaika/BirtService.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/core/src/main/java/org/jboss/balalaika/RenderMetaData.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/core/src/main/java/org/jboss" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/oda/src/main/java/org/eclipse/birt/report/data" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/oda/src/main/java/org/eclipse/birt/report/data/oda/subjdbc/SubOdaJdbcDriver.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Balalaika.iws" afterPath="$PROJECT_DIR$/Balalaika.iws" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/oda/src/main/java/org/eclipse/birt/report" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/oda/src/main/java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/core/src/main/java/org/jboss/balalaika/IntegrationConfig.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/oda/pom.xml" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/oda/src/main/java/org" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/oda/src/main/java/org/eclipse/birt/report/data/oda/subjdbc" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/core/src/main/resources/sample.rptdesign" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/core/core.iml" afterPath="" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/oda/src/main/java/org/eclipse/birt/report/data/oda/subjdbc/AppContextDBConnection.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/parent.iml" afterPath="$PROJECT_DIR$/parent.iml" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/oda/src/main/java/org/eclipse/birt" /> + </list> </component> <component name="ChangeListSynchronizer" /> <component name="ChangesViewManager" flattened_view="true" /> @@ -128,22 +158,53 @@ <component name="FavoritesManager"> <favorites_list name="Balalaika" /> </component> - <component name="FavoritesProjectViewPane" /> + <component name="FavoritesProjectViewPane"> + <subPane subId="Balalaika"> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" /> + <option name="myItemType" value="com.intellij.ide.favoritesTreeView.FavoritesTreeNodeDescriptor" /> + </PATH_ELEMENT> + </PATH> + </subPane> + </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="pom.xml" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/pom.xml"> + <file leaf-file-name="BirtService.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/core/src/main/java/org/jboss/balalaika/BirtService.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="3" column="32" selection-start="281" selection-end="281" vertical-scroll-proportion="0.078431375"> + <state line="27" column="7" selection-start="1168" selection-end="1168" vertical-scroll-proportion="0.18300654"> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="RenderMetaData.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/core/src/main/java/org/jboss/balalaika/RenderMetaData.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="33" column="0" selection-start="1275" selection-end="1275" vertical-scroll-proportion="0.33173844"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="core.iml" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/core/core.iml"> + <file leaf-file-name="BirtEngineFactory.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/core/src/main/java/org/jboss/balalaika/BirtEngineFactory.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> + <state line="50" column="71" selection-start="2043" selection-end="2043" vertical-scroll-proportion="0.7448166"> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="ConfigAdapter.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/core/src/main/java/org/jboss/balalaika/ConfigAdapter.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="26" column="13" selection-start="1130" selection-end="1130" vertical-scroll-proportion="0.15686275"> <folding /> </state> </provider> @@ -152,12 +213,21 @@ <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/core/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="3" column="23" selection-start="272" selection-end="286" vertical-scroll-proportion="0.078431375"> + <state line="20" column="25" selection-start="695" selection-end="695" vertical-scroll-proportion="0.52287585"> <folding /> </state> </provider> </entry> </file> + <file leaf-file-name="pom.xml" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/pom.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state line="24" column="27" selection-start="796" selection-end="796" vertical-scroll-proportion="0.627451"> + <folding /> + </state> + </provider> + </entry> + </file> </leaf> </component> <component name="FindManager"> @@ -273,24 +343,6 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="Balalaika.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="parent" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/core" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> </subPane> </component> <component name="ProjectReloadState"> @@ -298,13 +350,13 @@ </component> <component name="ProjectView"> <navigator currentView="ProjectPane" proportions="0.11111111" version="1" splitterProportion="0.5"> - <flattenPackages /> + <flattenPackages ProjectPane="false" /> <showMembers /> <showModules /> <showLibraryContents /> - <hideEmptyPackages /> + <hideEmptyPackages ProjectPane="true" /> <abbreviatePackageNames /> - <showStructure PackagesPane="false" ProjectPane="false" /> + <showStructure Favorites="false" PackagesPane="false" Scope="false" ProjectPane="false" /> <autoscrollToSource /> <autoscrollFromSource /> <sortByType /> @@ -315,37 +367,42 @@ <property name="GoToClass.includeLibraries" value="false" /> <property name="MemberChooser.showClasses" value="true" /> <property name="MemberChooser.sorted" value="false" /> + <property name="RunManagerConfig.compileBeforeRunning" value="false" /> <property name="GoToFile.includeJavaFiles" value="false" /> <property name="GoToClass.toSaveIncludeLibraries" value="false" /> + <property name="RunManagerConfig.showSettingsBeforeRunnig" value="false" /> </component> <component name="ReadonlyStatusHandler"> <option name="SHOW_DIALOG" value="true" /> </component> - <component name="RecentsManager" /> + <component name="RecentsManager"> + <key name="MoveClassesOrPackagesDialog.RECENTS_KEY"> + <recent name="org.eclipse.birt.report.data.oda.subjdbc" /> + </key> + </component> <component name="RestoreUpdateTree" /> - <component name="RunManager"> - <configuration default="true" type="Applet" factoryName="Applet"> - <module name="" /> - <option name="MAIN_CLASS_NAME" /> - <option name="HTML_FILE_NAME" /> - <option name="HTML_USED" value="false" /> - <option name="WIDTH" value="400" /> - <option name="HEIGHT" value="300" /> - <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" /> - <option name="VM_PARAMETERS" /> + <component name="RunManager" selected="Application.Main"> + <tempConfiguration default="false" name="Main" type="Application" factoryName="Application" enabled="false" merge="false"> + <option name="MAIN_CLASS_NAME" value="org.jboss.balalaika.Main" /> + <option name="VM_PARAMETERS" value="" /> + <option name="PROGRAM_PARAMETERS" value="" /> + <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - </configuration> - <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false"> - <option name="MAIN_CLASS_NAME" /> - <option name="VM_PARAMETERS" /> - <option name="PROGRAM_PARAMETERS" /> - <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> + <option name="ALTERNATIVE_JRE_PATH" value="" /> <option name="ENABLE_SWING_INSPECTOR" value="false" /> - <module name="" /> - </configuration> + <module name="parent" /> + <RunnerSettings RunnerId="Debug"> + <option name="DEBUG_PORT" value="55613" /> + <option name="TRANSPORT" value="0" /> + <option name="LOCAL" value="true" /> + </RunnerSettings> + <RunnerSettings RunnerId="Run" /> + <ConfigurationWrapper RunnerId="Debug" /> + <ConfigurationWrapper RunnerId="Run" /> + <method> + <option name="Make" value="true" /> + </method> + </tempConfiguration> <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false"> <module name="" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> @@ -361,6 +418,9 @@ <option name="TEST_SEARCH_SCOPE"> <value defaultName="wholeProject" /> </option> + <method> + <option name="Make" value="true" /> + </method> </configuration> <configuration default="true" type="Remote" factoryName="Remote"> <option name="USE_SOCKET_TRANSPORT" value="true" /> @@ -369,12 +429,46 @@ <option name="HOST" value="localhost" /> <option name="PORT" value="5005" /> </configuration> + <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false"> + <option name="MAIN_CLASS_NAME" /> + <option name="VM_PARAMETERS" /> + <option name="PROGRAM_PARAMETERS" /> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" /> + <option name="ENABLE_SWING_INSPECTOR" value="false" /> + <module name="" /> + <method> + <option name="Make" value="true" /> + </method> + </configuration> + <configuration default="true" type="Applet" factoryName="Applet"> + <module name="" /> + <option name="MAIN_CLASS_NAME" /> + <option name="HTML_FILE_NAME" /> + <option name="HTML_USED" value="false" /> + <option name="WIDTH" value="400" /> + <option name="HEIGHT" value="300" /> + <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" /> + <option name="VM_PARAMETERS" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" /> + </configuration> <configuration name="<template>" type="WebApp" default="true" selected="false"> <Host>localhost</Host> <Port>5050</Port> </configuration> </component> - <component name="ScopeViewComponent" /> + <component name="ScopeViewComponent"> + <subPane subId="Project"> + <PATH> + <PATH_ELEMENT USER_OBJECT="Root"> + <option name="myItemId" value="" /> + <option name="myItemType" value="" /> + </PATH_ELEMENT> + </PATH> + </subPane> + </component> <component name="SelectInManager" /> <component name="StarteamConfiguration"> <option name="SERVER" value="" /> @@ -423,6 +517,7 @@ <option name="UPDATE_RUN_STATUS" value="false" /> <option name="UPDATE_RECURSIVELY" value="true" /> <option name="MERGE_DRY_RUN" value="false" /> + <configuration useDefault="true">/Users/hbraun/.subversion</configuration> </component> <component name="TodoView" selected-index="0"> <todo-panel id="selected-file"> @@ -442,30 +537,30 @@ <frame x="0" y="22" width="1278" height="774" extended-state="6" /> <editor active="true" /> <layout> - <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> - <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> - <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> + <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> + <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> + <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="7" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24979658" order="0" /> - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="1" /> - <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="1" /> - <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3293944" order="1" /> + <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24979658" order="1" /> + <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3293944" order="8" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="6" /> - <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> - <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> - <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> + <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> + <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> + <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="1" /> - <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="2" /> - <window_info id="Maven" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> + <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3293944" order="8" /> + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.58197933" order="2" /> + <window_info id="Maven" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="2" /> - <window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="4" /> + <window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3988183" order="4" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="0" /> - <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> - <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> + <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> + <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> + <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="0" /> <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="2" /> - <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="0" /> <window_info id="EJB" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="3" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="5" /> </layout> @@ -493,7 +588,7 @@ <option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" /> <option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" /> <option name="ERROR_OCCURED" value="false" /> - <option name="ACTIVE_VCS_NAME" /> + <option name="ACTIVE_VCS_NAME" value="svn" /> <option name="UPDATE_GROUP_BY_PACKAGES" value="false" /> <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" /> <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" /> @@ -550,23 +645,116 @@ <option name="myLastEditedConfigurable" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/core/core.iml"> + <entry file="jar:///Users/hbraun/dev/env/birt-runtime-2_3_1/ReportEngine/lib/coreapi.jar!/org/eclipse/birt/core/framework/IPlatformContext.class"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> + <state line="5" column="17" selection-start="173" selection-end="173" vertical-scroll-proportion="0.102073364"> <folding /> </state> </provider> </entry> + <entry file="jar:///Users/hbraun/dev/env/birt-runtime-2_3_1/ReportEngine/lib/engineapi.jar!/org/eclipse/birt/report/engine/api/EngineConstants.class"> + <provider selected="true" editor-type-id="text-editor"> + <state line="5" column="13" selection-start="172" selection-end="172" vertical-scroll-proportion="0.104575165"> + <folding /> + </state> + </provider> + </entry> + <entry file="jar:///System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Home/src.jar!/src/java/io/FileInputStream.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="105" column="0" selection-start="4013" selection-end="4013" vertical-scroll-proportion="0.21052632"> + <folding /> + </state> + </provider> + </entry> + <entry file="jar:///Users/hbraun/dev/env/birt-runtime-2_2_2/ReportEngine/plugins/org.eclipse.birt.report.data.oda.jdbc_2.2.2.r22x_v20071206/oda-jdbc.jar!/org/eclipse/birt/report/data/oda/jdbc/OdaJdbcDriver.class"> + <provider selected="true" editor-type-id="text-editor"> + <state line="5" column="13" selection-start="175" selection-end="175" vertical-scroll-proportion="0.104575165"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/oda/src/main/resources/plugin.properties"> + <provider selected="true" editor-type-id="text-editor"> + <state line="19" column="40" selection-start="905" selection-end="905" vertical-scroll-proportion="0.3875598"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/oda/pom.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state line="27" column="27" selection-start="854" selection-end="854" vertical-scroll-proportion="0.65849674"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/oda/src/main/resources/plugin.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state line="11" column="48" selection-start="0" selection-end="10959" vertical-scroll-proportion="0.28070176"> + <folding> + <element signature="tag#properties#0;tag#dataSource#0;tag#extension#0;tag#plugin#0" expanded="false" /> + <element signature="tag#dataSet#0;tag#extension#0;tag#plugin#0" expanded="false" /> + <element signature="tag#dataSet#1;tag#extension#0;tag#plugin#0" expanded="false" /> + <element signature="tag#extension#1;tag#plugin#0" expanded="false" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/oda/src/main/java/org/eclipse/birt/report/data/oda/subjdbc/SubOdaJdbcDriver.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="35" column="13" selection-start="1476" selection-end="1476" vertical-scroll-proportion="0.2551834"> + <folding /> + </state> + </provider> + </entry> + <entry file="jar:///Users/hbraun/dev/env/birt-runtime-2_2_2/ReportEngine/plugins/org.eclipse.birt.report.data.oda.jdbc_2.2.2.r22x_v20071206/oda-jdbc.jar!/org/eclipse/birt/report/data/oda/jdbc/Connection.class"> + <provider selected="true" editor-type-id="text-editor"> + <state line="11" column="10" selection-start="512" selection-end="512" vertical-scroll-proportion="0.026143791"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/core/src/main/java/org/jboss/balalaika/BirtEngineFactory.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="50" column="71" selection-start="2043" selection-end="2043" vertical-scroll-proportion="0.7448166"> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/core/src/main/java/org/jboss/balalaika/RenderMetaData.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="33" column="0" selection-start="1275" selection-end="1275" vertical-scroll-proportion="0.33173844"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/core/src/main/java/org/jboss/balalaika/BirtService.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="27" column="7" selection-start="1168" selection-end="1168" vertical-scroll-proportion="0.18300654"> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/core/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="3" column="23" selection-start="272" selection-end="286" vertical-scroll-proportion="0.078431375"> + <state line="20" column="25" selection-start="695" selection-end="695" vertical-scroll-proportion="0.52287585"> <folding /> </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/core/src/main/java/org/jboss/balalaika/ConfigAdapter.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="26" column="13" selection-start="1130" selection-end="1130" vertical-scroll-proportion="0.15686275"> + <folding /> + </state> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="3" column="32" selection-start="281" selection-end="281" vertical-scroll-proportion="0.078431375"> + <state line="24" column="27" selection-start="796" selection-end="796" vertical-scroll-proportion="0.627451"> <folding /> </state> </provider> Deleted: projects/balalaika/trunk/core/core.iml =================================================================== --- projects/balalaika/trunk/core/core.iml 2008-12-04 20:48:14 UTC (rev 3205) +++ projects/balalaika/trunk/core/core.iml 2008-12-04 21:17:58 UTC (rev 3206) @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module version="4" relativePaths="true" type="JAVA_MODULE"> - <component name="ModuleRootManager" /> - <component name="NewModuleRootManager" inherit-compiler-output="true"> - <exclude-output /> - <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - <orderEntryProperties /> - </component> -</module> - Added: projects/balalaika/trunk/core/src/main/java/org/jboss/balalaika/BirtEngineFactory.java =================================================================== --- projects/balalaika/trunk/core/src/main/java/org/jboss/balalaika/BirtEngineFactory.java (rev 0) +++ projects/balalaika/trunk/core/src/main/java/org/jboss/balalaika/BirtEngineFactory.java 2008-12-04 21:17:58 UTC (rev 3206) @@ -0,0 +1,54 @@ +/* + * 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.balalaika; + +import org.eclipse.birt.report.engine.api.IReportEngine; +import org.eclipse.birt.report.engine.api.EngineConfig; +import org.eclipse.birt.report.engine.api.IReportEngineFactory; +import org.eclipse.birt.core.framework.Platform; +import org.eclipse.birt.core.exception.BirtException; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public class BirtEngineFactory +{ + public static IReportEngine newInstance(IntegrationConfig iConfig) + { + try + { + EngineConfig config = new EngineConfig( ); + config.setBIRTHome(iConfig.getBirtHome()); + + Platform.startup( config ); + IReportEngineFactory factory = (IReportEngineFactory) Platform + .createFactoryObject( IReportEngineFactory.EXTENSION_REPORT_ENGINE_FACTORY ); + + IReportEngine engine = factory.createReportEngine( config ); + return engine; + } + catch (BirtException e) + { + throw new RuntimeException("Failed to create birt engine", e); + } + } +} Added: projects/balalaika/trunk/core/src/main/java/org/jboss/balalaika/BirtService.java =================================================================== --- projects/balalaika/trunk/core/src/main/java/org/jboss/balalaika/BirtService.java (rev 0) +++ projects/balalaika/trunk/core/src/main/java/org/jboss/balalaika/BirtService.java 2008-12-04 21:17:58 UTC (rev 3206) @@ -0,0 +1,133 @@ +/* + * 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.balalaika; + +import org.eclipse.birt.report.engine.api.*; +import org.eclipse.birt.core.framework.Platform; + +/** + * jBPM BIRT integration. + * + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public class BirtService +{ + private IReportEngine engine; + private IntegrationConfig iConfig; + + public BirtService() + { + this.iConfig = new ConfigAdapter(); + } + + public void create() + { + this.engine = BirtEngineFactory.newInstance(iConfig); + } + + public void start() + { + + } + + public void stop() + { + + } + + public void destroy() + { + if(engine!=null) + engine.destroy(); + Platform.shutdown(); + } + + public String render(RenderMetaData metaData) + { + String outputFileName = null; + + try + { + //Open a report design + IReportRunnable design = engine.openReportDesign(iConfig.getReportDir()+metaData.getReportName()); + + //Create runRenderTask to run and render the report, + IRunAndRenderTask runRenderTask = engine.createRunAndRenderTask(design); + //Set parent classloader for engine + runRenderTask.getAppContext().put(EngineConstants.APPCONTEXT_CLASSLOADER_KEY, metaData.getClassloader()); + + // ------------------ + + IRenderOption options = new RenderOption(); + switch(metaData.getFormat()) + { + case HTML: + options.setOutputFormat("html"); + outputFileName = extactReportName(metaData.getReportName())+".html"; + break; + case PDF: + options.setOutputFormat("pdf"); + outputFileName = extactReportName(metaData.getReportName())+".pdf"; + break; + } + options.setOutputFileName(iConfig.getOutputDir() + outputFileName); + + // ------------------ + + if( options.getOutputFormat().equalsIgnoreCase("html")) + { + HTMLRenderOption htmlOptions = new HTMLRenderOption( options); + htmlOptions.setImageDirectory(iConfig.getOutputDir()+"image"); + htmlOptions.setHtmlPagination(false); + htmlOptions.setHtmlRtLFlag(false); + //Setting this to true removes html and body tags + htmlOptions.setEmbeddable(false); + runRenderTask.setRenderOption(htmlOptions); + } + else if( options.getOutputFormat().equalsIgnoreCase("pdf") ){ + + PDFRenderOption pdfOptions = new PDFRenderOption( options ); + pdfOptions.setOption( IPDFRenderOption.FIT_TO_PAGE, new Boolean(true) ); + pdfOptions.setOption( IPDFRenderOption.PAGEBREAK_PAGINATION_ONLY, new Boolean(true) ); + runRenderTask.setRenderOption(pdfOptions); + } + + // ------------------ + if(runRenderTask.getRenderOption()==null) + runRenderTask.setRenderOption(options); + + runRenderTask.run(); + runRenderTask.close(); + } + catch (EngineException e) + { + throw new RuntimeException("Failed to render report", e); + } + + return outputFileName; + } + + private static String extactReportName(String reportFile) + { + return reportFile.substring( 0, reportFile.indexOf(".")); + } +} Added: projects/balalaika/trunk/core/src/main/java/org/jboss/balalaika/ConfigAdapter.java =================================================================== --- projects/balalaika/trunk/core/src/main/java/org/jboss/balalaika/ConfigAdapter.java (rev 0) +++ projects/balalaika/trunk/core/src/main/java/org/jboss/balalaika/ConfigAdapter.java 2008-12-04 21:17:58 UTC (rev 3206) @@ -0,0 +1,62 @@ +/* + * 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.balalaika; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public class ConfigAdapter implements IntegrationConfig +{ + private String birtHome = "/Users/hbraun/dev/env/birt-runtime-2_2_2/ReportEngine/"; + private String reportDir = "/Users/hbraun/dev/prj/jbpm/projects/gwt-console/trunk/server/src/main/resources/"; + private String outputDir = "/Users/hbraun/balalaika/"; + + public String getBirtHome() + { + return birtHome; + } + + public void setBirtHome(String birtHome) + { + this.birtHome = birtHome; + } + + public String getReportDir() + { + return reportDir; + } + + public void setReportDir(String reportDir) + { + this.reportDir = reportDir; + } + + public String getOutputDir() + { + return outputDir; + } + + public void setOutputDir(String outputDir) + { + this.outputDir = outputDir; + } +} Added: projects/balalaika/trunk/core/src/main/java/org/jboss/balalaika/IntegrationConfig.java =================================================================== --- projects/balalaika/trunk/core/src/main/java/org/jboss/balalaika/IntegrationConfig.java (rev 0) +++ projects/balalaika/trunk/core/src/main/java/org/jboss/balalaika/IntegrationConfig.java 2008-12-04 21:17:58 UTC (rev 3206) @@ -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.balalaika; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public interface IntegrationConfig +{ + String getBirtHome(); + + void setBirtHome(String birtHome); + + String getReportDir(); + + void setReportDir(String reportDir); + + String getOutputDir(); + + void setOutputDir(String outputDir); +} Added: projects/balalaika/trunk/core/src/main/java/org/jboss/balalaika/RenderMetaData.java =================================================================== --- projects/balalaika/trunk/core/src/main/java/org/jboss/balalaika/RenderMetaData.java (rev 0) +++ projects/balalaika/trunk/core/src/main/java/org/jboss/balalaika/RenderMetaData.java 2008-12-04 21:17:58 UTC (rev 3206) @@ -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.balalaika; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public class RenderMetaData +{ + public enum Format {HTML, PDF}; + + private ClassLoader classloader; + private String reportName; + private Format format; + + public RenderMetaData() + { + } + + public RenderMetaData(ClassLoader classloader, String reportName, Format format) + { + this.classloader = classloader; + this.reportName = reportName; + this.format = format; + } + + public ClassLoader getClassloader() + { + return classloader; + } + + public void setClassloader(ClassLoader classloader) + { + this.classloader = classloader; + } + + public String getReportName() + { + return reportName; + } + + public void setReportName(String reportName) + { + this.reportName = reportName; + } + + public Format getFormat() + { + return format; + } + + public void setFormat(Format format) + { + this.format = format; + } +} Added: projects/balalaika/trunk/core/src/main/resources/sample.rptdesign =================================================================== --- projects/balalaika/trunk/core/src/main/resources/sample.rptdesign (rev 0) +++ projects/balalaika/trunk/core/src/main/resources/sample.rptdesign 2008-12-04 21:17:58 UTC (rev 3206) @@ -0,0 +1,2545 @@ +<?xml version="1.0" encoding="UTF-8"?> +<report xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.15" id="1"> + <property name="createdBy">Eclipse BIRT Designer Version 2.2.2.r222_v20071226 Build <2.2.2.v20080226-1155></property> + <property name="units">in</property> + <property name="comments">Copyright (c) 2007 <<Your Company Name here>></property> + <html-property name="description">Creates a blank report with no predefined content.</html-property> + <text-property name="displayName">Blank Report</text-property> + <property name="iconFile">/templates/blank_report.gif</property> + <data-sources> + <oda-data-source extensionID="org.eclipse.birt.report.data.oda.jdbc" name="MySQL Local" id="6"> + <property name="odaDriverClass">com.mysql.jdbc.Driver</property> + <property name="odaURL">jdbc:mysql://localhost:3306/jbpmtest</property> + <property name="odaUser">jbpmtest</property> + </oda-data-source> + <script-data-source name="ScriptedDS" id="51"/> + </data-sources> + <data-sets> + <oda-data-set extensionID="org.eclipse.birt.report.data.oda.jdbc.JdbcSelectDataSet" name="AverageExecTime" id="7"> + <list-property name="computedColumns"> + <structure> + <property name="name">execTime</property> + <expression name="expression">DateTimeSpan.seconds(row["startDate"],row["endDate"])</expression> + <property name="dataType">any</property> + </structure> + <structure> + <property name="name">short</property> + <expression name="expression">BirtComp.between(row["execTime"],0,60)</expression> + <property name="dataType">any</property> + </structure> + <structure> + <property name="name">medium</property> + <expression name="expression">BirtComp.between(row["execTime"],60,86400)</expression> + <property name="dataType">any</property> + </structure> + <structure> + <property name="name">long</property> + <expression name="expression">row["execTime"]>86400</expression> + <property name="dataType">any</property> + </structure> + </list-property> + <list-property name="columnHints"> + <structure> + <property name="columnName">startDate</property> + <property name="displayName">startDate</property> + </structure> + <structure> + <property name="columnName">endDate</property> + <property name="displayName">endDate</property> + </structure> + <structure> + <property name="columnName">TOKEN_</property> + <property name="displayName">TOKEN_</property> + </structure> + <structure> + <property name="columnName">instanceID</property> + <property name="displayName">instanceID</property> + </structure> + <structure> + <property name="columnName">NAME_</property> + <property name="displayName">NAME_</property> + </structure> + </list-property> + <structure name="cachedMetaData"> + <list-property name="resultSet"> + <structure> + <property name="position">1</property> + <property name="name">startDate</property> + <property name="dataType">date-time</property> + </structure> + <structure> + <property name="position">2</property> + <property name="name">endDate</property> + <property name="dataType">date-time</property> + </structure> + <structure> + <property name="position">3</property> + <property name="name">TOKEN_</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">4</property> + <property name="name">instanceID</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">5</property> + <property name="name">NAME_</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">6</property> + <property name="name">execTime</property> + <property name="dataType">any</property> + </structure> + <structure> + <property name="position">7</property> + <property name="name">short</property> + <property name="dataType">any</property> + </structure> + <structure> + <property name="position">8</property> + <property name="name">medium</property> + <property name="dataType">any</property> + </structure> + <structure> + <property name="position">9</property> + <property name="name">long</property> + <property name="dataType">any</property> + </structure> + </list-property> + </structure> + <property name="dataSource">MySQL Local</property> + <list-property name="resultSet"> + <structure> + <property name="position">1</property> + <property name="name">startDate</property> + <property name="nativeName">startDate</property> + <property name="dataType">date-time</property> + <property name="nativeDataType">93</property> + </structure> + <structure> + <property name="position">2</property> + <property name="name">endDate</property> + <property name="nativeName">endDate</property> + <property name="dataType">date-time</property> + <property name="nativeDataType">93</property> + </structure> + <structure> + <property name="position">3</property> + <property name="name">TOKEN_</property> + <property name="nativeName">TOKEN_</property> + <property name="dataType">decimal</property> + <property name="nativeDataType">-5</property> + </structure> + <structure> + <property name="position">4</property> + <property name="name">instanceID</property> + <property name="nativeName">instanceID</property> + <property name="dataType">decimal</property> + <property name="nativeDataType">-5</property> + </structure> + <structure> + <property name="position">5</property> + <property name="name">NAME_</property> + <property name="nativeName">NAME_</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + </list-property> + <property name="queryText">SELECT l1.DATE_ as startDate, l2.DATE_ as endDate, +l1.TOKEN_, i.ID_ as instanceID, p.NAME_ + FROM JBPM_LOG l1, JBPM_LOG l2, JBPM_TOKEN t, JBPM_PROCESSINSTANCE i, JBPM_PROCESSDEFINITION p +WHERE (l1.CLASS_='I' AND l2.CLASS_='X') +AND (l1.TOKEN_=l2.TOKEN_) +AND t.ID_=l1.TOKEN_ +AND t.PROCESSINSTANCE_=i.ID_ +AND i.PROCESSDEFINITION_=p.ID_ +GROUP BY instanceId +ORDER BY l1.DATE_ ASC, l1.TOKEN_</property> + </oda-data-set> + <oda-data-set extensionID="org.eclipse.birt.report.data.oda.jdbc.JdbcSelectDataSet" name="ProcessActivity" id="53"> + <list-property name="columnHints"> + <structure> + <property name="columnName">numberExec</property> + <property name="displayName">numberExec</property> + </structure> + <structure> + <property name="columnName">NAME_</property> + <property name="displayName">NAME_</property> + </structure> + </list-property> + <structure name="cachedMetaData"> + <list-property name="resultSet"> + <structure> + <property name="position">1</property> + <property name="name">numberExec</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">2</property> + <property name="name">NAME_</property> + <property name="dataType">string</property> + </structure> + </list-property> + </structure> + <property name="dataSource">MySQL Local</property> + <list-property name="resultSet"> + <structure> + <property name="position">1</property> + <property name="name">numberExec</property> + <property name="nativeName">numberExec</property> + <property name="dataType">decimal</property> + <property name="nativeDataType">-5</property> + </structure> + <structure> + <property name="position">2</property> + <property name="name">NAME_</property> + <property name="nativeName">NAME_</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + </list-property> + <property name="queryText">SELECT count(i.ID_) as numberExec, p.NAME_ + FROM JBPM_LOG l1, JBPM_LOG l2, JBPM_TOKEN t, JBPM_PROCESSINSTANCE i, JBPM_PROCESSDEFINITION p +WHERE (l1.CLASS_='I' AND l2.CLASS_='X') +AND (l1.TOKEN_=l2.TOKEN_) +AND t.ID_=l1.TOKEN_ +AND t.PROCESSINSTANCE_=i.ID_ +AND i.PROCESSDEFINITION_=p.ID_ +GROUP BY NAME_ +ORDER BY numberExec ASC LIMIT 15</property> + </oda-data-set> + <oda-data-set extensionID="org.eclipse.birt.report.data.oda.jdbc.JdbcSelectDataSet" name="NumberOfAssignments" id="67"> + <list-property name="columnHints"> + <structure> + <property name="columnName">count(TASKINSTANCE_)</property> + <property name="displayName">count(TASKINSTANCE_)</property> + </structure> + <structure> + <property name="columnName">TASKACTORID_</property> + <property name="displayName">TASKACTORID_</property> + </structure> + </list-property> + <structure name="cachedMetaData"> + <list-property name="resultSet"> + <structure> + <property name="position">1</property> + <property name="name">count(TASKINSTANCE_)</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">2</property> + <property name="name">TASKACTORID_</property> + <property name="dataType">string</property> + </structure> + </list-property> + </structure> + <property name="dataSource">MySQL Local</property> + <list-property name="resultSet"> + <structure> + <property name="position">1</property> + <property name="name">count(TASKINSTANCE_)</property> + <property name="nativeName">count(TASKINSTANCE_)</property> + <property name="dataType">decimal</property> + <property name="nativeDataType">-5</property> + </structure> + <structure> + <property name="position">2</property> + <property name="name">TASKACTORID_</property> + <property name="nativeName">TASKACTORID_</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + </list-property> + <property name="queryText">select count(TASKINSTANCE_), TASKACTORID_ from JBPM_LOG where CLASS_='2' +GROUP BY TASKACTORID_</property> + <xml-property name="designerValues"><![CDATA[<?xml version="1.0" encoding="UTF-8"?> +<model:DesignValues xmlns:design="http://www.eclipse.org/datatools/connectivity/oda/design" xmlns:model="http://www.eclipse.org/birt/report/model/adapter/odaModel"> + <Version>1.0</Version> + <design:ResultSets derivedMetaData="true"> + <design:resultSetDefinitions> + <design:resultSetColumns> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>count(TASKINSTANCE_)</design:name> + <design:position>1</design:position> + <design:nativeDataTypeCode>-5</design:nativeDataTypeCode> + <design:precision>21</design:precision> + <design:scale>0</design:scale> + <design:nullability>NotNullable</design:nullability> + <design:uiHints> + <design:displayName>count(TASKINSTANCE_)</design:displayName> + </design:uiHints> + </design:attributes> + <design:usageHints> + <design:label>count(TASKINSTANCE_)</design:label> + <design:formattingHints> + <design:displaySize>21</design:displaySize> + </design:formattingHints> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>TASKACTORID_</design:name> + <design:position>2</design:position> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>255</design:precision> + <design:scale>0</design:scale> + <design:nullability>Nullable</design:nullability> + <design:uiHints> + <design:displayName>TASKACTORID_</design:displayName> + </design:uiHints> + </design:attributes> + <design:usageHints> + <design:label>TASKACTORID_</design:label> + <design:formattingHints> + <design:displaySize>255</design:displaySize> + </design:formattingHints> + </design:usageHints> + </design:resultColumnDefinitions> + </design:resultSetColumns> + </design:resultSetDefinitions> + </design:ResultSets> +</model:DesignValues> +]]></xml-property> + </oda-data-set> + </data-sets> + <styles> + <style name="crosstab" id="4"> + <property name="borderBottomColor">#CCCCCC</property> + <property name="borderBottomStyle">solid</property> + <property name="borderBottomWidth">1pt</property> + <property name="borderLeftColor">#CCCCCC</property> + <property name="borderLeftStyle">solid</property> + <property name="borderLeftWidth">1pt</property> + <property name="borderRightColor">#CCCCCC</property> + <property name="borderRightStyle">solid</property> + <property name="borderRightWidth">1pt</property> + <property name="borderTopColor">#CCCCCC</property> + <property name="borderTopStyle">solid</property> + <property name="borderTopWidth">1pt</property> + </style> + <style name="crosstab-cell" id="5"> + <property name="borderBottomColor">#CCCCCC</property> + <property name="borderBottomStyle">solid</property> + <property name="borderBottomWidth">1pt</property> + <property name="borderLeftColor">#CCCCCC</property> + <property name="borderLeftStyle">solid</property> + <property name="borderLeftWidth">1pt</property> + <property name="borderRightColor">#CCCCCC</property> + <property name="borderRightStyle">solid</property> + <property name="borderRightWidth">1pt</property> + <property name="borderTopColor">#CCCCCC</property> + <property name="borderTopStyle">solid</property> + <property name="borderTopWidth">1pt</property> + </style> + </styles> + <page-setup> + <simple-master-page name="Simple MasterPage" id="2"/> + </page-setup> + <body> + <table id="55"> + <property name="width">100%</property> + <column id="65"/> + <column id="66"/> + <header> + <row id="56"> + <cell id="57"/> + <cell id="58"/> + </row> + </header> + <detail> + <row id="59"> + <cell id="60"> + <extended-item extensionName="Chart" name="NewChart" id="54"> + <xml-property name="xmlRepresentation"><![CDATA[<model:ChartWithAxes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:attribute="http://www.birt.eclipse.org/ChartModelAttribute" xmlns:data="http://www.birt.eclipse.org/ChartModelData" xmlns:layout="http://www.birt.eclipse.org/ChartModelLayout" xmlns:model="http://www.birt.eclipse.org/ChartModel" xmlns:type="http://www.birt.eclipse.org/ChartModelType"> + <Type>Bar Chart</Type> + <SubType>Side-by-side</SubType> + <Block> + <Children xsi:type="layout:TitleBlock"> + <Bounds> + <Left>0.0</Left> + <Top>0.0</Top> + <Width>0.0</Width> + <Height>0.0</Height> + </Bounds> + <Insets> + <Top>3.0</Top> + <Left>3.0</Left> + <Bottom>3.0</Bottom> + <Right>3.0</Right> + </Insets> + <Row>-1</Row> + <Column>-1</Column> + <Rowspan>-1</Rowspan> + <Columnspan>-1</Columnspan> + <Outline> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + <Visible>false</Visible> + </Outline> + <Visible>true</Visible> + <Label> + <Caption> + <Value>Most active processes</Value> + <Font> + <Size>16.0</Size> + <Bold>true</Bold> + <Alignment> + <horizontalAlignment>Center</horizontalAlignment> + <verticalAlignment>Center</verticalAlignment> + </Alignment> + </Font> + </Caption> + <Background xsi:type="attribute:ColorDefinition"> + <Transparency>0</Transparency> + <Red>255</Red> + <Green>255</Green> + <Blue>255</Blue> + </Background> + <Outline> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + </Outline> + <Insets> + <Top>0.0</Top> + <Left>2.0</Left> + <Bottom>0.0</Bottom> + <Right>3.0</Right> + </Insets> + <Visible>true</Visible> + </Label> + </Children> + <Children xsi:type="layout:Plot"> + <Bounds> + <Left>0.0</Left> + <Top>0.0</Top> + <Width>0.0</Width> + <Height>0.0</Height> + </Bounds> + <Insets> + <Top>3.0</Top> + <Left>3.0</Left> + <Bottom>3.0</Bottom> + <Right>3.0</Right> + </Insets> + <Row>-1</Row> + <Column>-1</Column> + <Rowspan>-1</Rowspan> + <Columnspan>-1</Columnspan> + <Outline> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + <Visible>false</Visible> + </Outline> + <Visible>true</Visible> + <HorizontalSpacing>5</HorizontalSpacing> + <VerticalSpacing>5</VerticalSpacing> + <ClientArea> + <Outline> + <Style>Solid</Style> + <Thickness>0</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + <Visible>false</Visible> + </Outline> + <Insets> + <Top>0.0</Top> + <Left>0.0</Left> + <Bottom>0.0</Bottom> + <Right>0.0</Right> + </Insets> + </ClientArea> + </Children> + <Children xsi:type="layout:Legend"> + <Bounds> + <Left>0.0</Left> + <Top>0.0</Top> + <Width>0.0</Width> + <Height>0.0</Height> + </Bounds> + <Insets> + <Top>3.0</Top> + <Left>3.0</Left> + <Bottom>3.0</Bottom> + <Right>3.0</Right> + </Insets> + <Row>-1</Row> + <Column>-1</Column> + <Rowspan>-1</Rowspan> + <Columnspan>-1</Columnspan> + <Outline> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + <Visible>false</Visible> + </Outline> + <Visible>false</Visible> + <ClientArea> + <Outline> + <Style>Solid</Style> + <Thickness>0</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + <Visible>false</Visible> + </Outline> + <Insets> + <Top>2.0</Top> + <Left>2.0</Left> + <Bottom>2.0</Bottom> + <Right>2.0</Right> + </Insets> + </ClientArea> + <Text> + <Value></Value> + <Font> + <Alignment/> + </Font> + </Text> + <Orientation>Vertical</Orientation> + <Direction>Top_Bottom</Direction> + <Separator> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + <Visible>true</Visible> + </Separator> + <Position>Right</Position> + <ItemType>Series</ItemType> + <Title> + <Caption> + <Value></Value> + <Font> + <Alignment/> + </Font> + </Caption> + <Background xsi:type="attribute:ColorDefinition"> + <Transparency>0</Transparency> + <Red>255</Red> + <Green>255</Green> + <Blue>255</Blue> + </Background> + <Outline> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + <Visible>false</Visible> + </Outline> + <Insets> + <Top>0.0</Top> + <Left>2.0</Left> + <Bottom>0.0</Bottom> + <Right>3.0</Right> + </Insets> + <Visible>false</Visible> + </Title> + <TitlePosition>Above</TitlePosition> + </Children> + <Bounds> + <Left>0.0</Left> + <Top>0.0</Top> + <Width>212.0</Width> + <Height>130.0</Height> + </Bounds> + <Insets> + <Top>3.0</Top> + <Left>3.0</Left> + <Bottom>3.0</Bottom> + <Right>3.0</Right> + </Insets> + <Row>-1</Row> + <Column>-1</Column> + <Rowspan>-1</Rowspan> + <Columnspan>-1</Columnspan> + <Outline> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + <Visible>false</Visible> + </Outline> + <Visible>true</Visible> + </Block> + <Dimension>Two_Dimensional</Dimension> + <Units>Points</Units> + <SeriesThickness>10.0</SeriesThickness> + <SampleData> + <BaseSampleData> + <DataSetRepresentation>A, B, C</DataSetRepresentation> + </BaseSampleData> + <OrthogonalSampleData> + <DataSetRepresentation>5.0,4.0,12.0</DataSetRepresentation> + <SeriesDefinitionIndex>0</SeriesDefinitionIndex> + </OrthogonalSampleData> + </SampleData> + <Interactivity/> + <Axes> + <Type>Text</Type> + <Title> + <Caption> + <Value>X-Axis Title</Value> + <Font> + <Size>14.0</Size> + <Bold>true</Bold> + <Alignment> + <horizontalAlignment>Center</horizontalAlignment> + <verticalAlignment>Center</verticalAlignment> + </Alignment> + </Font> + </Caption> + <Background xsi:type="attribute:ColorDefinition"> + <Transparency>0</Transparency> + <Red>255</Red> + <Green>255</Green> + <Blue>255</Blue> + </Background> + <Outline> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + </Outline> + <Insets> + <Top>0.0</Top> + <Left>2.0</Left> + <Bottom>0.0</Bottom> + <Right>3.0</Right> + </Insets> + <Visible>false</Visible> + </Title> + <TitlePosition>Below</TitlePosition> + <AssociatedAxes> + <Type>Logarithmic</Type> + <Title> + <Caption> + <Value>Y-Axis Title</Value> + <Font> + <Size>14.0</Size> + <Bold>true</Bold> + <Alignment> + <horizontalAlignment>Center</horizontalAlignment> + <verticalAlignment>Center</verticalAlignment> + </Alignment> + <Rotation>90.0</Rotation> + </Font> + </Caption> + <Background xsi:type="attribute:ColorDefinition"> + <Transparency>0</Transparency> + <Red>255</Red> + <Green>255</Green> + <Blue>255</Blue> + </Background> + <Outline> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + </Outline> + <Insets> + <Top>0.0</Top> + <Left>2.0</Left> + <Bottom>0.0</Bottom> + <Right>3.0</Right> + </Insets> + <Visible>false</Visible> + </Title> + <TitlePosition>Left</TitlePosition> + <SeriesDefinitions> + <Query> + <Definition></Definition> + </Query> + <SeriesPalette> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>80</Red> + <Green>166</Green> + <Blue>218</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>242</Red> + <Green>88</Green> + <Blue>106</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>232</Red> + <Green>172</Green> + <Blue>57</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>255</Green> + <Blue>128</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>64</Red> + <Green>128</Green> + <Blue>128</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>128</Green> + <Blue>192</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>170</Red> + <Green>85</Green> + <Blue>85</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>128</Green> + <Blue>0</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>192</Red> + <Green>192</Green> + <Blue>192</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>255</Green> + <Blue>128</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>192</Green> + <Blue>128</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>7</Red> + <Green>146</Green> + <Blue>94</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>128</Green> + <Blue>255</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>128</Green> + <Blue>192</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>255</Green> + <Blue>255</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>128</Green> + <Blue>128</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>128</Green> + <Blue>192</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>128</Green> + <Blue>192</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>0</Green> + <Blue>255</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>64</Green> + <Blue>64</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>128</Green> + <Blue>64</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>80</Red> + <Green>240</Green> + <Blue>120</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>64</Green> + <Blue>128</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>0</Green> + <Blue>64</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>0</Green> + <Blue>128</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>128</Green> + <Blue>64</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>128</Green> + <Blue>128</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>128</Green> + <Blue>255</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>64</Green> + <Blue>0</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>255</Green> + <Blue>255</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>128</Green> + <Blue>0</Blue> + </Entries> + </SeriesPalette> + <Series xsi:type="type:BarSeries"> + <Visible>true</Visible> + <Label> + <Caption> + <Value></Value> + <Font> + <Alignment/> + </Font> + </Caption> + <Background xsi:type="attribute:ColorDefinition"> + <Transparency>0</Transparency> + <Red>255</Red> + <Green>255</Green> + <Blue>255</Blue> + </Background> + <Outline> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + <Visible>false</Visible> + </Outline> + <Insets> + <Top>0.0</Top> + <Left>2.0</Left> + <Bottom>0.0</Bottom> + <Right>3.0</Right> + </Insets> + <Visible>false</Visible> + </Label> + <DataDefinition> + <Definition>row["numberExec"]</Definition> + </DataDefinition> + <SeriesIdentifier></SeriesIdentifier> + <DataPoint> + <Components> + <Type>Orthogonal_Value</Type> + </Components> + <Separator>, </Separator> + </DataPoint> + <LabelPosition>Outside</LabelPosition> + <Stacked>false</Stacked> + <Riser>Rectangle</Riser> + </Series> + <Grouping> + <Enabled>false</Enabled> + <GroupingInterval>2</GroupingInterval> + <GroupType>Text</GroupType> + <AggregateExpression>Sum</AggregateExpression> + </Grouping> + <Sorting>Ascending</Sorting> + </SeriesDefinitions> + <Orientation>Vertical</Orientation> + <LineAttributes> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + <Visible>true</Visible> + </LineAttributes> + <Label> + <Caption> + <Value></Value> + <Font> + <Alignment/> + </Font> + </Caption> + <Background xsi:type="attribute:ColorDefinition"> + <Transparency>0</Transparency> + <Red>255</Red> + <Green>255</Green> + <Blue>255</Blue> + </Background> + <Outline> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + </Outline> + <Insets> + <Top>0.0</Top> + <Left>2.0</Left> + <Bottom>0.0</Bottom> + <Right>3.0</Right> + </Insets> + <Visible>false</Visible> + </Label> + <LabelPosition>Left</LabelPosition> + <MajorGrid> + <LineAttributes> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>196</Red> + <Green>196</Green> + <Blue>196</Blue> + </Color> + <Visible>false</Visible> + </LineAttributes> + <TickStyle>Across</TickStyle> + <TickAttributes> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>196</Red> + <Green>196</Green> + <Blue>196</Blue> + </Color> + <Visible>true</Visible> + </TickAttributes> + </MajorGrid> + <MinorGrid> + <LineAttributes> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>225</Red> + <Green>225</Green> + <Blue>225</Blue> + </Color> + <Visible>false</Visible> + </LineAttributes> + <TickStyle>Across</TickStyle> + <TickAttributes> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>225</Red> + <Green>225</Green> + <Blue>225</Blue> + </Color> + <Visible>false</Visible> + </TickAttributes> + </MinorGrid> + <Scale> + <MinorGridsPerUnit>5</MinorGridsPerUnit> + </Scale> + <Origin> + <Type>Min</Type> + <Value xsi:type="data:NumberDataElement"> + <Value>0.0</Value> + </Value> + </Origin> + <PrimaryAxis>true</PrimaryAxis> + <Percent>false</Percent> + </AssociatedAxes> + <SeriesDefinitions> + <Query> + <Definition></Definition> + </Query> + <SeriesPalette> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>80</Red> + <Green>166</Green> + <Blue>218</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>242</Red> + <Green>88</Green> + <Blue>106</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>232</Red> + <Green>172</Green> + <Blue>57</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>255</Green> + <Blue>128</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>64</Red> + <Green>128</Green> + <Blue>128</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>128</Green> + <Blue>192</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>170</Red> + <Green>85</Green> + <Blue>85</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>128</Green> + <Blue>0</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>192</Red> + <Green>192</Green> + <Blue>192</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>255</Green> + <Blue>128</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>192</Green> + <Blue>128</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>7</Red> + <Green>146</Green> + <Blue>94</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>128</Green> + <Blue>255</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>128</Green> + <Blue>192</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>255</Green> + <Blue>255</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>128</Green> + <Blue>128</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>128</Green> + <Blue>192</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>128</Green> + <Blue>192</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>0</Green> + <Blue>255</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>64</Green> + <Blue>64</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>128</Green> + <Blue>64</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>80</Red> + <Green>240</Green> + <Blue>120</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>64</Green> + <Blue>128</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>0</Green> + <Blue>64</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>0</Green> + <Blue>128</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>128</Green> + <Blue>64</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>128</Green> + <Blue>128</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>128</Green> + <Blue>255</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>64</Green> + <Blue>0</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>255</Green> + <Blue>255</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>128</Green> + <Blue>0</Blue> + </Entries> + </SeriesPalette> + <Series> + <Visible>true</Visible> + <Label> + <Caption> + <Value></Value> + <Font> + <Alignment/> + </Font> + </Caption> + <Background xsi:type="attribute:ColorDefinition"> + <Transparency>0</Transparency> + <Red>255</Red> + <Green>255</Green> + <Blue>255</Blue> + </Background> + <Outline> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + <Visible>false</Visible> + </Outline> + <Insets> + <Top>0.0</Top> + <Left>2.0</Left> + <Bottom>0.0</Bottom> + <Right>3.0</Right> + </Insets> + <Visible>false</Visible> + </Label> + <DataDefinition> + <Definition>row["NAME_"]</Definition> + </DataDefinition> + <SeriesIdentifier></SeriesIdentifier> + <DataPoint> + <Components> + <Type>Orthogonal_Value</Type> + </Components> + <Separator>, </Separator> + </DataPoint> + <LabelPosition>Outside</LabelPosition> + <Stacked>false</Stacked> + </Series> + <Grouping> + <Enabled>false</Enabled> + <GroupingInterval>2</GroupingInterval> + <GroupType>Text</GroupType> + <AggregateExpression>Sum</AggregateExpression> + </Grouping> + </SeriesDefinitions> + <Orientation>Horizontal</Orientation> + <LineAttributes> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + <Visible>true</Visible> + </LineAttributes> + <Label> + <Caption> + <Value></Value> + <Font> + <Alignment/> + </Font> + </Caption> + <Background xsi:type="attribute:ColorDefinition"> + <Transparency>0</Transparency> + <Red>255</Red> + <Green>255</Green> + <Blue>255</Blue> + </Background> + <Outline> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + </Outline> + <Insets> + <Top>0.0</Top> + <Left>2.0</Left> + <Bottom>0.0</Bottom> + <Right>3.0</Right> + </Insets> + <Visible>true</Visible> + </Label> + <LabelPosition>Below</LabelPosition> + <MajorGrid> + <LineAttributes> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>196</Red> + <Green>196</Green> + <Blue>196</Blue> + </Color> + <Visible>false</Visible> + </LineAttributes> + <TickStyle>Across</TickStyle> + <TickAttributes> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>196</Red> + <Green>196</Green> + <Blue>196</Blue> + </Color> + <Visible>true</Visible> + </TickAttributes> + </MajorGrid> + <MinorGrid> + <LineAttributes> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>225</Red> + <Green>225</Green> + <Blue>225</Blue> + </Color> + <Visible>false</Visible> + </LineAttributes> + <TickStyle>Across</TickStyle> + <TickAttributes> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>225</Red> + <Green>225</Green> + <Blue>225</Blue> + </Color> + <Visible>false</Visible> + </TickAttributes> + </MinorGrid> + <Scale> + <MinorGridsPerUnit>5</MinorGridsPerUnit> + </Scale> + <Origin> + <Type>Min</Type> + <Value xsi:type="data:NumberDataElement"> + <Value>0.0</Value> + </Value> + </Origin> + <PrimaryAxis>true</PrimaryAxis> + <CategoryAxis>true</CategoryAxis> + <Percent>false</Percent> + </Axes> + <Orientation>Horizontal</Orientation> + <UnitSpacing>50.0</UnitSpacing> + <Rotation/> +</model:ChartWithAxes> +]]></xml-property> + <property name="outputFormat">SVG</property> + <property name="dataSet">ProcessActivity</property> + <property name="height">130pt</property> + <property name="width">212pt</property> + <list-property name="boundDataColumns"> + <structure> + <property name="name">numberExec</property> + <expression name="expression">dataSetRow["numberExec"]</expression> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="name">NAME_</property> + <expression name="expression">dataSetRow["NAME_"]</expression> + <property name="dataType">string</property> + </structure> + </list-property> + </extended-item> + </cell> + <cell id="61"> + <extended-item extensionName="Chart" name="NewChart1" id="68"> + <xml-property name="xmlRepresentation"><![CDATA[<model:ChartWithAxes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:attribute="http://www.birt.eclipse.org/ChartModelAttribute" xmlns:data="http://www.birt.eclipse.org/ChartModelData" xmlns:layout="http://www.birt.eclipse.org/ChartModelLayout" xmlns:model="http://www.birt.eclipse.org/ChartModel" xmlns:type="http://www.birt.eclipse.org/ChartModelType"> + <Type>Bar Chart</Type> + <SubType>Side-by-side</SubType> + <Block> + <Children xsi:type="layout:TitleBlock"> + <Bounds> + <Left>0.0</Left> + <Top>0.0</Top> + <Width>0.0</Width> + <Height>0.0</Height> + </Bounds> + <Insets> + <Top>3.0</Top> + <Left>3.0</Left> + <Bottom>3.0</Bottom> + <Right>3.0</Right> + </Insets> + <Row>-1</Row> + <Column>-1</Column> + <Rowspan>-1</Rowspan> + <Columnspan>-1</Columnspan> + <Outline> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + <Visible>false</Visible> + </Outline> + <Visible>true</Visible> + <Label> + <Caption> + <Value>Task assignments</Value> + <Font> + <Size>16.0</Size> + <Bold>true</Bold> + <Alignment> + <horizontalAlignment>Center</horizontalAlignment> + <verticalAlignment>Center</verticalAlignment> + </Alignment> + </Font> + </Caption> + <Background xsi:type="attribute:ColorDefinition"> + <Transparency>0</Transparency> + <Red>255</Red> + <Green>255</Green> + <Blue>255</Blue> + </Background> + <Outline> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + </Outline> + <Insets> + <Top>0.0</Top> + <Left>2.0</Left> + <Bottom>0.0</Bottom> + <Right>3.0</Right> + </Insets> + <Visible>true</Visible> + </Label> + </Children> + <Children xsi:type="layout:Plot"> + <Bounds> + <Left>0.0</Left> + <Top>0.0</Top> + <Width>0.0</Width> + <Height>0.0</Height> + </Bounds> + <Insets> + <Top>3.0</Top> + <Left>3.0</Left> + <Bottom>3.0</Bottom> + <Right>3.0</Right> + </Insets> + <Row>-1</Row> + <Column>-1</Column> + <Rowspan>-1</Rowspan> + <Columnspan>-1</Columnspan> + <Outline> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + <Visible>false</Visible> + </Outline> + <Visible>true</Visible> + <HorizontalSpacing>5</HorizontalSpacing> + <VerticalSpacing>5</VerticalSpacing> + <ClientArea> + <Outline> + <Style>Solid</Style> + <Thickness>0</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + <Visible>false</Visible> + </Outline> + <Insets> + <Top>0.0</Top> + <Left>0.0</Left> + <Bottom>0.0</Bottom> + <Right>0.0</Right> + </Insets> + </ClientArea> + </Children> + <Children xsi:type="layout:Legend"> + <Bounds> + <Left>0.0</Left> + <Top>0.0</Top> + <Width>0.0</Width> + <Height>0.0</Height> + </Bounds> + <Insets> + <Top>3.0</Top> + <Left>3.0</Left> + <Bottom>3.0</Bottom> + <Right>3.0</Right> + </Insets> + <Row>-1</Row> + <Column>-1</Column> + <Rowspan>-1</Rowspan> + <Columnspan>-1</Columnspan> + <Outline> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + <Visible>false</Visible> + </Outline> + <Visible>false</Visible> + <ClientArea> + <Outline> + <Style>Solid</Style> + <Thickness>0</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + <Visible>false</Visible> + </Outline> + <Insets> + <Top>2.0</Top> + <Left>2.0</Left> + <Bottom>2.0</Bottom> + <Right>2.0</Right> + </Insets> + </ClientArea> + <Text> + <Value></Value> + <Font> + <Alignment/> + </Font> + </Text> + <Orientation>Vertical</Orientation> + <Direction>Top_Bottom</Direction> + <Separator> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + <Visible>true</Visible> + </Separator> + <Position>Right</Position> + <ItemType>Series</ItemType> + <Title> + <Caption> + <Value>Assigments</Value> + <Font> + <Alignment/> + </Font> + </Caption> + <Background xsi:type="attribute:ColorDefinition"> + <Transparency>0</Transparency> + <Red>255</Red> + <Green>255</Green> + <Blue>255</Blue> + </Background> + <Outline> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + <Visible>false</Visible> + </Outline> + <Insets> + <Top>0.0</Top> + <Left>2.0</Left> + <Bottom>0.0</Bottom> + <Right>3.0</Right> + </Insets> + <Visible>false</Visible> + </Title> + <TitlePosition>Above</TitlePosition> + <ShowValue>false</ShowValue> + </Children> + <Bounds> + <Left>0.0</Left> + <Top>0.0</Top> + <Width>212.0</Width> + <Height>130.0</Height> + </Bounds> + <Insets> + <Top>3.0</Top> + <Left>3.0</Left> + <Bottom>3.0</Bottom> + <Right>3.0</Right> + </Insets> + <Row>-1</Row> + <Column>-1</Column> + <Rowspan>-1</Rowspan> + <Columnspan>-1</Columnspan> + <Outline> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + <Visible>false</Visible> + </Outline> + <Visible>true</Visible> + </Block> + <Dimension>Two_Dimensional</Dimension> + <Units>Points</Units> + <SeriesThickness>10.0</SeriesThickness> + <SampleData> + <BaseSampleData> + <DataSetRepresentation>A, B, C</DataSetRepresentation> + </BaseSampleData> + <OrthogonalSampleData> + <DataSetRepresentation>5.0,4.0,12.0</DataSetRepresentation> + <SeriesDefinitionIndex>0</SeriesDefinitionIndex> + </OrthogonalSampleData> + </SampleData> + <Interactivity> + <LegendBehavior>None</LegendBehavior> + </Interactivity> + <Axes> + <Type>Text</Type> + <Title> + <Caption> + <Value>X-Axis Title</Value> + <Font> + <Size>14.0</Size> + <Bold>true</Bold> + <Alignment> + <horizontalAlignment>Center</horizontalAlignment> + <verticalAlignment>Center</verticalAlignment> + </Alignment> + </Font> + </Caption> + <Background xsi:type="attribute:ColorDefinition"> + <Transparency>0</Transparency> + <Red>255</Red> + <Green>255</Green> + <Blue>255</Blue> + </Background> + <Outline> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + </Outline> + <Insets> + <Top>0.0</Top> + <Left>2.0</Left> + <Bottom>0.0</Bottom> + <Right>3.0</Right> + </Insets> + <Visible>false</Visible> + </Title> + <TitlePosition>Below</TitlePosition> + <AssociatedAxes> + <Type>Logarithmic</Type> + <Title> + <Caption> + <Value>Y-Axis Title</Value> + <Font> + <Size>14.0</Size> + <Bold>true</Bold> + <Alignment> + <horizontalAlignment>Center</horizontalAlignment> + <verticalAlignment>Center</verticalAlignment> + </Alignment> + <Rotation>90.0</Rotation> + </Font> + </Caption> + <Background xsi:type="attribute:ColorDefinition"> + <Transparency>0</Transparency> + <Red>255</Red> + <Green>255</Green> + <Blue>255</Blue> + </Background> + <Outline> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + </Outline> + <Insets> + <Top>0.0</Top> + <Left>2.0</Left> + <Bottom>0.0</Bottom> + <Right>3.0</Right> + </Insets> + <Visible>false</Visible> + </Title> + <TitlePosition>Left</TitlePosition> + <SeriesDefinitions> + <Query> + <Definition></Definition> + </Query> + <SeriesPalette> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>80</Red> + <Green>166</Green> + <Blue>218</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>242</Red> + <Green>88</Green> + <Blue>106</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>232</Red> + <Green>172</Green> + <Blue>57</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>255</Green> + <Blue>128</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>64</Red> + <Green>128</Green> + <Blue>128</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>128</Green> + <Blue>192</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>170</Red> + <Green>85</Green> + <Blue>85</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>128</Green> + <Blue>0</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>192</Red> + <Green>192</Green> + <Blue>192</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>255</Green> + <Blue>128</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>192</Green> + <Blue>128</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>7</Red> + <Green>146</Green> + <Blue>94</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>128</Green> + <Blue>255</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>128</Green> + <Blue>192</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>255</Green> + <Blue>255</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>128</Green> + <Blue>128</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>128</Green> + <Blue>192</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>128</Green> + <Blue>192</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>0</Green> + <Blue>255</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>64</Green> + <Blue>64</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>128</Green> + <Blue>64</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>80</Red> + <Green>240</Green> + <Blue>120</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>64</Green> + <Blue>128</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>0</Green> + <Blue>64</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>0</Green> + <Blue>128</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>128</Green> + <Blue>64</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>128</Green> + <Blue>128</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>128</Green> + <Blue>255</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>64</Green> + <Blue>0</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>255</Green> + <Blue>255</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>128</Green> + <Blue>0</Blue> + </Entries> + </SeriesPalette> + <Series xsi:type="type:BarSeries"> + <Visible>true</Visible> + <Label> + <Caption> + <Value></Value> + <Font> + <Alignment/> + </Font> + </Caption> + <Background xsi:type="attribute:ColorDefinition"> + <Transparency>0</Transparency> + <Red>255</Red> + <Green>255</Green> + <Blue>255</Blue> + </Background> + <Outline> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + <Visible>false</Visible> + </Outline> + <Insets> + <Top>0.0</Top> + <Left>2.0</Left> + <Bottom>0.0</Bottom> + <Right>3.0</Right> + </Insets> + <Visible>false</Visible> + </Label> + <DataDefinition> + <Definition>row["count(TASKINSTANCE_)"]</Definition> + </DataDefinition> + <SeriesIdentifier></SeriesIdentifier> + <DataPoint> + <Components> + <Type>Orthogonal_Value</Type> + </Components> + <Separator>, </Separator> + </DataPoint> + <LabelPosition>Outside</LabelPosition> + <Stacked>false</Stacked> + <Riser>Rectangle</Riser> + </Series> + <Grouping> + <Enabled>false</Enabled> + <GroupingInterval>2</GroupingInterval> + <GroupType>Text</GroupType> + <AggregateExpression>Sum</AggregateExpression> + </Grouping> + <Sorting>Ascending</Sorting> + </SeriesDefinitions> + <Orientation>Vertical</Orientation> + <LineAttributes> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + <Visible>true</Visible> + </LineAttributes> + <Label> + <Caption> + <Value></Value> + <Font> + <Alignment/> + </Font> + </Caption> + <Background xsi:type="attribute:ColorDefinition"> + <Transparency>0</Transparency> + <Red>255</Red> + <Green>255</Green> + <Blue>255</Blue> + </Background> + <Outline> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + </Outline> + <Insets> + <Top>0.0</Top> + <Left>2.0</Left> + <Bottom>0.0</Bottom> + <Right>3.0</Right> + </Insets> + <Visible>false</Visible> + </Label> + <LabelPosition>Left</LabelPosition> + <MajorGrid> + <LineAttributes> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>196</Red> + <Green>196</Green> + <Blue>196</Blue> + </Color> + <Visible>false</Visible> + </LineAttributes> + <TickStyle>Across</TickStyle> + <TickAttributes> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>196</Red> + <Green>196</Green> + <Blue>196</Blue> + </Color> + <Visible>true</Visible> + </TickAttributes> + </MajorGrid> + <MinorGrid> + <LineAttributes> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>225</Red> + <Green>225</Green> + <Blue>225</Blue> + </Color> + <Visible>false</Visible> + </LineAttributes> + <TickStyle>Across</TickStyle> + <TickAttributes> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>225</Red> + <Green>225</Green> + <Blue>225</Blue> + </Color> + <Visible>false</Visible> + </TickAttributes> + </MinorGrid> + <Scale> + <MinorGridsPerUnit>5</MinorGridsPerUnit> + </Scale> + <Origin> + <Type>Min</Type> + <Value xsi:type="data:NumberDataElement"> + <Value>0.0</Value> + </Value> + </Origin> + <PrimaryAxis>true</PrimaryAxis> + <Percent>false</Percent> + </AssociatedAxes> + <SeriesDefinitions> + <Query> + <Definition></Definition> + </Query> + <SeriesPalette> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>80</Red> + <Green>166</Green> + <Blue>218</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>242</Red> + <Green>88</Green> + <Blue>106</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>232</Red> + <Green>172</Green> + <Blue>57</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>255</Green> + <Blue>128</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>64</Red> + <Green>128</Green> + <Blue>128</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>128</Green> + <Blue>192</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>170</Red> + <Green>85</Green> + <Blue>85</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>128</Green> + <Blue>0</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>192</Red> + <Green>192</Green> + <Blue>192</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>255</Green> + <Blue>128</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>192</Green> + <Blue>128</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>7</Red> + <Green>146</Green> + <Blue>94</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>128</Green> + <Blue>255</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>128</Green> + <Blue>192</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>255</Green> + <Blue>255</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>128</Green> + <Blue>128</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>128</Green> + <Blue>192</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>128</Green> + <Blue>192</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>0</Green> + <Blue>255</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>64</Green> + <Blue>64</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>128</Green> + <Blue>64</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>80</Red> + <Green>240</Green> + <Blue>120</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>64</Green> + <Blue>128</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>0</Green> + <Blue>64</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>0</Green> + <Blue>128</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>128</Green> + <Blue>64</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>128</Green> + <Blue>128</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>128</Green> + <Blue>255</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>64</Green> + <Blue>0</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>255</Green> + <Blue>255</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>128</Green> + <Blue>0</Blue> + </Entries> + </SeriesPalette> + <Series> + <Visible>true</Visible> + <Label> + <Caption> + <Value></Value> + <Font> + <Alignment/> + </Font> + </Caption> + <Background xsi:type="attribute:ColorDefinition"> + <Transparency>0</Transparency> + <Red>255</Red> + <Green>255</Green> + <Blue>255</Blue> + </Background> + <Outline> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + <Visible>false</Visible> + </Outline> + <Insets> + <Top>0.0</Top> + <Left>2.0</Left> + <Bottom>0.0</Bottom> + <Right>3.0</Right> + </Insets> + <Visible>false</Visible> + </Label> + <DataDefinition> + <Definition>row["TASKACTORID_"]</Definition> + </DataDefinition> + <SeriesIdentifier></SeriesIdentifier> + <DataPoint> + <Components> + <Type>Orthogonal_Value</Type> + </Components> + <Separator>, </Separator> + </DataPoint> + <LabelPosition>Outside</LabelPosition> + <Stacked>false</Stacked> + </Series> + <Grouping> + <Enabled>false</Enabled> + <GroupingInterval>2</GroupingInterval> + <GroupType>Text</GroupType> + <AggregateExpression>Sum</AggregateExpression> + </Grouping> + </SeriesDefinitions> + <Orientation>Horizontal</Orientation> + <LineAttributes> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + <Visible>true</Visible> + </LineAttributes> + <Label> + <Caption> + <Value></Value> + <Font> + <Alignment/> + </Font> + </Caption> + <Background xsi:type="attribute:ColorDefinition"> + <Transparency>0</Transparency> + <Red>255</Red> + <Green>255</Green> + <Blue>255</Blue> + </Background> + <Outline> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + </Outline> + <Insets> + <Top>0.0</Top> + <Left>2.0</Left> + <Bottom>0.0</Bottom> + <Right>3.0</Right> + </Insets> + <Visible>true</Visible> + </Label> + <LabelPosition>Below</LabelPosition> + <MajorGrid> + <LineAttributes> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>196</Red> + <Green>196</Green> + <Blue>196</Blue> + </Color> + <Visible>false</Visible> + </LineAttributes> + <TickStyle>Across</TickStyle> + <TickAttributes> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>196</Red> + <Green>196</Green> + <Blue>196</Blue> + </Color> + <Visible>true</Visible> + </TickAttributes> + </MajorGrid> + <MinorGrid> + <LineAttributes> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>225</Red> + <Green>225</Green> + <Blue>225</Blue> + </Color> + <Visible>false</Visible> + </LineAttributes> + <TickStyle>Across</TickStyle> + <TickAttributes> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>225</Red> + <Green>225</Green> + <Blue>225</Blue> + </Color> + <Visible>false</Visible> + </TickAttributes> + </MinorGrid> + <Scale> + <MinorGridsPerUnit>5</MinorGridsPerUnit> + </Scale> + <Origin> + <Type>Min</Type> + <Value xsi:type="data:NumberDataElement"> + <Value>0.0</Value> + </Value> + </Origin> + <PrimaryAxis>true</PrimaryAxis> + <CategoryAxis>true</CategoryAxis> + <Percent>false</Percent> + </Axes> + <Orientation>Horizontal</Orientation> + <UnitSpacing>50.0</UnitSpacing> + <Rotation/> +</model:ChartWithAxes> +]]></xml-property> + <property name="outputFormat">SVG</property> + <property name="dataSet">NumberOfAssignments</property> + <property name="height">130pt</property> + <property name="width">212pt</property> + <list-property name="boundDataColumns"> + <structure> + <property name="name">count(TASKINSTANCE_)</property> + <expression name="expression">dataSetRow["count(TASKINSTANCE_)"]</expression> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="name">TASKACTORID_</property> + <expression name="expression">dataSetRow["TASKACTORID_"]</expression> + <property name="dataType">string</property> + </structure> + </list-property> + </extended-item> + </cell> + </row> + </detail> + <footer> + <row id="62"> + <cell id="63"/> + <cell id="64"/> + </row> + </footer> + </table> + </body> +</report> Deleted: projects/balalaika/trunk/parent.iml =================================================================== --- projects/balalaika/trunk/parent.iml 2008-12-04 20:48:14 UTC (rev 3205) +++ projects/balalaika/trunk/parent.iml 2008-12-04 21:17:58 UTC (rev 3206) @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module version="4" relativePaths="true" type="JAVA_MODULE"> - <component name="ModuleRootManager" /> - <component name="NewModuleRootManager" inherit-compiler-output="true"> - <exclude-output /> - <content url="file://$MODULE_DIR$" /> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - <orderEntryProperties /> - </component> -</module> -

15 years, 6 months

1
0
0 / 0

JBoss JBPM SVN: r3205 - projects/gwt-console/trunk/server/src/main/resources.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-12-04 15:48:14 -0500 (Thu, 04 Dec 2008) New Revision: 3205 Modified: projects/gwt-console/trunk/server/src/main/resources/instance_report.rptconfig projects/gwt-console/trunk/server/src/main/resources/instance_report.rptdesign projects/gwt-console/trunk/server/src/main/resources/process_activity.rptdesign Log: Set default report datasource java:/JbpmDS Modified: projects/gwt-console/trunk/server/src/main/resources/instance_report.rptconfig =================================================================== --- projects/gwt-console/trunk/server/src/main/resources/instance_report.rptconfig 2008-12-04 20:04:55 UTC (rev 3204) +++ projects/gwt-console/trunk/server/src/main/resources/instance_report.rptconfig 2008-12-04 20:48:14 UTC (rev 3205) @@ -3,11 +3,11 @@ <list-property name="configVars"> <structure> <property name="name">__isdisplay__name_283_0</property> - <property name="value">TaskAssignmentExample</property> + <property name="value">simple</property> </structure> <structure> <property name="name">name_283_1</property> - <property name="value">TaskAssignmentExample</property> + <property name="value">simple</property> </structure> <structure> <property name="name">name_283_type_</property> Modified: projects/gwt-console/trunk/server/src/main/resources/instance_report.rptdesign =================================================================== --- projects/gwt-console/trunk/server/src/main/resources/instance_report.rptdesign 2008-12-04 20:04:55 UTC (rev 3204) +++ projects/gwt-console/trunk/server/src/main/resources/instance_report.rptdesign 2008-12-04 20:48:14 UTC (rev 3205) @@ -28,6 +28,7 @@ <property name="odaDriverClass">com.mysql.jdbc.Driver</property> <property name="odaURL">jdbc:mysql://localhost:3306/jbpmtest</property> <property name="odaUser">jbpmtest</property> + <property name="odaJndiName">java:/JbpmDS</property> </oda-data-source> </data-sources> <data-sets> @@ -392,7 +393,7 @@ </list-property> <method name="onCreate"><![CDATA[// make dataset values available as global variables var q3Value = this.getRowData().getColumnValue("q3"); -var q1Value = this.getRowData().getColumnValue("exec"); +var q1Value = this.getRowData().getColumnValue("q1"); reportContext.setGlobalVariable("q3", q3Value); reportContext.setGlobalVariable("q1", q1Value);]]></method> <column id="258"/> Modified: projects/gwt-console/trunk/server/src/main/resources/process_activity.rptdesign =================================================================== --- projects/gwt-console/trunk/server/src/main/resources/process_activity.rptdesign 2008-12-04 20:04:55 UTC (rev 3204) +++ projects/gwt-console/trunk/server/src/main/resources/process_activity.rptdesign 2008-12-04 20:48:14 UTC (rev 3205) @@ -12,6 +12,7 @@ <property name="odaDriverClass">com.mysql.jdbc.Driver</property> <property name="odaURL">jdbc:mysql://localhost:3306/jbpmtest</property> <property name="odaUser">jbpmtest</property> + <property name="odaJndiName">java:/JbpmDS</property> </oda-data-source> <script-data-source name="ScriptedDS" id="51"/> </data-sources>

15 years, 6 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jbpm-commits December 2008