jbpm-commits December 2008

jbpm-commits@lists.jboss.org

1 participants
427 discussions

JBoss JBPM SVN: r3234 - in projects/spec/trunk/modules: api/src/main/java/org/jboss/bpm/api/config and 49 other directories.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-12-05 12:49:30 -0500 (Fri, 05 Dec 2008) New Revision: 3234 Added: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/config/ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/config/Configuration.java projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/config/ConfigurationProvider.java projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/ProcessInstance.java projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessEngine.java projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessEngineSupport.java projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/client/ProcessInstanceExt.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ProcessInstanceImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessEngineImpl.java projects/spec/trunk/modules/ri/src/main/resources/org.jboss.bpm.api.config.ConfigurationProvider Removed: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/client/ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/Process.java projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/client/ProcessExt.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/ProcessEngineImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ProcessImpl.java projects/spec/trunk/modules/ri/src/main/resources/org.jboss.bpm.api.client.ConfigurationProvider Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/AbstractElement.java projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/Node.java projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/ProcessDefinition.java projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/builder/ProcessBuilder.java projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/runtime/Token.java projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/DialectHandler.java projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessBuilderService.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/Service.java projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/internal/AbstractDialectHandler.java projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/internal/AbstractService.java projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/APITestCase.java projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/CTSTestCase.java projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/ProcessCatalog.java projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/ProcessCatalogExt.java projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/client/UserTaskCallback.java projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/model/builder/ProcessBuilderExt.java projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/runtime/FlowHandler.java projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/runtime/SignalHandler.java projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/MessageBuilderService.java 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/PersistenceService.java projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/SignalBuilderService.java projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/SignalService.java projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/ThreadingService.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/processengine/ProcessEngineTest.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/WaitStateTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/endevent/EndEventMessageTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/exclusive/ExclusiveGatewayMergeTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/inclusive/InclusiveGatewayMergeTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/inclusive/InclusiveGatewaySplitTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/parallel/ParallelGatewayMergeTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/parallel/ParallelGatewaySplitTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/node/NodeInputSetTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/node/NodeOutputSetTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/node/NodePropertyTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/process/ProcessPropertyTest.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/java/JavaTaskTest.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/send/SendTaskTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/user/UserTaskCallbackTest.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/TxRequiredTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/exclusivechoice/ExclusiveChoiceTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/multichoice/MultiChoiceTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/parallelsplit/ParallelSplitTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/sequence/SequenceTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/simplemerge/SimpleMergeTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/synchronization/SynchronizationTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/data/casedata/CaseDataTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/data/taskdata/TaskDataTest.java projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshallerExt.java projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/ProcessDefinitionAdapter.java projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/ProcessUnmarshaller.java projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/WorkflowProcessAdapter.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/AbstractElementImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/EndEventImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/EventImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/GatewayImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/NodeImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ProcessDefinitionImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ProcessStructureImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ReceiveTaskImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/SendTaskImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/StartEventImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/TaskImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/UserTaskImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/builder/ProcessBuilderImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/DelegatingAttachments.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/DelegatingToken.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/InProcessTokenExecutor.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/MessageSender.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/PersistenceSessionInterceptor.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/RunnableToken.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/RuntimeProcess.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/RuntimeProcessImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/ThreadingTokenExecutor.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/TokenImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/TransactionInterceptor.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/DialectHandlerServiceImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/HibernatePersistenceServiceImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/InMemoryPersistenceServiceImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/MessageBuilderServiceImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/MessageServiceImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/MutableService.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessBuilderServiceImpl.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/SignalBuilderServiceImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/SignalServiceImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ThreadingServiceImpl.java projects/spec/trunk/modules/ri/src/main/resources/jbpm-cfg-beans.xml projects/spec/trunk/modules/ri/src/test/java/org/jboss/bpm/test/ri/service/persistence/ProcessDefinitionPersistenceTest.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/AirticketProcessBuilder.java 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/resources/jbpm-beans.xml projects/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java Log: Cleanup API packages Added: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/config/Configuration.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/config/Configuration.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/config/Configuration.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -0,0 +1,121 @@ +/* + * 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.jboss.bpm.api.config; + +//$Id$ + +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.net.URL; + +import org.jboss.bpm.api.service.ProcessEngine; + +/** + * The Configuration provides a ProcessEngine through a ConfigurationProvider + * + * A ConfigurationProvider is discovered in two stages + * + * + * <ol> + * <li>Read the configuration provider class name from a system property + * <li>Read the configuration provider class name from a resource file + * </ol> + * + * In both cases the key is the fully qalified name of the {@link ConfigurationProvider} interface. + * + * @author thomas.diesler(a)jboss.com + * @since 18-Jun-2008 + */ +public abstract class Configuration +{ + private static ConfigurationProvider provider; + + /** + * Create a new instance of ProcessEngine for this configuration + * + * @return The configured instance of a process engine + */ + public static ProcessEngine getProcessEngine() + { + return getConfigurationProvider().getProcessEngine(); + } + + /** + * Get a ProcessEngine with a given name from this configuration + * + * @return The configured instance of a process engine + */ + public static ProcessEngine getProcessEngine(URL cfgURL) + { + return getConfigurationProvider().getProcessEngine(cfgURL); + } + + /** + * Get a ProcessEngine with a given name from this configuration + * + * @return The configured instance of a process engine + */ + public static ProcessEngine getProcessEngine(String cfgXML) + { + return getConfigurationProvider().getProcessEngine(cfgXML); + } + + private static ConfigurationProvider getConfigurationProvider() + { + if (provider == null) + { + // Get the provider name from the System property + String providerName = System.getProperty(ConfigurationProvider.class.getName()); + + // Get the provider name from the resource file + if (providerName == null) + { + ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader(); + URL providerURL = ctxLoader.getResource(ConfigurationProvider.class.getName()); + if (providerURL == null) + throw new IllegalStateException("Cannot find resource: " + ConfigurationProvider.class.getName()); + + try + { + providerName = new BufferedReader(new InputStreamReader(providerURL.openStream())).readLine(); + } + catch (Exception e) + { + throw new IllegalStateException("Cannot read configuration provider name from: " + providerURL); + } + } + + // Load the config provider + try + { + ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader(); + Class<?> providerClass = ctxLoader.loadClass(providerName); + provider = (ConfigurationProvider)providerClass.newInstance(); + } + catch (Exception e) + { + throw new IllegalStateException("Cannot load configuration provider: " + providerName); + } + } + return provider; + } +} \ No newline at end of file Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/config/Configuration.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/config/ConfigurationProvider.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/config/ConfigurationProvider.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/config/ConfigurationProvider.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -0,0 +1,55 @@ +/* + * 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.jboss.bpm.api.config; + +//$Id$ + +import java.net.URL; + +import org.jboss.bpm.api.service.ProcessEngine; + +/** + * The ConfigurationProvider provides a ProcessEngine + * + * @author thomas.diesler(a)jboss.com + * @since 18-Jun-2008 + */ +public interface ConfigurationProvider +{ + /** + * Get a ProcessEngine from this ConfigurationProvider + * @return The configured instance of a process engine + */ + ProcessEngine getProcessEngine(); + + /** + * Get a ProcessEngine that is configured with a given config file + * @return The configured instance of a process engine + */ + ProcessEngine getProcessEngine(URL cfgURL); + + /** + * Get a ProcessEngine that is configured with a given config string + * @return The configured instance of a process engine + */ + ProcessEngine getProcessEngine(String cfgXML); +} \ No newline at end of file Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/config/ConfigurationProvider.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/AbstractElement.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/AbstractElement.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/AbstractElement.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -27,13 +27,15 @@ import javax.management.ObjectName; +import org.jboss.bpm.api.service.ProcessEngineSupport; + /** * The parrent of all Elements * * @author thomas.diesler(a)jboss.com * @since 08-Jul-2008 */ -public interface AbstractElement extends Serializable +public interface AbstractElement extends ProcessEngineSupport, Serializable { /** * Get the ID of this element Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/Node.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/Node.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/Node.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -40,7 +40,7 @@ /** * Get the associated process */ - Process getProcess(); + ProcessInstance getProcess(); /** * Get the unique name. Deleted: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/Process.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/Process.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/Process.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -1,109 +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.jboss.bpm.api.model; - -//$Id$ - -import java.util.Date; -import java.util.Set; - -import org.jboss.bpm.api.client.ProcessEngine; -import org.jboss.bpm.api.runtime.Attachments; -import org.jboss.bpm.api.runtime.Token; - -/** - * A Process is any Activity performed within a company or organization. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface Process extends ProcessStructure -{ - /** - * Defines the status a {@link Process} can be in - */ - public enum ProcessStatus - { - None, Ready, Active, Suspended, Cancelled, Aborted, Completed - } - - /** - * Get the associated ProcessEngine - */ - ProcessEngine getProcessEngine(); - - /** - * Get the associated ProcessDefinition - */ - ProcessDefinition getProcessDefinition(); - - /** - * Get the process state - */ - ProcessStatus getProcessStatus(); - - /** - * Get the root Token associated with this Process - */ - Token getRootToken(); - - /** - * Get the set of Tokens associated with this Process - */ - Set<Token> getTokens(); - - /** - * Start the process - */ - Token startProcess(); - - /** - * Start the process, with a given context data - */ - Token startProcess(Attachments att); - - /** - * Get the start date of this process - */ - Date getStartDate(); - - /** - * Get the end date of this process - * @return null if not ended - */ - Date getEndDate(); - - /** - * Suspend the process - */ - void suspend(); - - /** - * Resume the process - */ - void resume(); - - /** - * Cancel the process - */ - void cancel(); -} \ No newline at end of file Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/ProcessDefinition.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/ProcessDefinition.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/ProcessDefinition.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -23,7 +23,7 @@ //$Id$ -import org.jboss.bpm.api.client.ProcessEngine; +import org.jboss.bpm.api.service.ProcessEngine; /** * A ProcessDefinition defines the structure of an activity performed within a company or organization. @@ -36,7 +36,7 @@ /** * Create a new instance of this process definition */ - Process newInstance(); + ProcessInstance newInstance(); /** * Get the associated ProcessEngine Copied: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/ProcessInstance.java (from rev 3233, projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/Process.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/ProcessInstance.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/ProcessInstance.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -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.jboss.bpm.api.model; + +//$Id$ + +import java.util.Date; +import java.util.Set; + +import org.jboss.bpm.api.runtime.Attachments; +import org.jboss.bpm.api.runtime.Token; +import org.jboss.bpm.api.service.ProcessEngine; + +/** + * A Process is any Activity performed within a company or organization. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface ProcessInstance extends ProcessStructure +{ + /** + * Defines the status a {@link ProcessInstance} can be in + */ + public enum ProcessStatus + { + None, Ready, Active, Suspended, Cancelled, Aborted, Completed + } + + /** + * Get the associated ProcessEngine + */ + ProcessEngine getProcessEngine(); + + /** + * Get the associated ProcessDefinition + */ + ProcessDefinition getProcessDefinition(); + + /** + * Get the process state + */ + ProcessStatus getProcessStatus(); + + /** + * Get the root Token associated with this Process + */ + Token getRootToken(); + + /** + * Get the set of Tokens associated with this Process + */ + Set<Token> getTokens(); + + /** + * Start the process + */ + Token startProcess(); + + /** + * Start the process, with a given context data + */ + Token startProcess(Attachments att); + + /** + * Get the start date of this process + */ + Date getStartDate(); + + /** + * Get the end date of this process + * @return null if not ended + */ + Date getEndDate(); + + /** + * Suspend the process + */ + void suspend(); + + /** + * Resume the process + */ + void resume(); + + /** + * Cancel the process + */ + void cancel(); +} \ No newline at end of file Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/builder/ProcessBuilder.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/builder/ProcessBuilder.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/builder/ProcessBuilder.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -23,13 +23,13 @@ //$Id$ -import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.ProcessInstance; import org.jboss.bpm.api.model.ProcessDefinition; import org.jboss.bpm.api.model.Gateway.GatewayType; import org.jboss.bpm.api.model.Task.TaskType; /** - * The ProcessBuilder can be used to build a {@link Process} dynamically. + * The ProcessBuilder can be used to build a {@link ProcessInstance} dynamically. * * @author thomas.diesler(a)jboss.com * @since 08-Jul-2008 @@ -37,7 +37,7 @@ public interface ProcessBuilder { /** - * Add a {@link Process} with a given name + * Add a {@link ProcessInstance} with a given name */ ProcessBuilder addProcess(String name); Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/runtime/Token.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/runtime/Token.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/runtime/Token.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -27,10 +27,10 @@ import javax.management.ObjectName; -import org.jboss.bpm.api.client.ProcessEngine; import org.jboss.bpm.api.model.Node; -import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.ProcessInstance; import org.jboss.bpm.api.model.SequenceFlow; +import org.jboss.bpm.api.service.ProcessEngine; /** * A Token is a descriptive construct used to describe how the flow of a Process will proceed at runtime. @@ -57,9 +57,9 @@ ProcessEngine getProcessEngine(); /** - * Get the associated {@link Process} + * Get the associated {@link ProcessInstance} */ - Process getProcess(); + ProcessInstance getProcess(); /** * Get the unique token identity Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/DialectHandler.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/DialectHandler.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/DialectHandler.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -28,7 +28,6 @@ import java.net.URI; import java.net.URL; -import org.jboss.bpm.api.client.ProcessEngine; import org.jboss.bpm.api.model.ProcessDefinition; /** Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessBuilderService.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessBuilderService.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessBuilderService.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -23,12 +23,12 @@ //$Id$ -import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.ProcessInstance; import org.jboss.bpm.api.model.builder.ProcessBuilder; import org.jboss.bpm.api.service.internal.AbstractService; /** - * The ProcessBuilder can be used to build a {@link Process} dynamically. + * The ProcessBuilder can be used to build a {@link ProcessInstance} dynamically. * * @author thomas.diesler(a)jboss.com * @since 08-Jul-2008 Copied: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessEngine.java (from rev 3233, projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/client/ProcessEngine.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessEngine.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessEngine.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -0,0 +1,105 @@ +/* + * 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.jboss.bpm.api.service; + +//$Id$ + +import java.util.HashSet; +import java.util.Set; + +import org.jboss.bpm.api.config.Configuration; +import org.jboss.bpm.api.config.internal.MicrocontainerConfigurationProvider; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * The process engine is an agregator of various service objects used by the BPM engine. + * + * A ProcessEngine is always created via one of the available {@link Configuration} objects. Every implementation of the API has one default + * {@link Configuration} which is configured via a resource file with the fully qualified class name of {@link Configuration}. + * + * The API natively supports {@link MicrocontainerConfigurationProvider}. To create and register a ProcessEngine explicitly, you would do + * + * <pre> + * MicrocontainerConfiguration config = new MicrocontainerConfiguration(); + * ProcessEngine engine = config.deployBeansConfig(cfgURL).getProcessEngine("EngineBeanName"); + * ProcessEngineRegistry.registerProcessEngine(engine); + * </pre> + * + * @author thomas.diesler(a)jboss.com + * @since 18-Jun-2008 + */ +public class ProcessEngine +{ + // Provide logging + final static Logger log = LoggerFactory.getLogger(ProcessEngine.class); + + // The map of registered services + protected Set<Service> services = new HashSet<Service>(); + // The name of this engine + private String name; + + // Hide public constructor + protected ProcessEngine() + { + } + + /** + * Get the instance of the registered service + * + * @return null if there is no service registered for the given class + */ + @SuppressWarnings("unchecked") + public <T> T getService(Class<T> clazz) + { + Service service = null; + for (Service aux : services) + { + if (clazz.isAssignableFrom(aux.getClass())) + { + service = aux; + break; + } + } + return (T)service; + } + + /** + * Get the name of this engine + */ + public String getName() + { + return name; + } + + // Set the name of this engine + protected void setName(String name) + { + this.name = name; + } + + @Override + public String toString() + { + return "ProcessEngine[name=" + name + ",class=" + getClass().getName() + "]"; + } +} \ No newline at end of file Added: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessEngineSupport.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessEngineSupport.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessEngineSupport.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -0,0 +1,38 @@ +/* + * 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.jboss.bpm.api.service; + +//$Id$ + +/** + * Gives access to the ProcessEngine + * + * @author thomas.diesler(a)jboss.com + * @since 05-Dec-2008 + */ +public interface ProcessEngineSupport +{ + /** + * Get the associated ProcessEngine + */ + ProcessEngine getProcessEngine(); +} \ No newline at end of file Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessEngineSupport.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF 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 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessService.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -27,8 +27,8 @@ import javax.management.ObjectName; -import org.jboss.bpm.api.model.Process; -import org.jboss.bpm.api.model.Process.ProcessStatus; +import org.jboss.bpm.api.model.ProcessInstance; +import org.jboss.bpm.api.model.ProcessInstance.ProcessStatus; /** * The ProcessService is the entry point to create, find and otherwise manage processes. @@ -43,7 +43,7 @@ * Register a Process. * @return An implementation may return a proxied version of the given Process */ - Process registerProcess(Process proc); + ProcessInstance registerProcess(ProcessInstance proc); /** * Unregister a Process. @@ -53,7 +53,7 @@ /** * Get a Process for a given id */ - Process getProcess(ObjectName procID); + ProcessInstance getProcess(ObjectName procID); /** * Get the set of registered Processes Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/Service.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/Service.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/Service.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -21,9 +21,6 @@ */ package org.jboss.bpm.api.service; -import org.jboss.bpm.api.client.ProcessEngine; - - //$Id$ /** @@ -32,10 +29,6 @@ * @author thomas.diesler(a)jboss.com * @since 25-Sep-2008 */ -public interface Service +public interface Service extends ProcessEngineSupport { - /** - * Get the associated ProcessEngine - */ - ProcessEngine getProcessEngine(); } \ No newline at end of file Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/internal/AbstractDialectHandler.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/internal/AbstractDialectHandler.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/internal/AbstractDialectHandler.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -23,8 +23,8 @@ //$Id$ -import org.jboss.bpm.api.client.ProcessEngine; import org.jboss.bpm.api.service.DialectHandler; +import org.jboss.bpm.api.service.ProcessEngine; /** Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/internal/AbstractService.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/internal/AbstractService.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/internal/AbstractService.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -23,7 +23,7 @@ // $Id$ -import org.jboss.bpm.api.client.ProcessEngine; +import org.jboss.bpm.api.service.ProcessEngine; import org.jboss.bpm.api.service.Service; /** Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/APITestCase.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/APITestCase.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/APITestCase.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -30,9 +30,9 @@ import junit.framework.TestCase; import org.jboss.bpm.api.Constants; -import org.jboss.bpm.api.client.Configuration; -import org.jboss.bpm.api.client.ProcessEngine; +import org.jboss.bpm.api.config.Configuration; import org.jboss.bpm.api.model.builder.ObjectNameFactory; +import org.jboss.bpm.api.service.ProcessEngine; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/CTSTestCase.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/CTSTestCase.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/CTSTestCase.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -35,11 +35,11 @@ import javax.management.ObjectName; import org.jboss.bpm.api.BPMException; -import org.jboss.bpm.api.client.ProcessEngine; import org.jboss.bpm.api.model.ProcessDefinition; import org.jboss.bpm.api.service.DialectHandler; import org.jboss.bpm.api.service.DialectHandlerService; import org.jboss.bpm.api.service.ProcessDefinitionService; +import org.jboss.bpm.api.service.ProcessEngine; import org.jboss.bpm.incubator.client.MessageListener; import org.jboss.bpm.incubator.client.SignalListener; import org.jboss.bpm.incubator.model.Message; Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/ProcessCatalog.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/ProcessCatalog.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/ProcessCatalog.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -25,7 +25,6 @@ import junit.framework.TestCase; -import org.jboss.bpm.api.client.ProcessEngine; import org.jboss.bpm.api.model.EndEvent; import org.jboss.bpm.api.model.ProcessDefinition; import org.jboss.bpm.api.model.SequenceFlow; @@ -33,6 +32,7 @@ import org.jboss.bpm.api.model.Task; import org.jboss.bpm.api.model.builder.ProcessBuilder; import org.jboss.bpm.api.service.ProcessBuilderService; +import org.jboss.bpm.api.service.ProcessEngine; /** * A catalog of CTS test processes Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/ProcessCatalogExt.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/ProcessCatalogExt.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/ProcessCatalogExt.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -25,11 +25,11 @@ import junit.framework.TestCase; -import org.jboss.bpm.api.client.ProcessEngine; import org.jboss.bpm.api.model.Expression; import org.jboss.bpm.api.model.ProcessDefinition; import org.jboss.bpm.api.model.SequenceFlow; import org.jboss.bpm.api.service.ProcessBuilderService; +import org.jboss.bpm.api.service.ProcessEngine; import org.jboss.bpm.incubator.model.Assignment; import org.jboss.bpm.incubator.model.EndEventExt; import org.jboss.bpm.incubator.model.Message; Deleted: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/client/ProcessExt.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/client/ProcessExt.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/client/ProcessExt.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -1,63 +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.jboss.bpm.incubator.client; - -//$Id$ - -import javax.management.ObjectName; - -import org.jboss.bpm.api.model.Process; -import org.jboss.bpm.api.runtime.Attachments; -import org.jboss.bpm.incubator.model.ProcessStructureExt; - -/** - * A Process is any Activity performed within a company or organization. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface ProcessExt extends Process, ProcessStructureExt -{ - /** - * Start the process asynchronously - */ - ObjectName startProcessAsync(); - - /** - * Start the process asynchronously, with a given context data - */ - ObjectName startProcessAsync(Attachments att); - - /** - * All Tokens that are generated at the Start Event for that Process must eventually arrive at an End Event. The - * Process will be in a running state until all Tokens are consumed. This method until the process ends without - * timeout. - */ - ProcessStatus waitForEnd(); - - /** - * All Tokens that are generated at the Start Event for that Process must eventually arrive at an End Event. The - * Process will be in a running state until all Tokens are consumed. This method until the process ends with a - * given timeout. - */ - ProcessStatus waitForEnd(long timeout); -} \ No newline at end of file Copied: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/client/ProcessInstanceExt.java (from rev 3233, projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/client/ProcessExt.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/client/ProcessInstanceExt.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/client/ProcessInstanceExt.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -0,0 +1,63 @@ +/* + * 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.jboss.bpm.incubator.client; + +//$Id$ + +import javax.management.ObjectName; + +import org.jboss.bpm.api.model.ProcessInstance; +import org.jboss.bpm.api.runtime.Attachments; +import org.jboss.bpm.incubator.model.ProcessStructureExt; + +/** + * A Process is any Activity performed within a company or organization. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface ProcessInstanceExt extends ProcessInstance, ProcessStructureExt +{ + /** + * Start the process asynchronously + */ + ObjectName startProcessAsync(); + + /** + * Start the process asynchronously, with a given context data + */ + ObjectName startProcessAsync(Attachments att); + + /** + * All Tokens that are generated at the Start Event for that Process must eventually arrive at an End Event. The + * Process will be in a running state until all Tokens are consumed. This method until the process ends without + * timeout. + */ + ProcessStatus waitForEnd(); + + /** + * All Tokens that are generated at the Start Event for that Process must eventually arrive at an End Event. The + * Process will be in a running state until all Tokens are consumed. This method until the process ends with a + * given timeout. + */ + ProcessStatus waitForEnd(long timeout); +} \ No newline at end of file Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/client/UserTaskCallback.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/client/UserTaskCallback.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/client/UserTaskCallback.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -25,10 +25,10 @@ import javax.management.ObjectName; -import org.jboss.bpm.api.client.ProcessEngine; import org.jboss.bpm.api.model.builder.ObjectNameFactory; import org.jboss.bpm.api.runtime.Attachments; import org.jboss.bpm.api.runtime.BasicAttachments; +import org.jboss.bpm.api.service.ProcessEngine; import org.jboss.bpm.incubator.model.Message; import org.jboss.bpm.incubator.model.UserTask; import org.jboss.bpm.incubator.model.builder.MessageBuilder; Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/model/builder/ProcessBuilderExt.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/model/builder/ProcessBuilderExt.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/model/builder/ProcessBuilderExt.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -24,7 +24,7 @@ //$Id$ import org.jboss.bpm.api.model.Node; -import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.ProcessInstance; import org.jboss.bpm.api.model.Event.EventDetailType; import org.jboss.bpm.api.model.Expression.ExpressionLanguage; import org.jboss.bpm.api.model.Gateway.GatewayType; @@ -40,7 +40,7 @@ import org.jboss.bpm.incubator.runtime.SignalHandler; /** - * The ProcessBuilder can be used to build a {@link Process} dynamically. + * The ProcessBuilder can be used to build a {@link ProcessInstance} dynamically. * * @author thomas.diesler(a)jboss.com * @since 08-Jul-2008 Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/runtime/FlowHandler.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/runtime/FlowHandler.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/runtime/FlowHandler.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -23,9 +23,9 @@ // $Id$ -import org.jboss.bpm.api.client.ProcessEngine; import org.jboss.bpm.api.model.Node; import org.jboss.bpm.api.runtime.Token; +import org.jboss.bpm.api.service.ProcessEngine; /** * The {@link ProcessEngine} invokes the FlowHandler on a {@link Node} Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/runtime/SignalHandler.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/runtime/SignalHandler.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/runtime/SignalHandler.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -23,9 +23,9 @@ // $Id$ -import org.jboss.bpm.api.client.ProcessEngine; import org.jboss.bpm.api.model.Node; import org.jboss.bpm.api.runtime.Token; +import org.jboss.bpm.api.service.ProcessEngine; import org.jboss.bpm.incubator.model.Signal; /** Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/MessageBuilderService.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/MessageBuilderService.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/MessageBuilderService.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -23,8 +23,8 @@ //$Id$ -import org.jboss.bpm.api.client.Configuration; -import org.jboss.bpm.api.client.ProcessEngine; +import org.jboss.bpm.api.config.Configuration; +import org.jboss.bpm.api.service.ProcessEngine; import org.jboss.bpm.api.service.internal.AbstractService; import org.jboss.bpm.incubator.model.Message; import org.jboss.bpm.incubator.model.builder.MessageBuilder; 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 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/MessageService.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -31,12 +31,12 @@ import javax.management.ObjectName; -import org.jboss.bpm.api.client.Configuration; -import org.jboss.bpm.api.client.ProcessEngine; +import org.jboss.bpm.api.config.Configuration; import org.jboss.bpm.api.model.Event; import org.jboss.bpm.api.model.Node; -import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.ProcessInstance; import org.jboss.bpm.api.model.Task; +import org.jboss.bpm.api.service.ProcessEngine; import org.jboss.bpm.api.service.ProcessService; import org.jboss.bpm.api.service.internal.AbstractService; import org.jboss.bpm.incubator.client.MessageListener; @@ -137,7 +137,7 @@ public void sendMessage(ObjectName procID, String targetName, Message msg) { ProcessService procService = getProcessEngine().getService(ProcessService.class); - Process proc = procService.getProcess(procID); + ProcessInstance proc = procService.getProcess(procID); if (proc == null) throw new IllegalStateException("Cannot obtain registered process: " + procID); Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/PersistenceService.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/PersistenceService.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/PersistenceService.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -27,7 +27,7 @@ import org.hibernate.Session; import org.jboss.bpm.api.model.Node; -import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.ProcessInstance; import org.jboss.bpm.api.model.ProcessDefinition; import org.jboss.bpm.api.service.internal.AbstractService; @@ -62,17 +62,17 @@ /** * Save the Process to persistent storage */ - public abstract ObjectName saveProcess(Process proc); + public abstract ObjectName saveProcess(ProcessInstance proc); /** * Load the Process from persistent storage */ - public abstract Process loadProcess(ObjectName procID); + public abstract ProcessInstance loadProcess(ObjectName procID); /** * Delete the Process from persistent storage */ - public abstract void deleteProcess(Process proc); + public abstract void deleteProcess(ProcessInstance proc); /** * Save the Node to persistent storage Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/SignalBuilderService.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/SignalBuilderService.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/SignalBuilderService.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -23,8 +23,8 @@ //$Id$ -import org.jboss.bpm.api.client.Configuration; -import org.jboss.bpm.api.client.ProcessEngine; +import org.jboss.bpm.api.config.Configuration; +import org.jboss.bpm.api.service.ProcessEngine; import org.jboss.bpm.api.service.internal.AbstractService; import org.jboss.bpm.incubator.model.Signal; import org.jboss.bpm.incubator.model.builder.SignalBuilder; Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/SignalService.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/SignalService.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/SignalService.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -27,8 +27,8 @@ import java.util.HashSet; import java.util.Set; -import org.jboss.bpm.api.client.Configuration; -import org.jboss.bpm.api.client.ProcessEngine; +import org.jboss.bpm.api.config.Configuration; +import org.jboss.bpm.api.service.ProcessEngine; import org.jboss.bpm.api.service.internal.AbstractService; import org.jboss.bpm.incubator.client.SignalListener; import org.jboss.bpm.incubator.model.Signal; Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/ThreadingService.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/ThreadingService.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/ThreadingService.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -26,9 +26,9 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.ProcessInstance; import org.jboss.bpm.api.model.StartEvent; -import org.jboss.bpm.api.model.Process.ProcessStatus; +import org.jboss.bpm.api.model.ProcessInstance.ProcessStatus; import org.jboss.bpm.api.runtime.Attachments; import org.jboss.bpm.api.service.internal.AbstractService; @@ -61,19 +61,19 @@ * @param start The StartEvent that triggers the process * @param att The Attachments in the ExecutionContext */ - public abstract void startProcess(Process proc, StartEvent start, Attachments att); + public abstract void startProcess(ProcessInstance proc, StartEvent start, Attachments att); /** * All Tokens that are generated at the Start Event for that Process must eventually arrive at an End Event. The * Process will be in a running state until all Tokens are consumed. This method until the process ends without * timeout. */ - public abstract ProcessStatus waitForEnd(Process proc); + public abstract ProcessStatus waitForEnd(ProcessInstance proc); /** * All Tokens that are generated at the Start Event for that Process must eventually arrive at an End Event. The * Process will be in a running state until all Tokens are consumed. This method until the process ends with a * given timeout. */ - public abstract ProcessStatus waitForEnd(Process proc, long timeout); + public abstract ProcessStatus waitForEnd(ProcessInstance proc, long timeout); } Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -25,11 +25,11 @@ import java.io.IOException; -import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.ProcessInstance; import org.jboss.bpm.api.model.ProcessDefinition; import org.jboss.bpm.api.model.Expression.ExpressionLanguage; import org.jboss.bpm.api.model.Gateway.GatewayType; -import org.jboss.bpm.api.model.Process.ProcessStatus; +import org.jboss.bpm.api.model.ProcessInstance.ProcessStatus; import org.jboss.bpm.api.model.builder.GatewayBuilder; import org.jboss.bpm.api.model.builder.ProcessBuilder; import org.jboss.bpm.api.runtime.BasicAttachments; @@ -50,7 +50,7 @@ public void testGateA() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - Process proc = procDef.newInstance(); + ProcessInstance proc = procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment("foo", "5"); @@ -67,7 +67,7 @@ public void testGateB() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - Process proc = procDef.newInstance(); + ProcessInstance proc = procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment("foo", "15"); @@ -84,7 +84,7 @@ public void testInvalidGate() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - Process proc = procDef.newInstance(); + ProcessInstance proc = procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment("foo", "10"); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/processengine/ProcessEngineTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/processengine/ProcessEngineTest.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/processengine/ProcessEngineTest.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -23,8 +23,8 @@ // $Id$ -import org.jboss.bpm.api.client.Configuration; -import org.jboss.bpm.api.client.ProcessEngine; +import org.jboss.bpm.api.config.Configuration; +import org.jboss.bpm.api.service.ProcessEngine; import org.jboss.bpm.api.test.CTSTestCase; /** 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 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessDefinitionServiceTest.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -27,10 +27,10 @@ import javax.management.ObjectName; -import org.jboss.bpm.api.client.ProcessEngine; -import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.ProcessInstance; import org.jboss.bpm.api.model.ProcessDefinition; import org.jboss.bpm.api.service.ProcessDefinitionService; +import org.jboss.bpm.api.service.ProcessEngine; import org.jboss.bpm.api.service.ProcessService; import org.jboss.bpm.api.test.CTSTestCase; import org.jboss.bpm.api.test.ProcessCatalog; @@ -66,7 +66,7 @@ ProcessDefinitionService procDefService = engine.getService(ProcessDefinitionService.class); ProcessService procService = engine.getService(ProcessService.class); - Process proc = procDef.newInstance(); + ProcessInstance proc = procDef.newInstance(); assertNotNull("Process not null", proc); assertNull("Process not automatically registered", procService.getProcess(proc.getKey())); assertNull("ProcessDefinition not automatically registered", procDefService.getProcessDefinition(procDef.getKey())); 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 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessServiceTest.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -25,7 +25,7 @@ import javax.management.ObjectName; -import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.ProcessInstance; import org.jboss.bpm.api.model.ProcessDefinition; import org.jboss.bpm.api.model.builder.ProcessBuilder; import org.jboss.bpm.api.runtime.Token; @@ -48,7 +48,7 @@ ProcessService procService = getProcessEngine().getService(ProcessService.class); ProcessDefinition procDef = getProcessDefinition(); - Process proc = procDef.newInstance(); + ProcessInstance proc = procDef.newInstance(); assertNull("ProcessDefinition not registered automatically", procDefService.getProcessDefinition(procDef.getKey())); assertNull("Process not registered automatically", procService.getProcess(proc.getKey())); @@ -74,7 +74,7 @@ ProcessService procService = getProcessEngine().getService(ProcessService.class); ProcessDefinition procDef = getProcessDefinition(); - Process proc = procDef.newInstance(); + ProcessInstance proc = procDef.newInstance(); Token token = proc.startProcess(); assertNotNull("Token not null", token); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/task/waitstate/WaitStateTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/task/waitstate/WaitStateTest.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/task/waitstate/WaitStateTest.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -25,9 +25,9 @@ import java.io.IOException; -import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.ProcessInstance; import org.jboss.bpm.api.model.ProcessDefinition; -import org.jboss.bpm.api.model.Process.ProcessStatus; +import org.jboss.bpm.api.model.ProcessInstance.ProcessStatus; import org.jboss.bpm.api.model.Task.TaskType; import org.jboss.bpm.api.model.builder.ProcessBuilder; import org.jboss.bpm.api.runtime.Token; @@ -46,7 +46,7 @@ public void testBasicWaitState() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - Process proc = procDef.newInstance(); + ProcessInstance proc = procDef.newInstance(); // Start the Process Token tok = proc.startProcess(); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/endevent/EndEventMessageTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/endevent/EndEventMessageTest.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/endevent/EndEventMessageTest.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -30,7 +30,7 @@ import org.jboss.bpm.api.runtime.BasicAttachments; import org.jboss.bpm.api.service.ProcessBuilderService; import org.jboss.bpm.api.test.CTSTestCase; -import org.jboss.bpm.incubator.client.ProcessExt; +import org.jboss.bpm.incubator.client.ProcessInstanceExt; import org.jboss.bpm.incubator.model.Message; import org.jboss.bpm.incubator.model.builder.MessageBuilder; import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt; @@ -46,7 +46,7 @@ public void testStart() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessExt proc = (ProcessExt)procDef.newInstance(); + ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance(); // Start the process BasicAttachments att = new BasicAttachments(); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/exclusive/ExclusiveGatewayMergeTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/exclusive/ExclusiveGatewayMergeTest.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/exclusive/ExclusiveGatewayMergeTest.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -30,7 +30,7 @@ import org.jboss.bpm.api.model.Gateway.GatewayType; import org.jboss.bpm.api.service.ProcessBuilderService; import org.jboss.bpm.api.test.CTSTestCase; -import org.jboss.bpm.incubator.client.ProcessExt; +import org.jboss.bpm.incubator.client.ProcessInstanceExt; import org.jboss.bpm.incubator.model.Signal; import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt; @@ -47,7 +47,7 @@ public void testMerge() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessExt proc = (ProcessExt)procDef.newInstance(); + ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance(); // Start the process proc.startProcessAsync(); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/inclusive/InclusiveGatewayMergeTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/inclusive/InclusiveGatewayMergeTest.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/inclusive/InclusiveGatewayMergeTest.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -30,7 +30,7 @@ import org.jboss.bpm.api.model.Gateway.GatewayType; import org.jboss.bpm.api.service.ProcessBuilderService; import org.jboss.bpm.api.test.CTSTestCase; -import org.jboss.bpm.incubator.client.ProcessExt; +import org.jboss.bpm.incubator.client.ProcessInstanceExt; import org.jboss.bpm.incubator.model.Signal; import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt; @@ -46,7 +46,7 @@ public void testSimpleMerge() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessExt proc = (ProcessExt)procDef.newInstance(); + ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance(); // Start the process proc.startProcessAsync(); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/inclusive/InclusiveGatewaySplitTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/inclusive/InclusiveGatewaySplitTest.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/inclusive/InclusiveGatewaySplitTest.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -33,7 +33,7 @@ import org.jboss.bpm.api.runtime.BasicAttachments; import org.jboss.bpm.api.service.ProcessBuilderService; import org.jboss.bpm.api.test.CTSTestCase; -import org.jboss.bpm.incubator.client.ProcessExt; +import org.jboss.bpm.incubator.client.ProcessInstanceExt; import org.jboss.bpm.incubator.model.Signal; import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt; @@ -49,7 +49,7 @@ public void testGateA() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessExt proc = (ProcessExt)procDef.newInstance(); + ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment("foo", "5"); @@ -63,7 +63,7 @@ public void testGateB() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessExt proc = (ProcessExt)procDef.newInstance(); + ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment("foo", "15"); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/parallel/ParallelGatewayMergeTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/parallel/ParallelGatewayMergeTest.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/parallel/ParallelGatewayMergeTest.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -31,7 +31,7 @@ import org.jboss.bpm.api.model.Gateway.GatewayType; import org.jboss.bpm.api.service.ProcessBuilderService; import org.jboss.bpm.api.test.CTSTestCase; -import org.jboss.bpm.incubator.client.ProcessExt; +import org.jboss.bpm.incubator.client.ProcessInstanceExt; import org.jboss.bpm.incubator.model.Message; import org.jboss.bpm.incubator.model.Assignment.AssignTime; import org.jboss.bpm.incubator.model.builder.MessageBuilder; @@ -50,7 +50,7 @@ public void testParallelMerge() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessExt proc = (ProcessExt)procDef.newInstance(); + ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance(); // Start the process proc.startProcessAsync(); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/parallel/ParallelGatewaySplitTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/parallel/ParallelGatewaySplitTest.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/parallel/ParallelGatewaySplitTest.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -32,7 +32,7 @@ import org.jboss.bpm.api.model.Gateway.GatewayType; import org.jboss.bpm.api.service.ProcessBuilderService; import org.jboss.bpm.api.test.CTSTestCase; -import org.jboss.bpm.incubator.client.ProcessExt; +import org.jboss.bpm.incubator.client.ProcessInstanceExt; import org.jboss.bpm.incubator.model.Signal; import org.jboss.bpm.incubator.model.Signal.SignalType; import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt; @@ -49,7 +49,7 @@ public void testParallelSplit() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessExt proc = (ProcessExt)procDef.newInstance(); + ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance(); proc.startProcessAsync(); proc.waitForEnd(5000); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/node/NodeInputSetTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/node/NodeInputSetTest.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/node/NodeInputSetTest.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -30,7 +30,7 @@ import org.jboss.bpm.api.runtime.BasicAttachments; import org.jboss.bpm.api.service.ProcessBuilderService; import org.jboss.bpm.api.test.CTSTestCase; -import org.jboss.bpm.incubator.client.ProcessExt; +import org.jboss.bpm.incubator.client.ProcessInstanceExt; import org.jboss.bpm.incubator.model.Message; import org.jboss.bpm.incubator.model.builder.MessageBuilder; import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt; @@ -51,7 +51,7 @@ public void testValidProps() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessExt proc = (ProcessExt)procDef.newInstance(); + ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment("frog", "kermit"); @@ -66,7 +66,7 @@ public void testInvalidProps() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessExt proc = (ProcessExt)procDef.newInstance(); + ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment("pig", "piggy"); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/node/NodeOutputSetTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/node/NodeOutputSetTest.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/node/NodeOutputSetTest.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -29,7 +29,7 @@ import org.jboss.bpm.api.model.Event.EventDetailType; import org.jboss.bpm.api.service.ProcessBuilderService; import org.jboss.bpm.api.test.CTSTestCase; -import org.jboss.bpm.incubator.client.ProcessExt; +import org.jboss.bpm.incubator.client.ProcessInstanceExt; import org.jboss.bpm.incubator.model.Message; import org.jboss.bpm.incubator.model.builder.MessageBuilder; import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt; @@ -51,7 +51,7 @@ public void testValidProps() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessExt proc = (ProcessExt)procDef.newInstance(); + ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance(); proc.startProcessAsync(); proc.waitForEnd(5000); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/node/NodePropertyTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/node/NodePropertyTest.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/node/NodePropertyTest.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -30,7 +30,7 @@ import org.jboss.bpm.api.model.Expression.ExpressionLanguage; import org.jboss.bpm.api.service.ProcessBuilderService; import org.jboss.bpm.api.test.CTSTestCase; -import org.jboss.bpm.incubator.client.ProcessExt; +import org.jboss.bpm.incubator.client.ProcessInstanceExt; import org.jboss.bpm.incubator.model.Message; import org.jboss.bpm.incubator.model.Assignment.AssignTime; import org.jboss.bpm.incubator.model.builder.MessageBuilder; @@ -52,7 +52,7 @@ public void testActivityPropertyRead() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessExt proc = (ProcessExt)procDef.newInstance(); + ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance(); proc.startProcessAsync(); proc.waitForEnd(5000); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/process/ProcessPropertyTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/process/ProcessPropertyTest.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/process/ProcessPropertyTest.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -30,7 +30,7 @@ import org.jboss.bpm.api.model.Expression.ExpressionLanguage; import org.jboss.bpm.api.service.ProcessBuilderService; import org.jboss.bpm.api.test.CTSTestCase; -import org.jboss.bpm.incubator.client.ProcessExt; +import org.jboss.bpm.incubator.client.ProcessInstanceExt; import org.jboss.bpm.incubator.model.Message; import org.jboss.bpm.incubator.model.Assignment.AssignTime; import org.jboss.bpm.incubator.model.builder.MessageBuilder; @@ -57,7 +57,7 @@ public void testProcessProperties() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessExt proc = (ProcessExt)procDef.newInstance(); + ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance(); proc.startProcessAsync(); proc.waitForEnd(5000); 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 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/startevent/StartEventSignalTest.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -35,7 +35,7 @@ import org.jboss.bpm.api.service.ProcessDefinitionService; import org.jboss.bpm.api.service.ProcessService; import org.jboss.bpm.api.test.CTSTestCase; -import org.jboss.bpm.incubator.client.ProcessExt; +import org.jboss.bpm.incubator.client.ProcessInstanceExt; import org.jboss.bpm.incubator.client.SignalListener; import org.jboss.bpm.incubator.model.Message; import org.jboss.bpm.incubator.model.Signal; @@ -64,7 +64,7 @@ procDefService.registerProcessDefinition(procDef); ObjectName procDefID = procDef.getKey(); - ProcessExt proc = (ProcessExt)procDef.newInstance(); + ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance(); try { proc.startProcessAsync(); @@ -82,7 +82,7 @@ // Get the just started process ProcessService procService = getProcessEngine().getService(ProcessService.class); Set<ObjectName> procIDs = procService.getProcesses(procDefID, null); - proc = (ProcessExt) procService.getProcess(procIDs.iterator().next()); + proc = (ProcessInstanceExt) procService.getProcess(procIDs.iterator().next()); // Wait for the process to end if (proc != null) Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/java/JavaTaskTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/java/JavaTaskTest.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/java/JavaTaskTest.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -31,7 +31,7 @@ import org.jboss.bpm.api.runtime.Token; import org.jboss.bpm.api.service.ProcessBuilderService; import org.jboss.bpm.api.test.CTSTestCase; -import org.jboss.bpm.incubator.client.ProcessExt; +import org.jboss.bpm.incubator.client.ProcessInstanceExt; import org.jboss.bpm.incubator.model.Assignment.AssignTime; import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt; import org.jboss.bpm.incubator.model.builder.TaskBuilder; @@ -49,7 +49,7 @@ public void testExecutionHandler() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessExt proc = (ProcessExt)procDef.newInstance(); + ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance(); proc.startProcessAsync(); proc.waitForEnd(5000); 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 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/receive/ReceiveTaskTest.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -26,7 +26,7 @@ import java.io.IOException; import org.jboss.bpm.api.InvalidProcessException; -import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.ProcessInstance; import org.jboss.bpm.api.model.ProcessDefinition; import org.jboss.bpm.api.model.Event.EventDetailType; import org.jboss.bpm.api.model.Task.TaskType; @@ -34,7 +34,7 @@ import org.jboss.bpm.api.service.ProcessDefinitionService; import org.jboss.bpm.api.service.ProcessService; import org.jboss.bpm.api.test.CTSTestCase; -import org.jboss.bpm.incubator.client.ProcessExt; +import org.jboss.bpm.incubator.client.ProcessInstanceExt; import org.jboss.bpm.incubator.client.SignalListener; import org.jboss.bpm.incubator.model.Message; import org.jboss.bpm.incubator.model.Signal; @@ -74,7 +74,7 @@ public void testUnregisteredProcess() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessExt proc = (ProcessExt)procDef.newInstance(); + ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance(); MessageService msgService = MessageService.locateMessageService(); try @@ -94,7 +94,7 @@ ProcessService procService = getProcessEngine().getService(ProcessService.class); ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - Process proc = procDef.newInstance(); + ProcessInstance proc = procDef.newInstance(); proc = procService.registerProcess(proc); try @@ -103,7 +103,7 @@ MessageService msgService = MessageService.locateMessageService(); msgService.sendMessage(proc.getKey(), "TaskA", getMessage()); - ProcessExt procExt = (ProcessExt)proc; + ProcessInstanceExt procExt = (ProcessInstanceExt)proc; procExt.startProcessAsync(); procExt.waitForEnd(5000); } @@ -120,7 +120,7 @@ public void testSuspendedToken() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - final ProcessExt proc = (ProcessExt)procDef.newInstance(); + final ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance(); SignalListener sigListener = new SignalListener() { private boolean sendMessage = true; Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/send/SendTaskTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/send/SendTaskTest.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/send/SendTaskTest.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -32,7 +32,7 @@ import org.jboss.bpm.api.runtime.BasicAttachments; import org.jboss.bpm.api.service.ProcessBuilderService; import org.jboss.bpm.api.test.CTSTestCase; -import org.jboss.bpm.incubator.client.ProcessExt; +import org.jboss.bpm.incubator.client.ProcessInstanceExt; import org.jboss.bpm.incubator.model.Message; import org.jboss.bpm.incubator.model.builder.MessageBuilder; import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt; @@ -48,7 +48,7 @@ public void testSendTask() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessExt proc = (ProcessExt)procDef.newInstance(); + ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment("foo", "bar"); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/user/UserTaskCallbackTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/user/UserTaskCallbackTest.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/user/UserTaskCallbackTest.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -33,7 +33,7 @@ import org.jboss.bpm.api.runtime.BasicAttachments; import org.jboss.bpm.api.service.ProcessBuilderService; import org.jboss.bpm.api.test.CTSTestCase; -import org.jboss.bpm.incubator.client.ProcessExt; +import org.jboss.bpm.incubator.client.ProcessInstanceExt; import org.jboss.bpm.incubator.client.UserTaskCallback; import org.jboss.bpm.incubator.model.Message; import org.jboss.bpm.incubator.model.UserTask; @@ -50,7 +50,7 @@ public void testUserTask() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessExt proc = (ProcessExt)procDef.newInstance(); + ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance(); // Attach the callback to the UserTask UserTask userTask = proc.getNode(UserTask.class, "UserTask"); 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 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/user/UserTaskTest.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -38,7 +38,7 @@ import org.jboss.bpm.api.service.ProcessService; import org.jboss.bpm.api.test.CTSTestCase; import org.jboss.bpm.incubator.client.MessageListener; -import org.jboss.bpm.incubator.client.ProcessExt; +import org.jboss.bpm.incubator.client.ProcessInstanceExt; import org.jboss.bpm.incubator.model.Message; import org.jboss.bpm.incubator.model.builder.MessageBuilder; import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt; @@ -58,7 +58,7 @@ public void testUserTask() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessExt proc = (ProcessExt)procDef.newInstance(); + ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance(); // Register the process - this assigns the procID ProcessService procService = getProcessEngine().getService(ProcessService.class); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/transaction/TxRequiredTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/transaction/TxRequiredTest.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/transaction/TxRequiredTest.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -35,7 +35,7 @@ import org.jboss.bpm.api.runtime.Token; import org.jboss.bpm.api.service.ProcessBuilderService; import org.jboss.bpm.api.test.CTSTestCase; -import org.jboss.bpm.incubator.client.ProcessExt; +import org.jboss.bpm.incubator.client.ProcessInstanceExt; import org.jboss.bpm.incubator.model.Group; import org.jboss.bpm.incubator.model.Message; import org.jboss.bpm.incubator.model.NodeExt; @@ -66,7 +66,7 @@ assertSame("Group same", group, groupA); assertSame("Group same", group, groupB); - ProcessExt proc = (ProcessExt)procDef.newInstance(); + ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance(); proc.startProcessAsync(); proc.waitForEnd(); @@ -78,7 +78,7 @@ public void testRollback() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessExt proc = (ProcessExt)procDef.newInstance(); + ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment(Boolean.class, "rollback", Boolean.TRUE); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/exclusivechoice/ExclusiveChoiceTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/exclusivechoice/ExclusiveChoiceTest.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/exclusivechoice/ExclusiveChoiceTest.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -33,7 +33,7 @@ import org.jboss.bpm.api.runtime.BasicAttachments; import org.jboss.bpm.api.service.ProcessBuilderService; import org.jboss.bpm.api.test.CTSTestCase; -import org.jboss.bpm.incubator.client.ProcessExt; +import org.jboss.bpm.incubator.client.ProcessInstanceExt; import org.jboss.bpm.incubator.model.Signal; import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt; @@ -49,7 +49,7 @@ public void testGateA() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessExt proc = (ProcessExt)procDef.newInstance(); + ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment("foo", "5"); @@ -64,7 +64,7 @@ public void testGateB() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessExt proc = (ProcessExt)procDef.newInstance(); + ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment("foo", "15"); @@ -79,7 +79,7 @@ public void testInvalidGate() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessExt proc = (ProcessExt)procDef.newInstance(); + ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment("foo", "10"); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/multichoice/MultiChoiceTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/multichoice/MultiChoiceTest.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/multichoice/MultiChoiceTest.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -33,7 +33,7 @@ import org.jboss.bpm.api.runtime.BasicAttachments; import org.jboss.bpm.api.service.ProcessBuilderService; import org.jboss.bpm.api.test.CTSTestCase; -import org.jboss.bpm.incubator.client.ProcessExt; +import org.jboss.bpm.incubator.client.ProcessInstanceExt; import org.jboss.bpm.incubator.model.Signal; import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt; @@ -49,7 +49,7 @@ public void testGateA() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessExt proc = (ProcessExt)procDef.newInstance(); + ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment("foo", "5"); @@ -63,7 +63,7 @@ public void testGateB() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessExt proc = (ProcessExt)procDef.newInstance(); + ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment("foo", "15"); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/parallelsplit/ParallelSplitTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/parallelsplit/ParallelSplitTest.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/parallelsplit/ParallelSplitTest.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -32,7 +32,7 @@ import org.jboss.bpm.api.model.ProcessDefinition; import org.jboss.bpm.api.service.ProcessBuilderService; import org.jboss.bpm.api.test.CTSTestCase; -import org.jboss.bpm.incubator.client.ProcessExt; +import org.jboss.bpm.incubator.client.ProcessInstanceExt; import org.jboss.bpm.incubator.model.Signal; import org.jboss.bpm.incubator.model.Signal.SignalType; import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt; @@ -49,7 +49,7 @@ public void testParallelSplit() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessExt proc = (ProcessExt)procDef.newInstance(); + ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance(); proc.startProcessAsync(); proc.waitForEnd(); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/sequence/SequenceTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/sequence/SequenceTest.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/sequence/SequenceTest.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -29,7 +29,7 @@ import org.jboss.bpm.api.model.ProcessDefinition; import org.jboss.bpm.api.service.ProcessBuilderService; import org.jboss.bpm.api.test.CTSTestCase; -import org.jboss.bpm.incubator.client.ProcessExt; +import org.jboss.bpm.incubator.client.ProcessInstanceExt; import org.jboss.bpm.incubator.model.Signal; import org.jboss.bpm.incubator.model.Signal.SignalType; import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt; @@ -46,7 +46,7 @@ { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessExt proc = (ProcessExt)procDef.newInstance(); + ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance(); // Start the Process proc.startProcessAsync(); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/simplemerge/SimpleMergeTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/simplemerge/SimpleMergeTest.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/simplemerge/SimpleMergeTest.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -30,7 +30,7 @@ import org.jboss.bpm.api.model.Gateway.GatewayType; import org.jboss.bpm.api.service.ProcessBuilderService; import org.jboss.bpm.api.test.CTSTestCase; -import org.jboss.bpm.incubator.client.ProcessExt; +import org.jboss.bpm.incubator.client.ProcessInstanceExt; import org.jboss.bpm.incubator.model.Signal; import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt; @@ -46,7 +46,7 @@ public void testSimpleMerge() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessExt proc = (ProcessExt)procDef.newInstance(); + ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance(); // Start the process proc.startProcessAsync(); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/synchronization/SynchronizationTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/synchronization/SynchronizationTest.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/synchronization/SynchronizationTest.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -31,7 +31,7 @@ import org.jboss.bpm.api.model.Gateway.GatewayType; import org.jboss.bpm.api.service.ProcessBuilderService; import org.jboss.bpm.api.test.CTSTestCase; -import org.jboss.bpm.incubator.client.ProcessExt; +import org.jboss.bpm.incubator.client.ProcessInstanceExt; import org.jboss.bpm.incubator.model.Message; import org.jboss.bpm.incubator.model.Assignment.AssignTime; import org.jboss.bpm.incubator.model.builder.MessageBuilder; @@ -50,7 +50,7 @@ public void testParallelMerge() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessExt proc = (ProcessExt)procDef.newInstance(); + ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance(); // Start the process proc.startProcessAsync(); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/data/casedata/CaseDataTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/data/casedata/CaseDataTest.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/data/casedata/CaseDataTest.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -30,7 +30,7 @@ import org.jboss.bpm.api.model.Expression.ExpressionLanguage; import org.jboss.bpm.api.service.ProcessBuilderService; import org.jboss.bpm.api.test.CTSTestCase; -import org.jboss.bpm.incubator.client.ProcessExt; +import org.jboss.bpm.incubator.client.ProcessInstanceExt; import org.jboss.bpm.incubator.model.Message; import org.jboss.bpm.incubator.model.Assignment.AssignTime; import org.jboss.bpm.incubator.model.builder.MessageBuilder; @@ -50,7 +50,7 @@ public void testCaseProperties() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessExt proc = (ProcessExt)procDef.newInstance(); + ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance(); proc.startProcessAsync(); proc.waitForEnd(); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/data/taskdata/TaskDataTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/data/taskdata/TaskDataTest.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/data/taskdata/TaskDataTest.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -30,7 +30,7 @@ import org.jboss.bpm.api.model.Expression.ExpressionLanguage; import org.jboss.bpm.api.service.ProcessBuilderService; import org.jboss.bpm.api.test.CTSTestCase; -import org.jboss.bpm.incubator.client.ProcessExt; +import org.jboss.bpm.incubator.client.ProcessInstanceExt; import org.jboss.bpm.incubator.model.Message; import org.jboss.bpm.incubator.model.Assignment.AssignTime; import org.jboss.bpm.incubator.model.builder.MessageBuilder; @@ -51,7 +51,7 @@ public void testTaskDataRead() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessExt proc = (ProcessExt)procDef.newInstance(); + ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance(); proc.startProcessAsync(); proc.waitForEnd(); Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java =================================================================== --- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -31,7 +31,6 @@ import javax.xml.bind.Unmarshaller; import org.jboss.bpm.api.NotImplementedException; -import org.jboss.bpm.api.client.ProcessEngine; import org.jboss.bpm.api.model.Gateway; import org.jboss.bpm.api.model.ProcessDefinition; import org.jboss.bpm.api.model.SequenceFlow.ConditionType; @@ -39,6 +38,7 @@ import org.jboss.bpm.api.model.builder.GatewayBuilder; import org.jboss.bpm.api.model.builder.ProcessBuilder; import org.jboss.bpm.api.service.ProcessBuilderService; +import org.jboss.bpm.api.service.ProcessEngine; import org.jboss.bpm.dialect.api10.model.JAXBCancelEventDetail; import org.jboss.bpm.dialect.api10.model.JAXBCompensationEventDetail; import org.jboss.bpm.dialect.api10.model.JAXBComplexGateway; Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshallerExt.java =================================================================== --- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshallerExt.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshallerExt.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -32,7 +32,6 @@ import javax.xml.bind.Unmarshaller; import org.jboss.bpm.api.NotImplementedException; -import org.jboss.bpm.api.client.ProcessEngine; import org.jboss.bpm.api.model.Gateway; import org.jboss.bpm.api.model.ProcessDefinition; import org.jboss.bpm.api.model.SequenceFlow.ConditionType; @@ -40,6 +39,7 @@ import org.jboss.bpm.api.model.builder.GatewayBuilder; import org.jboss.bpm.api.model.builder.ObjectNameFactory; import org.jboss.bpm.api.service.ProcessBuilderService; +import org.jboss.bpm.api.service.ProcessEngine; import org.jboss.bpm.dialect.api10.model.JAXBAssignment; import org.jboss.bpm.dialect.api10.model.JAXBCancelEventDetail; import org.jboss.bpm.dialect.api10.model.JAXBCompensationEventDetail; Modified: projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/ProcessDefinitionAdapter.java =================================================================== --- projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/ProcessDefinitionAdapter.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/ProcessDefinitionAdapter.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -26,11 +26,11 @@ import java.util.List; import org.jboss.bpm.api.InvalidProcessException; -import org.jboss.bpm.api.client.ProcessEngine; import org.jboss.bpm.api.model.Gateway; import org.jboss.bpm.api.model.ProcessDefinition; import org.jboss.bpm.api.model.Task; import org.jboss.bpm.api.service.ProcessBuilderService; +import org.jboss.bpm.api.service.ProcessEngine; import org.jboss.bpm.dialect.jpdl32.model.JPDL32Action; import org.jboss.bpm.dialect.jpdl32.model.JPDL32EndState; import org.jboss.bpm.dialect.jpdl32.model.JPDL32Event; Modified: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/ProcessUnmarshaller.java =================================================================== --- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/ProcessUnmarshaller.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/ProcessUnmarshaller.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -36,11 +36,11 @@ import javax.xml.parsers.DocumentBuilderFactory; import org.jboss.bpm.api.InvalidProcessException; -import org.jboss.bpm.api.client.ProcessEngine; import org.jboss.bpm.api.model.Gateway; import org.jboss.bpm.api.model.ProcessDefinition; import org.jboss.bpm.api.model.Task; import org.jboss.bpm.api.service.ProcessBuilderService; +import org.jboss.bpm.api.service.ProcessEngine; import org.jboss.bpm.dialect.stp.model.Activity; import org.jboss.bpm.dialect.stp.model.ActivityType; import org.jboss.bpm.dialect.stp.model.BpmnDiagram; Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/WorkflowProcessAdapter.java =================================================================== --- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/WorkflowProcessAdapter.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/WorkflowProcessAdapter.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -24,9 +24,9 @@ // $Id$ import org.jboss.bpm.api.InvalidProcessException; -import org.jboss.bpm.api.client.ProcessEngine; import org.jboss.bpm.api.model.ProcessDefinition; import org.jboss.bpm.api.service.ProcessBuilderService; +import org.jboss.bpm.api.service.ProcessEngine; import org.jboss.bpm.dialect.xpdl21.model.XPDLActivities; import org.jboss.bpm.dialect.xpdl21.model.XPDLActivity; import org.jboss.bpm.dialect.xpdl21.model.XPDLEvent; Deleted: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/ProcessEngineImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/ProcessEngineImpl.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/ProcessEngineImpl.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -1,54 +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.jboss.bpm.ri.client; - -//$Id$ - -import java.util.Set; - -import org.jboss.bpm.api.client.ProcessEngine; -import org.jboss.bpm.api.service.Service; -import org.jboss.bpm.ri.service.MutableService; - -/** - * A process engine with public access - * - * @author thomas.diesler(a)jboss.com - * @since 18-Jun-2008 - */ -public class ProcessEngineImpl extends ProcessEngine -{ - public void setServices(Set<Service> services) - { - this.services = services; - - // Set this engine on every mutable service - for (Service service : services) - { - if (service instanceof MutableService) - { - MutableService mutService = (MutableService)service; - mutService.setProcessEngine(this); - } - } - } -} Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/AbstractElementImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/AbstractElementImpl.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/AbstractElementImpl.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -29,10 +29,11 @@ import javax.persistence.MappedSuperclass; import org.hibernate.Session; -import org.jboss.bpm.api.client.ProcessEngine; +import org.jboss.bpm.api.NotImplementedException; import org.jboss.bpm.api.model.AbstractElement; -import org.jboss.bpm.api.model.Process; import org.jboss.bpm.api.model.ProcessDefinition; +import org.jboss.bpm.api.model.ProcessInstance; +import org.jboss.bpm.api.service.ProcessEngine; /** * The parrent of all Elements @@ -47,7 +48,7 @@ @Id @GeneratedValue protected Integer id; - + // Persistence ctor protected AbstractElementImpl() { @@ -61,6 +62,12 @@ @Override public abstract ObjectName getKey(); + @Override + public ProcessEngine getProcessEngine() + { + throw new NotImplementedException(); + } + /** Initializes the persistent object */ public void initialize(ProcessEngine engine, Session session) { @@ -87,22 +94,22 @@ // nothing to do } - protected void create(Process proc) + protected void create(ProcessInstance proc) { // nothing to do } - protected void register(Process proc) + protected void register(ProcessInstance proc) { // nothing to do } - protected void unregister(Process proc) + protected void unregister(ProcessInstance proc) { // nothing to do } - protected void destroy(Process proc) + protected void destroy(ProcessInstance proc) { // nothing to do } Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/EndEventImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/EndEventImpl.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/EndEventImpl.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -28,13 +28,13 @@ import org.jboss.bpm.api.Constants; import org.jboss.bpm.api.InvalidProcessException; -import org.jboss.bpm.api.client.ProcessEngine; import org.jboss.bpm.api.model.Node; import org.jboss.bpm.api.model.ProcessStructure; import org.jboss.bpm.api.model.SequenceFlow; import org.jboss.bpm.api.model.builder.ObjectNameFactory; import org.jboss.bpm.api.runtime.Attachments; import org.jboss.bpm.api.runtime.Token; +import org.jboss.bpm.api.service.ProcessEngine; import org.jboss.bpm.incubator.model.EndEventExt; import org.jboss.bpm.incubator.model.Signal; import org.jboss.bpm.incubator.runtime.FlowHandler; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/EventImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/EventImpl.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/EventImpl.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -32,13 +32,13 @@ import org.jboss.bpm.api.Constants; import org.jboss.bpm.api.InvalidProcessException; -import org.jboss.bpm.api.client.ProcessEngine; import org.jboss.bpm.api.model.Node; -import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.ProcessInstance; import org.jboss.bpm.api.model.ProcessDefinition; import org.jboss.bpm.api.model.ProcessStructure; import org.jboss.bpm.api.model.builder.ObjectNameFactory; import org.jboss.bpm.api.runtime.Token; +import org.jboss.bpm.api.service.ProcessEngine; import org.jboss.bpm.incubator.model.EventExt; import org.jboss.bpm.incubator.model.Message; import org.jboss.bpm.incubator.model.Signal; @@ -213,7 +213,7 @@ } @Override - protected void create(Process proc) + protected void create(ProcessInstance proc) { super.create(proc); Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/GatewayImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/GatewayImpl.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/GatewayImpl.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -34,7 +34,6 @@ import javax.persistence.Transient; import org.jboss.bpm.api.Constants; -import org.jboss.bpm.api.client.ProcessEngine; import org.jboss.bpm.api.model.Gateway; import org.jboss.bpm.api.model.Node; import org.jboss.bpm.api.model.ProcessStructure; @@ -42,6 +41,7 @@ import org.jboss.bpm.api.model.SequenceFlow.ConditionType; import org.jboss.bpm.api.model.builder.ObjectNameFactory; import org.jboss.bpm.api.runtime.Token; +import org.jboss.bpm.api.service.ProcessEngine; import org.jboss.bpm.incubator.model.Signal; import org.jboss.bpm.incubator.runtime.ExecutionHandler; import org.jboss.bpm.incubator.runtime.SignalHandler; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/NodeImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/NodeImpl.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/NodeImpl.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -43,16 +43,16 @@ import org.hibernate.annotations.IndexColumn; import org.jboss.bpm.api.InvalidProcessException; import org.jboss.bpm.api.NameNotUniqueException; -import org.jboss.bpm.api.client.ProcessEngine; import org.jboss.bpm.api.model.EndEvent; import org.jboss.bpm.api.model.Node; -import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.ProcessInstance; import org.jboss.bpm.api.model.ProcessDefinition; import org.jboss.bpm.api.model.ProcessStructure; import org.jboss.bpm.api.model.SequenceFlow; import org.jboss.bpm.api.model.StartEvent; import org.jboss.bpm.api.runtime.Token; import org.jboss.bpm.api.runtime.Token.TokenStatus; +import org.jboss.bpm.api.service.ProcessEngine; import org.jboss.bpm.incubator.model.Assignment; import org.jboss.bpm.incubator.model.Group; import org.jboss.bpm.incubator.model.NodeExt; @@ -131,8 +131,8 @@ @ManyToOne(targetEntity = ProcessDefinitionImpl.class) private ProcessDefinition procDef; - @ManyToOne(targetEntity = ProcessImpl.class) - private Process proc; + @ManyToOne(targetEntity = ProcessInstanceImpl.class) + private ProcessInstance proc; @ManyToOne(targetEntity = GroupImpl.class) private Group groupRef; @@ -155,7 +155,7 @@ } @Override - public Process getProcess() + public ProcessInstance getProcess() { return proc; } @@ -399,7 +399,7 @@ } @Override - protected void create(Process proc) + protected void create(ProcessInstance proc) { super.create(proc); this.proc = proc; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ProcessDefinitionImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ProcessDefinitionImpl.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ProcessDefinitionImpl.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -42,11 +42,11 @@ import org.hibernate.Hibernate; import org.hibernate.Session; import org.jboss.bpm.api.Constants; -import org.jboss.bpm.api.client.ProcessEngine; import org.jboss.bpm.api.model.Node; -import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.ProcessInstance; import org.jboss.bpm.api.model.ProcessDefinition; import org.jboss.bpm.api.model.builder.ObjectNameFactory; +import org.jboss.bpm.api.service.ProcessEngine; import org.jboss.bpm.incubator.model.Assignment; import org.jboss.bpm.incubator.model.Group; import org.jboss.bpm.incubator.model.Message; @@ -116,7 +116,7 @@ } @Override - public Process newInstance() + public ProcessInstance newInstance() { // Create a copy of the process structure from raw data ProcessStructureImpl procStructCopy; @@ -131,7 +131,7 @@ throw new IllegalStateException("Cannot deserialize process", ex); } - ProcessImpl procImpl = new ProcessImpl(getProcessEngine(), this, procStructCopy); + ProcessInstanceImpl procImpl = new ProcessInstanceImpl(getProcessEngine(), this, procStructCopy); return procImpl; } Deleted: 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 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ProcessImpl.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -1,498 +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.jboss.bpm.ri.model; - -//$Id$ - -import java.util.Date; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import javax.management.ObjectName; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.Transient; - -import org.hibernate.Hibernate; -import org.hibernate.Session; -import org.jboss.bpm.api.Constants; -import org.jboss.bpm.api.InvalidProcessException; -import org.jboss.bpm.api.client.ProcessEngine; -import org.jboss.bpm.api.model.Node; -import org.jboss.bpm.api.model.Process; -import org.jboss.bpm.api.model.ProcessDefinition; -import org.jboss.bpm.api.model.StartEvent; -import org.jboss.bpm.api.model.Event.EventDetailType; -import org.jboss.bpm.api.model.builder.ObjectNameFactory; -import org.jboss.bpm.api.runtime.Attachments; -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.incubator.client.ProcessExt; -import org.jboss.bpm.incubator.model.Assignment; -import org.jboss.bpm.incubator.model.Group; -import org.jboss.bpm.incubator.model.Message; -import org.jboss.bpm.incubator.model.ProcessStructureExt; -import org.jboss.bpm.incubator.model.Property; -import org.jboss.bpm.incubator.model.StartEventExt; -import org.jboss.bpm.incubator.service.ThreadingService; -import org.jboss.bpm.ri.runtime.TokenImpl; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * A Process is any Activity performed within a company or organization. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -@Entity(name = "BPMProcess") -public class ProcessImpl extends AbstractElementImpl implements ProcessExt, ProcessStructureExt -{ - private static final long serialVersionUID = 1L; - - // provide logging - final static Logger log = LoggerFactory.getLogger(ProcessImpl.class); - - @Enumerated(EnumType.STRING) - private ProcessStatus status = ProcessStatus.None; - - @ManyToOne(targetEntity = ProcessDefinitionImpl.class) - private ProcessDefinitionImpl procDef; - - @OneToOne(cascade = { CascadeType.ALL }, targetEntity = ProcessStructureImpl.class) - private ProcessStructureImpl procStruct; - - @Basic - private Date startDate; - - @Basic - private Date endDate; - - @Transient - private Token rootToken; - - @Transient - private transient RuntimeException runtimeException; - - public ProcessImpl(ProcessEngine engine, ProcessDefinitionImpl procDef, ProcessStructureImpl procStruct) - { - super(); - this.procStruct = procStruct; - this.procDef = procDef; - create(this); - } - - // Persistence ctor - protected ProcessImpl() - { - } - - @Override - @Transient - public ObjectName getKey() - { - StringBuilder str = new StringBuilder(Constants.ID_DOMAIN + ":"); - str.append("type=Process,name=" + getName() + ",id=" + getId()); - ObjectName oname = ObjectNameFactory.create(str.toString()); - return oname; - } - - @Override - public ProcessEngine getProcessEngine() - { - return procDef.getProcessEngine(); - } - - @Override - public ProcessDefinition getProcessDefinition() - { - return procDef; - } - - public ProcessStatus getProcessStatus() - { - return status; - } - - public void setProcessStatus(ProcessStatus status) - { - this.status = status; - } - - @Override - public void suspend() - { - if (status != ProcessStatus.Active) - throw new IllegalStateException("Cannot suspend a process in state: " + status); - - status = ProcessStatus.Suspended; - } - - @Override - public void resume() - { - if (status != ProcessStatus.Suspended) - throw new IllegalStateException("Cannot resume a process in state: " + status); - - status = ProcessStatus.Active; - } - - @Override - public void cancel() - { - if (status != ProcessStatus.Active && status != ProcessStatus.Suspended) - throw new IllegalStateException("Cannot cancel a process in state: " + status); - - status = ProcessStatus.Cancelled; - endDate = new Date(); - } - - public Date getStartDate() - { - return startDate; - } - - public void setStartDate(Date startDate) - { - this.startDate = startDate; - } - - public Date getEndDate() - { - return endDate; - } - - public void setEndDate(Date endDate) - { - this.endDate = endDate; - } - - @Override - public Token getRootToken() - { - return rootToken; - } - - @Override - public Set<Token> getTokens() - { - return getAllTokens(rootToken); - } - - private Set<Token> getAllTokens(Token token) - { - Set<Token> tokens = new HashSet<Token>(); - if (token != null) - { - tokens.add(token); - for (Token childToken : token.getChildTokens()) - tokens.addAll(getAllTokens(childToken)); - } - return tokens; - } - - @Override - public List<Assignment> getAssignments() - { - return procStruct.getAssignments(); - } - - @Override - public Message getMessage(String msgName) - { - return procStruct.getMessage(msgName); - } - - @Override - public List<Message> getMessages() - { - return procStruct.getMessages(); - } - - @Override - public String getName() - { - return procStruct.getName(); - } - - @Override - public <T extends Node> T getNode(Class<T> clazz, String name) - { - return procStruct.getNode(clazz, name); - } - - @Override - public Node getNode(String name) - { - return procStruct.getNode(name); - } - - @Override - public List<Node> getNodes() - { - return procStruct.getNodes(); - } - - @Override - public <T extends Node> List<T> getNodes(Class<T> clazz) - { - return procStruct.getNodes(clazz); - } - - @Override - public Group getGroup(String grpName) - { - return procStruct.getGroup(grpName); - } - - @Override - public List<Group> getGroups() - { - return procStruct.getGroups(); - } - - @Override - public Property getProperty(String name) - { - return procStruct.getProperty(name); - } - - @Override - public Set<Property> getProperties() - { - return procStruct.getProperties(); - } - - @Override - public Set<String> getPropertyNames() - { - return procStruct.getPropertyNames(); - } - - @Override - public void addProperty(Property prop) - { - procStruct.addProperty(prop); - } - - @Override - public void addProperty(String name, Object value) - { - procStruct.addProperty(name, value); - } - - @Override - public Property removeProperty(String name) - { - return procStruct.removeProperty(name); - } - - public RuntimeException getRuntimeException() - { - return runtimeException; - } - - public void setRuntimeException(RuntimeException rte) - { - this.runtimeException = rte; - setProcessStatus(ProcessStatus.Aborted); - } - - @Override - public Token startProcess() - { - rootToken = startProcessInternal(null); - return rootToken; - } - - @Override - public Token startProcess(Attachments att) - { - rootToken = startProcessInternal(att); - return rootToken; - } - - private Token startProcessInternal(Attachments att) - { - @SuppressWarnings("serial") - class InitialFlow extends SequenceFlowImpl - { - InitialFlow(StartEvent start) - { - super(start.getName()); - } - } - - // Prepare the process to start - StartEvent start = prepareProcessStart(); - setProcessStatus(ProcessStatus.Active); - - // Setup the initial token - TokenImpl token = new TokenImpl(this, att); - token.setLastFlow(new InitialFlow(start)); - token.setTokenStatus(TokenStatus.Started); - - // Signal the initial token - token.signal(); - - return token; - } - - public ObjectName startProcessAsync() - { - return startProcessAsyncInternal(null); - } - - public ObjectName startProcessAsync(Attachments att) - { - return startProcessAsyncInternal(att); - } - - private ObjectName startProcessAsyncInternal(Attachments att) - { - // Prepare the process to start - StartEvent start = prepareProcessStart(); - - ProcessEngine engine = getProcessEngine(); - ThreadingService exService = engine.getService(ThreadingService.class); - try - { - exService.startProcess(this, start, att); - return getKey(); - } - catch (RuntimeException rte) - { - // A process that cannot be started id unregistered automatically - ProcessService procService = getProcessEngine().getService(ProcessService.class); - procService.unregisterProcess(getKey()); - throw rte; - } - } - - private StartEvent prepareProcessStart() - { - // Veriy the process state - ProcessStatus procStatus = getProcessStatus(); - if (procStatus != ProcessStatus.None && procStatus != ProcessStatus.Ready) - throw new IllegalStateException("Cannot start process in state: " + procStatus); - - // Get the None Start Event if there is one and start the initial flow - StartEvent start = null; - for (StartEvent aux : getNodes(StartEvent.class)) - { - StartEventExt startExt = (StartEventExt)aux; - if (startExt.getTriggerType() == EventDetailType.None) - { - if (start != null) - throw new InvalidProcessException("Process cannot have multiple start events with no trigger"); - start = aux; - } - } - if (start == null) - { - List<StartEvent> startEvents = getNodes(StartEvent.class); - throw new IllegalStateException("Cannot obtain StartEvent of type 'None' to start the process explicitly: " + startEvents); - } - - // Register the process if needed - ProcessEngine engine = getProcessEngine(); - ProcessService procService = engine.getService(ProcessService.class); - if (procService.getProcess(getKey()) == null) - procService.registerProcess(this); - - return start; - } - - - public ProcessStatus waitForEnd() - { - return waitForEndInternal(0); - } - - public ProcessStatus waitForEnd(long timeout) - { - return waitForEndInternal(timeout); - } - - /** - * Wait for the Process to end. All Tokens that are generated at the Start Event for that Process must eventually - * arrive at an End Event. The Process will be in a running state until all Tokens are consumed. If the process was - * aborted this method throws the causing RuntimeException if avaialable. - */ - private ProcessStatus waitForEndInternal(long timeout) - { - ProcessEngine engine = getProcessEngine(); - ThreadingService exService = engine.getService(ThreadingService.class); - return exService.waitForEnd(this, timeout); - } - - @Override - public void initialize(ProcessEngine engine, Session session) - { - super.initialize(engine, session); - - Hibernate.initialize(this); - procDef.initialize(engine, session); - procStruct.initialize(engine, session); - } - - @Override - protected void create(Process proc) - { - super.create(proc); - procStruct.create(proc); - startDate = new Date(); - } - - @Override - public void register(Process proc) - { - super.register(proc); - procStruct.register(proc); - } - - @Override - public void unregister(Process proc) - { - super.unregister(proc); - procStruct.unregister(proc); - } - - @Override - protected void destroy(Process proc) - { - super.destroy(proc); - procStruct.destroy(proc); - } - - public String toString() - { - return "Process[" + getName() + ",status=" + getProcessStatus() + "]"; - } -} \ No newline at end of file Copied: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ProcessInstanceImpl.java (from rev 3233, 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/ProcessInstanceImpl.java (rev 0) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ProcessInstanceImpl.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -0,0 +1,498 @@ +/* + * 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.jboss.bpm.ri.model; + +//$Id$ + +import java.util.Date; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import javax.management.ObjectName; +import javax.persistence.Basic; +import javax.persistence.CascadeType; +import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; +import javax.persistence.ManyToOne; +import javax.persistence.OneToOne; +import javax.persistence.Transient; + +import org.hibernate.Hibernate; +import org.hibernate.Session; +import org.jboss.bpm.api.Constants; +import org.jboss.bpm.api.InvalidProcessException; +import org.jboss.bpm.api.model.Node; +import org.jboss.bpm.api.model.ProcessInstance; +import org.jboss.bpm.api.model.ProcessDefinition; +import org.jboss.bpm.api.model.StartEvent; +import org.jboss.bpm.api.model.Event.EventDetailType; +import org.jboss.bpm.api.model.builder.ObjectNameFactory; +import org.jboss.bpm.api.runtime.Attachments; +import org.jboss.bpm.api.runtime.Token; +import org.jboss.bpm.api.runtime.Token.TokenStatus; +import org.jboss.bpm.api.service.ProcessEngine; +import org.jboss.bpm.api.service.ProcessService; +import org.jboss.bpm.incubator.client.ProcessInstanceExt; +import org.jboss.bpm.incubator.model.Assignment; +import org.jboss.bpm.incubator.model.Group; +import org.jboss.bpm.incubator.model.Message; +import org.jboss.bpm.incubator.model.ProcessStructureExt; +import org.jboss.bpm.incubator.model.Property; +import org.jboss.bpm.incubator.model.StartEventExt; +import org.jboss.bpm.incubator.service.ThreadingService; +import org.jboss.bpm.ri.runtime.TokenImpl; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * A Process is any Activity performed within a company or organization. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +@Entity(name = "BPMProcessInstance") +public class ProcessInstanceImpl extends AbstractElementImpl implements ProcessInstanceExt, ProcessStructureExt +{ + private static final long serialVersionUID = 1L; + + // provide logging + final static Logger log = LoggerFactory.getLogger(ProcessInstanceImpl.class); + + @Enumerated(EnumType.STRING) + private ProcessStatus status = ProcessStatus.None; + + @ManyToOne(targetEntity = ProcessDefinitionImpl.class) + private ProcessDefinitionImpl procDef; + + @OneToOne(cascade = { CascadeType.ALL }, targetEntity = ProcessStructureImpl.class) + private ProcessStructureImpl procStruct; + + @Basic + private Date startDate; + + @Basic + private Date endDate; + + @Transient + private Token rootToken; + + @Transient + private transient RuntimeException runtimeException; + + public ProcessInstanceImpl(ProcessEngine engine, ProcessDefinitionImpl procDef, ProcessStructureImpl procStruct) + { + super(); + this.procStruct = procStruct; + this.procDef = procDef; + create(this); + } + + // Persistence ctor + protected ProcessInstanceImpl() + { + } + + @Override + @Transient + public ObjectName getKey() + { + StringBuilder str = new StringBuilder(Constants.ID_DOMAIN + ":"); + str.append("type=Process,name=" + getName() + ",id=" + getId()); + ObjectName oname = ObjectNameFactory.create(str.toString()); + return oname; + } + + @Override + public ProcessEngine getProcessEngine() + { + return procDef.getProcessEngine(); + } + + @Override + public ProcessDefinition getProcessDefinition() + { + return procDef; + } + + public ProcessStatus getProcessStatus() + { + return status; + } + + public void setProcessStatus(ProcessStatus status) + { + this.status = status; + } + + @Override + public void suspend() + { + if (status != ProcessStatus.Active) + throw new IllegalStateException("Cannot suspend a process in state: " + status); + + status = ProcessStatus.Suspended; + } + + @Override + public void resume() + { + if (status != ProcessStatus.Suspended) + throw new IllegalStateException("Cannot resume a process in state: " + status); + + status = ProcessStatus.Active; + } + + @Override + public void cancel() + { + if (status != ProcessStatus.Active && status != ProcessStatus.Suspended) + throw new IllegalStateException("Cannot cancel a process in state: " + status); + + status = ProcessStatus.Cancelled; + endDate = new Date(); + } + + public Date getStartDate() + { + return startDate; + } + + public void setStartDate(Date startDate) + { + this.startDate = startDate; + } + + public Date getEndDate() + { + return endDate; + } + + public void setEndDate(Date endDate) + { + this.endDate = endDate; + } + + @Override + public Token getRootToken() + { + return rootToken; + } + + @Override + public Set<Token> getTokens() + { + return getAllTokens(rootToken); + } + + private Set<Token> getAllTokens(Token token) + { + Set<Token> tokens = new HashSet<Token>(); + if (token != null) + { + tokens.add(token); + for (Token childToken : token.getChildTokens()) + tokens.addAll(getAllTokens(childToken)); + } + return tokens; + } + + @Override + public List<Assignment> getAssignments() + { + return procStruct.getAssignments(); + } + + @Override + public Message getMessage(String msgName) + { + return procStruct.getMessage(msgName); + } + + @Override + public List<Message> getMessages() + { + return procStruct.getMessages(); + } + + @Override + public String getName() + { + return procStruct.getName(); + } + + @Override + public <T extends Node> T getNode(Class<T> clazz, String name) + { + return procStruct.getNode(clazz, name); + } + + @Override + public Node getNode(String name) + { + return procStruct.getNode(name); + } + + @Override + public List<Node> getNodes() + { + return procStruct.getNodes(); + } + + @Override + public <T extends Node> List<T> getNodes(Class<T> clazz) + { + return procStruct.getNodes(clazz); + } + + @Override + public Group getGroup(String grpName) + { + return procStruct.getGroup(grpName); + } + + @Override + public List<Group> getGroups() + { + return procStruct.getGroups(); + } + + @Override + public Property getProperty(String name) + { + return procStruct.getProperty(name); + } + + @Override + public Set<Property> getProperties() + { + return procStruct.getProperties(); + } + + @Override + public Set<String> getPropertyNames() + { + return procStruct.getPropertyNames(); + } + + @Override + public void addProperty(Property prop) + { + procStruct.addProperty(prop); + } + + @Override + public void addProperty(String name, Object value) + { + procStruct.addProperty(name, value); + } + + @Override + public Property removeProperty(String name) + { + return procStruct.removeProperty(name); + } + + public RuntimeException getRuntimeException() + { + return runtimeException; + } + + public void setRuntimeException(RuntimeException rte) + { + this.runtimeException = rte; + setProcessStatus(ProcessStatus.Aborted); + } + + @Override + public Token startProcess() + { + rootToken = startProcessInternal(null); + return rootToken; + } + + @Override + public Token startProcess(Attachments att) + { + rootToken = startProcessInternal(att); + return rootToken; + } + + private Token startProcessInternal(Attachments att) + { + @SuppressWarnings("serial") + class InitialFlow extends SequenceFlowImpl + { + InitialFlow(StartEvent start) + { + super(start.getName()); + } + } + + // Prepare the process to start + StartEvent start = prepareProcessStart(); + setProcessStatus(ProcessStatus.Active); + + // Setup the initial token + TokenImpl token = new TokenImpl(this, att); + token.setLastFlow(new InitialFlow(start)); + token.setTokenStatus(TokenStatus.Started); + + // Signal the initial token + token.signal(); + + return token; + } + + public ObjectName startProcessAsync() + { + return startProcessAsyncInternal(null); + } + + public ObjectName startProcessAsync(Attachments att) + { + return startProcessAsyncInternal(att); + } + + private ObjectName startProcessAsyncInternal(Attachments att) + { + // Prepare the process to start + StartEvent start = prepareProcessStart(); + + ProcessEngine engine = getProcessEngine(); + ThreadingService exService = engine.getService(ThreadingService.class); + try + { + exService.startProcess(this, start, att); + return getKey(); + } + catch (RuntimeException rte) + { + // A process that cannot be started id unregistered automatically + ProcessService procService = getProcessEngine().getService(ProcessService.class); + procService.unregisterProcess(getKey()); + throw rte; + } + } + + private StartEvent prepareProcessStart() + { + // Veriy the process state + ProcessStatus procStatus = getProcessStatus(); + if (procStatus != ProcessStatus.None && procStatus != ProcessStatus.Ready) + throw new IllegalStateException("Cannot start process in state: " + procStatus); + + // Get the None Start Event if there is one and start the initial flow + StartEvent start = null; + for (StartEvent aux : getNodes(StartEvent.class)) + { + StartEventExt startExt = (StartEventExt)aux; + if (startExt.getTriggerType() == EventDetailType.None) + { + if (start != null) + throw new InvalidProcessException("Process cannot have multiple start events with no trigger"); + start = aux; + } + } + if (start == null) + { + List<StartEvent> startEvents = getNodes(StartEvent.class); + throw new IllegalStateException("Cannot obtain StartEvent of type 'None' to start the process explicitly: " + startEvents); + } + + // Register the process if needed + ProcessEngine engine = getProcessEngine(); + ProcessService procService = engine.getService(ProcessService.class); + if (procService.getProcess(getKey()) == null) + procService.registerProcess(this); + + return start; + } + + + public ProcessStatus waitForEnd() + { + return waitForEndInternal(0); + } + + public ProcessStatus waitForEnd(long timeout) + { + return waitForEndInternal(timeout); + } + + /** + * Wait for the Process to end. All Tokens that are generated at the Start Event for that Process must eventually + * arrive at an End Event. The Process will be in a running state until all Tokens are consumed. If the process was + * aborted this method throws the causing RuntimeException if avaialable. + */ + private ProcessStatus waitForEndInternal(long timeout) + { + ProcessEngine engine = getProcessEngine(); + ThreadingService exService = engine.getService(ThreadingService.class); + return exService.waitForEnd(this, timeout); + } + + @Override + public void initialize(ProcessEngine engine, Session session) + { + super.initialize(engine, session); + + Hibernate.initialize(this); + procDef.initialize(engine, session); + procStruct.initialize(engine, session); + } + + @Override + protected void create(ProcessInstance proc) + { + super.create(proc); + procStruct.create(proc); + startDate = new Date(); + } + + @Override + public void register(ProcessInstance proc) + { + super.register(proc); + procStruct.register(proc); + } + + @Override + public void unregister(ProcessInstance proc) + { + super.unregister(proc); + procStruct.unregister(proc); + } + + @Override + protected void destroy(ProcessInstance proc) + { + super.destroy(proc); + procStruct.destroy(proc); + } + + public String toString() + { + return "Process[" + getName() + ",status=" + getProcessStatus() + "]"; + } +} \ No newline at end of file Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ProcessStructureImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ProcessStructureImpl.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ProcessStructureImpl.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -41,13 +41,13 @@ import org.hibernate.annotations.IndexColumn; import org.jboss.bpm.api.Constants; import org.jboss.bpm.api.InvalidProcessException; -import org.jboss.bpm.api.client.ProcessEngine; import org.jboss.bpm.api.model.EndEvent; import org.jboss.bpm.api.model.Node; -import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.ProcessInstance; import org.jboss.bpm.api.model.ProcessDefinition; import org.jboss.bpm.api.model.StartEvent; import org.jboss.bpm.api.model.builder.ObjectNameFactory; +import org.jboss.bpm.api.service.ProcessEngine; import org.jboss.bpm.incubator.model.Assignment; import org.jboss.bpm.incubator.model.Group; import org.jboss.bpm.incubator.model.Message; @@ -360,7 +360,7 @@ } @Override - protected void create(Process proc) + protected void create(ProcessInstance proc) { super.create(proc); for (Node node : getNodes()) @@ -371,7 +371,7 @@ } @Override - protected void register(Process proc) + protected void register(ProcessInstance proc) { super.register(proc); for (Node node : getNodes()) @@ -382,7 +382,7 @@ } @Override - protected void unregister(Process proc) + protected void unregister(ProcessInstance proc) { super.unregister(proc); for (Node node : getNodes()) @@ -393,7 +393,7 @@ } @Override - protected void destroy(Process proc) + protected void destroy(ProcessInstance proc) { super.destroy(proc); for (Node node : getNodes()) Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ReceiveTaskImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ReceiveTaskImpl.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ReceiveTaskImpl.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -31,7 +31,7 @@ import org.jboss.bpm.api.InvalidProcessException; import org.jboss.bpm.api.NotImplementedException; -import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.ProcessInstance; import org.jboss.bpm.api.model.ProcessDefinition; import org.jboss.bpm.api.model.ProcessStructure; import org.jboss.bpm.api.runtime.Attachments; @@ -165,7 +165,7 @@ } @Override - protected void create(Process proc) + protected void create(ProcessInstance proc) { super.create(proc); Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/SendTaskImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/SendTaskImpl.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/SendTaskImpl.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -28,7 +28,7 @@ import org.jboss.bpm.api.InvalidProcessException; import org.jboss.bpm.api.model.Node; -import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.ProcessInstance; import org.jboss.bpm.api.model.ProcessDefinition; import org.jboss.bpm.api.model.ProcessStructure; import org.jboss.bpm.api.runtime.Token; @@ -119,7 +119,7 @@ } @Override - protected void create(Process proc) + protected void create(ProcessInstance proc) { super.create(proc); Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/StartEventImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/StartEventImpl.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/StartEventImpl.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -29,15 +29,15 @@ import org.jboss.bpm.api.Constants; import org.jboss.bpm.api.InvalidProcessException; -import org.jboss.bpm.api.client.ProcessEngine; import org.jboss.bpm.api.model.Node; -import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.ProcessInstance; import org.jboss.bpm.api.model.ProcessDefinition; import org.jboss.bpm.api.model.ProcessStructure; import org.jboss.bpm.api.model.SequenceFlow; import org.jboss.bpm.api.model.StartEvent; import org.jboss.bpm.api.model.builder.ObjectNameFactory; import org.jboss.bpm.api.runtime.Token; +import org.jboss.bpm.api.service.ProcessEngine; import org.jboss.bpm.incubator.client.SignalListener; import org.jboss.bpm.incubator.model.Signal; import org.jboss.bpm.incubator.model.StartEventExt; @@ -191,7 +191,7 @@ // There MAY be multiple Start Events for a given Process level. Each Start Event is an independent event. // That is, a Process Instance SHALL be generated when the Start Event is triggered. - Process proc = procDef.newInstance(); + ProcessInstance proc = procDef.newInstance(); StartEvent startEvent = proc.getNode(StartEvent.class, startEventName); ThreadingService execService = engine.getService(ThreadingService.class); Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/TaskImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/TaskImpl.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/TaskImpl.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -39,7 +39,6 @@ import org.jboss.bpm.api.Constants; import org.jboss.bpm.api.InvalidProcessException; import org.jboss.bpm.api.NotImplementedException; -import org.jboss.bpm.api.client.ProcessEngine; import org.jboss.bpm.api.model.Expression; import org.jboss.bpm.api.model.Node; import org.jboss.bpm.api.model.ProcessStructure; @@ -47,6 +46,7 @@ import org.jboss.bpm.api.model.builder.ObjectNameFactory; import org.jboss.bpm.api.runtime.Attachments; import org.jboss.bpm.api.runtime.Token; +import org.jboss.bpm.api.service.ProcessEngine; import org.jboss.bpm.incubator.model.InputSet; import org.jboss.bpm.incubator.model.OutputSet; import org.jboss.bpm.incubator.model.Property; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/UserTaskImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/UserTaskImpl.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/UserTaskImpl.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -33,7 +33,7 @@ import javax.persistence.Transient; import org.jboss.bpm.api.InvalidProcessException; -import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.ProcessInstance; import org.jboss.bpm.api.model.ProcessDefinition; import org.jboss.bpm.api.model.ProcessStructure; import org.jboss.bpm.api.runtime.Attachments; @@ -202,7 +202,7 @@ } @Override - protected void create(Process proc) + protected void create(ProcessInstance proc) { super.create(proc); @@ -212,7 +212,7 @@ } @Override - protected void register(Process proc) + protected void register(ProcessInstance proc) { super.register(proc); @@ -227,7 +227,7 @@ } @Override - protected void unregister(Process proc) + protected void unregister(ProcessInstance proc) { super.unregister(proc); Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/builder/ProcessBuilderImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/builder/ProcessBuilderImpl.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/builder/ProcessBuilderImpl.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -24,14 +24,14 @@ //$Id$ import org.jboss.bpm.api.NotImplementedException; -import org.jboss.bpm.api.client.ProcessEngine; -import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.ProcessInstance; import org.jboss.bpm.api.model.ProcessDefinition; import org.jboss.bpm.api.model.Event.EventDetailType; import org.jboss.bpm.api.model.Expression.ExpressionLanguage; import org.jboss.bpm.api.model.Gateway.GatewayType; import org.jboss.bpm.api.model.Task.TaskType; import org.jboss.bpm.api.model.builder.GatewayBuilder; +import org.jboss.bpm.api.service.ProcessEngine; import org.jboss.bpm.incubator.model.Assignment.AssignTime; import org.jboss.bpm.incubator.model.Group.GroupType; import org.jboss.bpm.incubator.model.builder.EventBuilder; @@ -64,7 +64,7 @@ import org.jboss.bpm.ri.model.WaitStateImpl; /** - * The ProcessBuilder can be used to dynamically build a {@link Process}. + * The ProcessBuilder can be used to dynamically build a {@link ProcessInstance}. * * @author thomas.diesler(a)jboss.com * @since 08-Jul-2008 Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/DelegatingAttachments.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/DelegatingAttachments.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/DelegatingAttachments.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -29,14 +29,14 @@ import java.util.Map; import org.jboss.bpm.api.model.Node; -import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.ProcessInstance; import org.jboss.bpm.api.runtime.Attachments; import org.jboss.bpm.incubator.model.NodeExt; import org.jboss.bpm.incubator.model.ProcessDefinitionExt; import org.jboss.bpm.incubator.model.Property; /** - * An ExecutionContext that delegates to the current {@link Node} or {@link Process} for property rerieval. + * An ExecutionContext that delegates to the current {@link Node} or {@link ProcessInstance} for property rerieval. * * @author Thomas.Diesler(a)jboss.com * @since 15-Aug-2008 Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/DelegatingToken.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/DelegatingToken.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/DelegatingToken.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -28,12 +28,12 @@ import javax.management.ObjectName; import org.hibernate.Session; -import org.jboss.bpm.api.client.ProcessEngine; import org.jboss.bpm.api.model.Node; -import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.ProcessInstance; import org.jboss.bpm.api.model.SequenceFlow; import org.jboss.bpm.api.runtime.Attachments; import org.jboss.bpm.api.runtime.Token; +import org.jboss.bpm.api.service.ProcessEngine; import org.jboss.bpm.incubator.model.NodeExt; /** @@ -93,7 +93,7 @@ } @Override - public Process getProcess() + public ProcessInstance getProcess() { return delegateToken.getProcess(); } Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/InProcessTokenExecutor.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/InProcessTokenExecutor.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/InProcessTokenExecutor.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -23,7 +23,7 @@ //$Id$ -import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.ProcessInstance; import org.jboss.bpm.api.model.SequenceFlow; import org.jboss.bpm.api.runtime.Token; import org.jboss.bpm.api.runtime.Token.TokenStatus; @@ -43,9 +43,9 @@ final static Logger log = LoggerFactory.getLogger(InProcessTokenExecutor.class); @SuppressWarnings("unused") - private Process proc; + private ProcessInstance proc; - public InProcessTokenExecutor(Process proc) + public InProcessTokenExecutor(ProcessInstance proc) { this.proc = proc; } Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/MessageSender.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/MessageSender.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/MessageSender.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -25,10 +25,10 @@ import javax.management.ObjectName; -import org.jboss.bpm.api.client.ProcessEngine; import org.jboss.bpm.api.model.Node; import org.jboss.bpm.api.runtime.Attachments; import org.jboss.bpm.api.runtime.Token; +import org.jboss.bpm.api.service.ProcessEngine; import org.jboss.bpm.incubator.model.Message; import org.jboss.bpm.incubator.model.Participant; import org.jboss.bpm.incubator.model.Property; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/PersistenceSessionInterceptor.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/PersistenceSessionInterceptor.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/PersistenceSessionInterceptor.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -24,8 +24,8 @@ //$Id$ import org.hibernate.Session; -import org.jboss.bpm.api.client.ProcessEngine; import org.jboss.bpm.api.runtime.Token.TokenStatus; +import org.jboss.bpm.api.service.ProcessEngine; import org.jboss.bpm.incubator.service.PersistenceService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/RunnableToken.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/RunnableToken.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/RunnableToken.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -22,12 +22,12 @@ package org.jboss.bpm.ri.runtime; import org.jboss.bpm.api.model.Node; -import org.jboss.bpm.api.model.Process; -import org.jboss.bpm.api.model.Process.ProcessStatus; +import org.jboss.bpm.api.model.ProcessInstance; +import org.jboss.bpm.api.model.ProcessInstance.ProcessStatus; 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.ri.model.ProcessImpl; +import org.jboss.bpm.ri.model.ProcessInstanceImpl; import org.jboss.bpm.ri.service.ProcessServiceImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -67,7 +67,7 @@ public void run() { - Process proc = rtProc.getProcess(); + ProcessInstance proc = rtProc.getProcess(); try { Node node = token.getCurrentNode(); @@ -101,7 +101,7 @@ catch (RuntimeException rte) { log.error("Process aborted: " + proc, rte); - ((ProcessImpl)proc).setRuntimeException(rte); + ((ProcessInstanceImpl)proc).setRuntimeException(rte); log.debug("Terminate all suspended tokens"); for (Token auxToken : tokenExecutor.getRunnableTokens()) Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/RuntimeProcess.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/RuntimeProcess.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/RuntimeProcess.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -23,13 +23,13 @@ //$Id$ -import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.ProcessInstance; import org.jboss.bpm.incubator.runtime.TokenExecutor; /** - * A RuntimeProcess add runtime behaviour to the {@link Process} + * A RuntimeProcess add runtime behaviour to the {@link ProcessInstance} * - * To protect the engine from maligious user code it does not extend {@link Process} directly. + * To protect the engine from maligious user code it does not extend {@link ProcessInstance} directly. * * @author thomas.diesler(a)jboss.com * @since 08-Jul-2008 @@ -37,12 +37,12 @@ public interface RuntimeProcess { /** - * Get the associated {@link Process} + * Get the associated {@link ProcessInstance} */ - Process getProcess(); + ProcessInstance getProcess(); /** - * Get the {@link TokenExecutor} for this {@link Process} + * Get the {@link TokenExecutor} for this {@link ProcessInstance} */ ThreadingTokenExecutor getTokenExecutor(); } \ No newline at end of file Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/RuntimeProcessImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/RuntimeProcessImpl.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/RuntimeProcessImpl.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -23,26 +23,26 @@ //$Id$ -import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.ProcessInstance; /** - * A RuntimeProcess add runtime behaviour to the {@link Process} + * A RuntimeProcess add runtime behaviour to the {@link ProcessInstance} * * @author thomas.diesler(a)jboss.com * @since 08-Jul-2008 */ public class RuntimeProcessImpl implements RuntimeProcess { - private Process proc; + private ProcessInstance proc; private ThreadingTokenExecutor tokenExecutor; - public RuntimeProcessImpl(Process proc) + public RuntimeProcessImpl(ProcessInstance proc) { this.proc = proc; this.tokenExecutor = new ThreadingTokenExecutor(this); } - public Process getProcess() + public ProcessInstance getProcess() { return proc; } Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/ThreadingTokenExecutor.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/ThreadingTokenExecutor.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/ThreadingTokenExecutor.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -34,7 +34,7 @@ import javax.management.ObjectName; import org.jboss.bpm.api.model.SequenceFlow; -import org.jboss.bpm.api.model.Process.ProcessStatus; +import org.jboss.bpm.api.model.ProcessInstance.ProcessStatus; import org.jboss.bpm.api.runtime.Token; import org.jboss.bpm.api.runtime.Token.TokenStatus; import org.jboss.bpm.incubator.runtime.FlowHandler; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/TokenImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/TokenImpl.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/TokenImpl.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -32,20 +32,20 @@ import org.hibernate.Session; import org.jboss.bpm.api.Constants; import org.jboss.bpm.api.NotImplementedException; -import org.jboss.bpm.api.client.ProcessEngine; import org.jboss.bpm.api.model.Node; -import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.ProcessInstance; import org.jboss.bpm.api.model.SequenceFlow; import org.jboss.bpm.api.model.WaitState; -import org.jboss.bpm.api.model.Process.ProcessStatus; +import org.jboss.bpm.api.model.ProcessInstance.ProcessStatus; import org.jboss.bpm.api.model.builder.ObjectNameFactory; import org.jboss.bpm.api.runtime.Attachments; import org.jboss.bpm.api.runtime.BasicAttachments; import org.jboss.bpm.api.runtime.Token; import org.jboss.bpm.api.runtime.Attachments.Key; +import org.jboss.bpm.api.service.ProcessEngine; import org.jboss.bpm.api.service.ProcessService; import org.jboss.bpm.incubator.runtime.TokenExecutor; -import org.jboss.bpm.ri.model.ProcessImpl; +import org.jboss.bpm.ri.model.ProcessInstanceImpl; import org.jboss.bpm.ri.service.ProcessServiceImpl; import org.jboss.util.id.UID; @@ -67,7 +67,7 @@ private SequenceFlow flow; private Attachments att; private TokenStatus status; - private Process proc; + private ProcessInstance proc; private Session session; private Token parentToken; @@ -76,7 +76,7 @@ /** * Construct a Token with given {@link Attachments} */ - public TokenImpl(Process proc, Attachments att) + public TokenImpl(ProcessInstance proc, Attachments att) { this.att = new BasicAttachments(att); this.key = ObjectNameFactory.create(Constants.ID_DOMAIN + ":id=" + new UID()); @@ -109,7 +109,7 @@ } @Override - public Process getProcess() + public ProcessInstance getProcess() { return proc; } @@ -228,7 +228,7 @@ } catch (RuntimeException rte) { - ProcessImpl procImpl = (ProcessImpl)getProcess(); + ProcessInstanceImpl procImpl = (ProcessInstanceImpl)getProcess(); procImpl.setRuntimeException(rte); procImpl.setProcessStatus(ProcessStatus.Aborted); throw rte; @@ -237,7 +237,7 @@ // Set Process to completed if (getRootToken().getTokenStatus() == TokenStatus.Destroyed) { - ProcessImpl procImpl = (ProcessImpl)getProcess(); + ProcessInstanceImpl procImpl = (ProcessInstanceImpl)getProcess(); procImpl.setProcessStatus(ProcessStatus.Completed); } } Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/TransactionInterceptor.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/TransactionInterceptor.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/TransactionInterceptor.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -28,8 +28,8 @@ import org.jboss.bpm.api.Constants; import org.jboss.bpm.api.NotImplementedException; import org.jboss.bpm.api.Constants.TxType; -import org.jboss.bpm.api.client.ProcessEngine; import org.jboss.bpm.api.model.Node; +import org.jboss.bpm.api.service.ProcessEngine; import org.jboss.bpm.incubator.model.Group; import org.jboss.bpm.incubator.model.NodeExt; import org.jboss.bpm.incubator.model.Property; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/DialectHandlerServiceImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/DialectHandlerServiceImpl.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/DialectHandlerServiceImpl.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -26,8 +26,8 @@ import java.net.URI; import java.util.Map; -import org.jboss.bpm.api.client.ProcessEngine; import org.jboss.bpm.api.service.DialectHandler; +import org.jboss.bpm.api.service.ProcessEngine; import org.jboss.bpm.api.service.internal.AbstractDialectHandlerService; /** Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/HibernatePersistenceServiceImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/HibernatePersistenceServiceImpl.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/HibernatePersistenceServiceImpl.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -36,15 +36,15 @@ import org.hibernate.cfg.AnnotationConfiguration; import org.jboss.bpm.api.NodeNotFoundException; import org.jboss.bpm.api.ProcessNotFoundException; -import org.jboss.bpm.api.client.ProcessEngine; import org.jboss.bpm.api.model.Node; -import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.ProcessInstance; import org.jboss.bpm.api.model.ProcessDefinition; +import org.jboss.bpm.api.service.ProcessEngine; import org.jboss.bpm.api.service.Service; import org.jboss.bpm.incubator.service.PersistenceService; import org.jboss.bpm.ri.model.AbstractElementImpl; import org.jboss.bpm.ri.model.ProcessDefinitionImpl; -import org.jboss.bpm.ri.model.ProcessImpl; +import org.jboss.bpm.ri.model.ProcessInstanceImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -151,7 +151,7 @@ } @Override - public ObjectName saveProcess(Process proc) + public ObjectName saveProcess(ProcessInstance proc) { log.debug("START saveProcess: " + proc.getKey()); Session session = getSessionFactory().openSession(); @@ -170,15 +170,15 @@ } @Override - public Process loadProcess(ObjectName procID) + public ProcessInstance loadProcess(ObjectName procID) { log.debug("START loadProcess: " + procID); - Process proc = null; + ProcessInstance proc = null; Session session = getSessionFactory().openSession(); try { Integer id = Integer.valueOf(procID.getKeyProperty("id")); - proc = (Process)session.load(ProcessImpl.class, id); + proc = (ProcessInstance)session.load(ProcessInstanceImpl.class, id); AbstractElementImpl elImpl = (AbstractElementImpl)proc; elImpl.initialize(getProcessEngine(), session); } @@ -195,7 +195,7 @@ } @Override - public void deleteProcess(Process proc) + public void deleteProcess(ProcessInstance proc) { log.debug("START deleteProcess: " + proc); Session session = getSessionFactory().openSession(); @@ -204,7 +204,7 @@ { ObjectName procID = proc.getKey(); Integer id = Integer.valueOf(procID.getKeyProperty("id")); - proc = (Process)session.load(ProcessImpl.class, id); + proc = (ProcessInstance)session.load(ProcessInstanceImpl.class, id); session.delete(proc); tx.commit(); } Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/InMemoryPersistenceServiceImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/InMemoryPersistenceServiceImpl.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/InMemoryPersistenceServiceImpl.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -30,10 +30,10 @@ import org.hibernate.Session; import org.jboss.bpm.api.ProcessNotFoundException; -import org.jboss.bpm.api.client.ProcessEngine; import org.jboss.bpm.api.model.Node; -import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.ProcessInstance; import org.jboss.bpm.api.model.ProcessDefinition; +import org.jboss.bpm.api.service.ProcessEngine; import org.jboss.bpm.incubator.service.PersistenceService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -50,7 +50,7 @@ final Logger log = LoggerFactory.getLogger(InMemoryPersistenceServiceImpl.class); private Map<ObjectName, ProcessDefinition> procDefs = new HashMap<ObjectName, ProcessDefinition>(); - private Map<ObjectName, Process> procs = new HashMap<ObjectName, Process>(); + private Map<ObjectName, ProcessInstance> procs = new HashMap<ObjectName, ProcessInstance>(); private Map<ObjectName, Node> nodes = new HashMap<ObjectName, Node>(); @Override @@ -89,7 +89,7 @@ } @Override - public ObjectName saveProcess(Process proc) + public ObjectName saveProcess(ProcessInstance proc) { procs.put(proc.getKey(), proc); @@ -100,9 +100,9 @@ } @Override - public Process loadProcess(ObjectName procID) + public ProcessInstance loadProcess(ObjectName procID) { - Process proc = procs.get(procID); + ProcessInstance proc = procs.get(procID); if (proc == null) throw new ProcessNotFoundException("Cannot find process: " + procID); @@ -110,7 +110,7 @@ } @Override - public void deleteProcess(Process proc) + public void deleteProcess(ProcessInstance proc) { procs.remove(proc.getKey()); Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/MessageBuilderServiceImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/MessageBuilderServiceImpl.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/MessageBuilderServiceImpl.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -23,7 +23,7 @@ // $Id$ -import org.jboss.bpm.api.client.ProcessEngine; +import org.jboss.bpm.api.service.ProcessEngine; import org.jboss.bpm.incubator.model.Message; import org.jboss.bpm.incubator.model.builder.MessageBuilder; import org.jboss.bpm.incubator.service.MessageBuilderService; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/MessageServiceImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/MessageServiceImpl.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/MessageServiceImpl.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -27,7 +27,7 @@ import javax.transaction.Synchronization; import org.hibernate.Transaction; -import org.jboss.bpm.api.client.ProcessEngine; +import org.jboss.bpm.api.service.ProcessEngine; import org.jboss.bpm.incubator.client.MessageListener; import org.jboss.bpm.incubator.model.Message; import org.jboss.bpm.incubator.service.MessageService; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/MutableService.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/MutableService.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/MutableService.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -23,7 +23,7 @@ // $Id$ -import org.jboss.bpm.api.client.ProcessEngine; +import org.jboss.bpm.api.service.ProcessEngine; import org.jboss.bpm.api.service.Service; /** Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessBuilderServiceImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessBuilderServiceImpl.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessBuilderServiceImpl.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -23,14 +23,14 @@ // $Id$ -import org.jboss.bpm.api.client.ProcessEngine; -import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.ProcessInstance; import org.jboss.bpm.api.service.ProcessBuilderService; +import org.jboss.bpm.api.service.ProcessEngine; import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt; import org.jboss.bpm.ri.model.builder.ProcessBuilderImpl; /** - * The ProcessBuilder can be used to build a {@link Process} dynamically. + * The ProcessBuilder can be used to build a {@link ProcessInstance} dynamically. * * @author thomas.diesler(a)jboss.com * @since 18-Jun-2008 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 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessDefinitionServiceImpl.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -30,9 +30,9 @@ import javax.management.ObjectName; -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.ProcessEngine; import org.jboss.bpm.api.service.ProcessService; import org.jboss.bpm.api.service.internal.AbstractProcessDefinitionService; import org.jboss.bpm.incubator.service.PersistenceService; Copied: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessEngineImpl.java (from rev 3233, projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/ProcessEngineImpl.java) =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessEngineImpl.java (rev 0) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessEngineImpl.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -0,0 +1,53 @@ +/* + * 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.jboss.bpm.ri.service; + +//$Id$ + +import java.util.Set; + +import org.jboss.bpm.api.service.ProcessEngine; +import org.jboss.bpm.api.service.Service; + +/** + * A process engine with public access + * + * @author thomas.diesler(a)jboss.com + * @since 18-Jun-2008 + */ +public class ProcessEngineImpl extends ProcessEngine +{ + public void setServices(Set<Service> services) + { + this.services = services; + + // Set this engine on every mutable service + for (Service service : services) + { + if (service instanceof MutableService) + { + MutableService mutService = (MutableService)service; + mutService.setProcessEngine(this); + } + } + } +} 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 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessServiceImpl.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -33,15 +33,15 @@ import javax.management.ObjectName; -import org.jboss.bpm.api.client.ProcessEngine; -import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.ProcessInstance; import org.jboss.bpm.api.model.ProcessDefinition; -import org.jboss.bpm.api.model.Process.ProcessStatus; +import org.jboss.bpm.api.model.ProcessInstance.ProcessStatus; import org.jboss.bpm.api.service.ProcessDefinitionService; +import org.jboss.bpm.api.service.ProcessEngine; 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; +import org.jboss.bpm.ri.model.ProcessInstanceImpl; import org.jboss.bpm.ri.runtime.NodeInterceptor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -57,7 +57,7 @@ // Provide logging final static Logger log = LoggerFactory.getLogger(ProcessServiceImpl.class); - private Map<ObjectName, Process> registeredProcs = new HashMap<ObjectName, Process>(); + private Map<ObjectName, ProcessInstance> registeredProcs = new HashMap<ObjectName, ProcessInstance>(); private List<NodeInterceptor> nodeInterceptors = new ArrayList<NodeInterceptor>(); @Override @@ -84,9 +84,9 @@ * Get a Process for a given id */ @Override - public Process getProcess(ObjectName procID) + public ProcessInstance getProcess(ObjectName procID) { - Process proc = registeredProcs.get(procID); + ProcessInstance proc = registeredProcs.get(procID); return proc; } @@ -110,7 +110,7 @@ public Set<ObjectName> getProcesses(ObjectName procDefID, ProcessStatus status) { Set<ObjectName> procSet = new HashSet<ObjectName>(); - for (Process auxProc : registeredProcs.values()) + for (ProcessInstance auxProc : registeredProcs.values()) { ObjectName auxProcDefID = auxProc.getProcessDefinition().getKey(); if (auxProcDefID.equals(procDefID)) @@ -125,7 +125,7 @@ /** * Register a Process. */ - public Process registerProcess(Process proc) + public ProcessInstance registerProcess(ProcessInstance proc) { log.debug("registerProcess: " + proc); @@ -149,7 +149,7 @@ ObjectName procID = persService.saveProcess(proc); registeredProcs.put(procID, proc); - ProcessImpl procImpl = (ProcessImpl)proc; + ProcessInstanceImpl procImpl = (ProcessInstanceImpl)proc; procImpl.register(proc); procImpl.setProcessStatus(ProcessStatus.Ready); @@ -162,12 +162,12 @@ public boolean unregisterProcess(ObjectName procID) { boolean removed = false; - Process proc = registeredProcs.get(procID); + ProcessInstance proc = registeredProcs.get(procID); if (proc != null) { log.debug("unregisterProcess: " + proc); - ProcessImpl procImpl = (ProcessImpl)proc; + ProcessInstanceImpl procImpl = (ProcessInstanceImpl)proc; procImpl.unregister(procImpl); // Delete the process through the PersistenceService Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/SignalBuilderServiceImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/SignalBuilderServiceImpl.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/SignalBuilderServiceImpl.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -23,7 +23,7 @@ // $Id$ -import org.jboss.bpm.api.client.ProcessEngine; +import org.jboss.bpm.api.service.ProcessEngine; import org.jboss.bpm.incubator.model.Signal; import org.jboss.bpm.incubator.model.builder.SignalBuilder; import org.jboss.bpm.incubator.service.SignalBuilderService; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/SignalServiceImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/SignalServiceImpl.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/SignalServiceImpl.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -23,7 +23,7 @@ // $Id$ -import org.jboss.bpm.api.client.ProcessEngine; +import org.jboss.bpm.api.service.ProcessEngine; import org.jboss.bpm.incubator.service.SignalService; /** 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 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ThreadingServiceImpl.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -30,22 +30,22 @@ import org.jboss.bpm.api.BPMException; import org.jboss.bpm.api.ProcessTimeoutException; -import org.jboss.bpm.api.client.ProcessEngine; import org.jboss.bpm.api.model.Expression; -import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.ProcessInstance; import org.jboss.bpm.api.model.StartEvent; -import org.jboss.bpm.api.model.Process.ProcessStatus; +import org.jboss.bpm.api.model.ProcessInstance.ProcessStatus; import org.jboss.bpm.api.runtime.Attachments; import org.jboss.bpm.api.runtime.Token; +import org.jboss.bpm.api.service.ProcessEngine; import org.jboss.bpm.api.service.ProcessService; -import org.jboss.bpm.incubator.client.ProcessExt; +import org.jboss.bpm.incubator.client.ProcessInstanceExt; import org.jboss.bpm.incubator.model.Assignment; import org.jboss.bpm.incubator.model.Assignment.AssignTime; import org.jboss.bpm.incubator.model.Signal.SignalType; import org.jboss.bpm.incubator.runtime.TokenExecutor; import org.jboss.bpm.incubator.service.SignalService; import org.jboss.bpm.incubator.service.ThreadingService; -import org.jboss.bpm.ri.model.ProcessImpl; +import org.jboss.bpm.ri.model.ProcessInstanceImpl; import org.jboss.bpm.ri.model.SequenceFlowImpl; import org.jboss.bpm.ri.model.SignalImpl; import org.jboss.bpm.ri.runtime.DelegatingToken; @@ -77,12 +77,12 @@ } @Override - public void startProcess(Process proc, StartEvent start, Attachments att) + public void startProcess(ProcessInstance proc, StartEvent start, Attachments att) { startProcessInternal(proc, start, att); } - private synchronized void startProcessInternal(Process proc, StartEvent start, Attachments att) + private synchronized void startProcessInternal(ProcessInstance proc, StartEvent start, Attachments att) { @SuppressWarnings("serial") class InitialFlow extends SequenceFlowImpl @@ -128,14 +128,14 @@ } // Do the start time assignments - startTimeAssignments((ProcessExt)proc, initialToken); + startTimeAssignments((ProcessInstanceExt)proc, initialToken); // Start the initial token tokenExecutor.start(initialToken); } // Evaluate the Start time assignments - private void startTimeAssignments(ProcessExt proc, Token token) + private void startTimeAssignments(ProcessInstanceExt proc, Token token) { DelegatingToken delegatingToken = new DelegatingToken((MutableToken)token); Attachments atts = token.getAttachments(); @@ -152,12 +152,12 @@ } } - public ProcessStatus waitForEnd(Process proc) + public ProcessStatus waitForEnd(ProcessInstance proc) { return waitForEndInternal(proc, 0); } - public ProcessStatus waitForEnd(Process proc, long timeout) + public ProcessStatus waitForEnd(ProcessInstance proc, long timeout) { return waitForEndInternal(proc, timeout); } @@ -167,9 +167,9 @@ * arrive at an End Event. The Process will be in a running state until all Tokens are consumed. If the process was * aborted this method throws the causing RuntimeException if avaialable. */ - private ProcessStatus waitForEndInternal(Process proc, long timeout) + private ProcessStatus waitForEndInternal(ProcessInstance proc, long timeout) { - ProcessImpl procImpl = (ProcessImpl)proc; + ProcessInstanceImpl procImpl = (ProcessInstanceImpl)proc; ProcessStatus status = proc.getProcessStatus(); if (status == ProcessStatus.None) @@ -232,13 +232,13 @@ return status; } - private boolean isProcessTerminated(Process proc) + private boolean isProcessTerminated(ProcessInstance proc) { ProcessStatus status = proc.getProcessStatus(); return status == ProcessStatus.Cancelled || status == ProcessStatus.Completed || status == ProcessStatus.Aborted; } - private RuntimeProcess getRuntimeProcess(Process proc, boolean createNew) + private RuntimeProcess getRuntimeProcess(ProcessInstance proc, boolean createNew) { RuntimeProcess rtProcess; synchronized (runtimeProcesses) @@ -268,8 +268,8 @@ public void run() { ThreadingTokenExecutor tokenExecutor = rtProc.getTokenExecutor(); - ProcessImpl procImpl = (ProcessImpl)rtProc.getProcess(); - Process proc = rtProc.getProcess(); + ProcessInstanceImpl procImpl = (ProcessInstanceImpl)rtProc.getProcess(); + ProcessInstance proc = rtProc.getProcess(); ProcessEngine engine = getProcessEngine(); SignalService sigService = engine.getService(SignalService.class); Modified: projects/spec/trunk/modules/ri/src/main/resources/jbpm-cfg-beans.xml =================================================================== --- projects/spec/trunk/modules/ri/src/main/resources/jbpm-cfg-beans.xml 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/ri/src/main/resources/jbpm-cfg-beans.xml 2008-12-05 17:49:30 UTC (rev 3234) @@ -2,12 +2,12 @@ xmlns="urn:jboss:bean-deployer:2.0">  - <bean name="BPMKernelLocator" class="org.jboss.bpm.api.client.internal.KernelLocator"> + <bean name="BPMKernelLocator" class="org.jboss.bpm.api.config.internal.KernelLocator"> <property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property> </bean>  - <bean name="BPMProcessEngine" class="org.jboss.bpm.ri.client.ProcessEngineImpl"> + <bean name="BPMProcessEngine" class="org.jboss.bpm.ri.service.ProcessEngineImpl"> <property name="services"> <set elementClass="org.jboss.bpm.api.service.Service"> <inject bean="BPMDialectHandlerService" /> @@ -44,8 +44,8 @@ <value>org.jboss.bpm.ri.model.ParallelGatewayImpl</value> <value>org.jboss.bpm.ri.model.ParticipantImpl</value> <value>org.jboss.bpm.ri.model.ProcessDefinitionImpl</value> + <value>org.jboss.bpm.ri.model.ProcessInstanceImpl</value> <value>org.jboss.bpm.ri.model.ProcessStructureImpl</value> - <value>org.jboss.bpm.ri.model.ProcessImpl</value> <value>org.jboss.bpm.ri.model.PropertyImpl</value> <value>org.jboss.bpm.ri.model.PropertySupportImpl</value> <value>org.jboss.bpm.ri.model.ReceiveTaskImpl</value> Deleted: projects/spec/trunk/modules/ri/src/main/resources/org.jboss.bpm.api.client.ConfigurationProvider =================================================================== --- projects/spec/trunk/modules/ri/src/main/resources/org.jboss.bpm.api.client.ConfigurationProvider 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/ri/src/main/resources/org.jboss.bpm.api.client.ConfigurationProvider 2008-12-05 17:49:30 UTC (rev 3234) @@ -1 +0,0 @@ -org.jboss.bpm.api.client.internal.MicrocontainerConfigurationProvider \ No newline at end of file Copied: projects/spec/trunk/modules/ri/src/main/resources/org.jboss.bpm.api.config.ConfigurationProvider (from rev 3233, projects/spec/trunk/modules/ri/src/main/resources/org.jboss.bpm.api.client.ConfigurationProvider) =================================================================== --- projects/spec/trunk/modules/ri/src/main/resources/org.jboss.bpm.api.config.ConfigurationProvider (rev 0) +++ projects/spec/trunk/modules/ri/src/main/resources/org.jboss.bpm.api.config.ConfigurationProvider 2008-12-05 17:49:30 UTC (rev 3234) @@ -0,0 +1 @@ +org.jboss.bpm.api.config.internal.MicrocontainerConfigurationProvider \ No newline at end of file Modified: projects/spec/trunk/modules/ri/src/test/java/org/jboss/bpm/test/ri/service/persistence/ProcessDefinitionPersistenceTest.java =================================================================== --- projects/spec/trunk/modules/ri/src/test/java/org/jboss/bpm/test/ri/service/persistence/ProcessDefinitionPersistenceTest.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/ri/src/test/java/org/jboss/bpm/test/ri/service/persistence/ProcessDefinitionPersistenceTest.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -26,11 +26,11 @@ import javax.management.ObjectName; import org.jboss.bpm.api.ProcessNotFoundException; -import org.jboss.bpm.api.client.ProcessEngine; import org.jboss.bpm.api.model.EndEvent; import org.jboss.bpm.api.model.ProcessDefinition; import org.jboss.bpm.api.model.StartEvent; import org.jboss.bpm.api.model.Task; +import org.jboss.bpm.api.service.ProcessEngine; 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/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 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/ri/src/test/java/org/jboss/bpm/test/ri/service/persistence/ProcessPersistenceTest.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -26,12 +26,12 @@ import javax.management.ObjectName; import org.jboss.bpm.api.ProcessNotFoundException; -import org.jboss.bpm.api.client.ProcessEngine; import org.jboss.bpm.api.model.EndEvent; -import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.ProcessInstance; import org.jboss.bpm.api.model.ProcessDefinition; import org.jboss.bpm.api.model.StartEvent; import org.jboss.bpm.api.model.Task; +import org.jboss.bpm.api.service.ProcessEngine; import org.jboss.bpm.api.test.CTSTestCase; import org.jboss.bpm.api.test.ProcessCatalog; import org.jboss.bpm.incubator.service.PersistenceService; @@ -56,12 +56,12 @@ ProcessDefinition procDef = unregisterOnTearDown(ProcessCatalog.getDefaultProcess(engine)); // Create and save the Process - Process proc = procDef.newInstance(); + ProcessInstance proc = procDef.newInstance(); service.saveProcess(proc); // Load the process ObjectName procID = proc.getKey(); - Process loadProc = service.loadProcess(procID); + ProcessInstance loadProc = service.loadProcess(procID); ProcessCatalog.validateDefaultProcess(loadProc.getProcessDefinition()); StartEvent start = loadProc.getNode(StartEvent.class, "Start"); Modified: projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java =================================================================== --- projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -25,8 +25,7 @@ import javax.management.ObjectName; -import org.jboss.bpm.api.client.Configuration; -import org.jboss.bpm.api.client.ProcessEngine; +import org.jboss.bpm.api.config.Configuration; import org.jboss.bpm.api.model.Expression; import org.jboss.bpm.api.model.ProcessDefinition; import org.jboss.bpm.api.model.Expression.ExpressionLanguage; @@ -34,6 +33,7 @@ import org.jboss.bpm.api.model.Task.TaskType; import org.jboss.bpm.api.model.builder.GatewayBuilder; import org.jboss.bpm.api.service.ProcessBuilderService; +import org.jboss.bpm.api.service.ProcessEngine; import org.jboss.bpm.incubator.model.Assignment.AssignTime; import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt; import org.jboss.bpm.incubator.model.builder.TaskBuilder; 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 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -6,13 +6,13 @@ import javax.management.ObjectName; import javax.servlet.http.HttpSession; -import org.jboss.bpm.api.client.Configuration; -import org.jboss.bpm.api.client.ProcessEngine; +import org.jboss.bpm.api.config.Configuration; import org.jboss.bpm.api.model.ProcessDefinition; import org.jboss.bpm.api.model.builder.ObjectNameFactory; +import org.jboss.bpm.api.service.ProcessEngine; import org.jboss.bpm.api.service.ProcessService; import org.jboss.bpm.incubator.client.MessageListener; -import org.jboss.bpm.incubator.client.ProcessExt; +import org.jboss.bpm.incubator.client.ProcessInstanceExt; import org.jboss.bpm.incubator.client.SignalListener; import org.jboss.bpm.incubator.model.Message; import org.jboss.bpm.incubator.model.Signal; @@ -68,7 +68,7 @@ System.out.println("Create new Process"); AirticketProcessBuilder procBuilder = new AirticketProcessBuilder(sampleID); ProcessDefinition procDef = procBuilder.buildProcessDefinition(); - ProcessExt proc = (ProcessExt)procDef.newInstance(); + ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance(); procService.registerProcess(proc); procID = proc.startProcessAsync(); httpSession.setAttribute("procID", procID); Modified: projects/spec/trunk/modules/samples/airticket/server/src/main/resources/jbpm-beans.xml =================================================================== --- projects/spec/trunk/modules/samples/airticket/server/src/main/resources/jbpm-beans.xml 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/samples/airticket/server/src/main/resources/jbpm-beans.xml 2008-12-05 17:49:30 UTC (rev 3234) @@ -8,7 +8,7 @@ <bean name="jBPMMessageBuilderFactory" class="org.jboss.bpm.ri.model.impl.MessageBuilderFactoryImpl"/>  - <bean name="jBPMProcessEngine" class="org.jboss.bpm.ri.client.ProcessEngineImpl"> + <bean name="jBPMProcessEngine" class="org.jboss.bpm.ri.service.ProcessEngineImpl"> <property name="processManager"><inject bean="jBPMProcessManager"/></property> <property name="executionManager"><inject bean="jBPMExecutionManager"/></property> <property name="signalManager"><inject bean="jBPMSignalManager"/></property> Modified: projects/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java =================================================================== --- projects/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java 2008-12-05 17:05:07 UTC (rev 3233) +++ projects/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java 2008-12-05 17:49:30 UTC (rev 3234) @@ -30,7 +30,7 @@ import org.jboss.bpm.api.runtime.Attachments; import org.jboss.bpm.api.test.CTSTestCase; import org.jboss.bpm.incubator.client.MessageListener; -import org.jboss.bpm.incubator.client.ProcessExt; +import org.jboss.bpm.incubator.client.ProcessInstanceExt; import org.jboss.bpm.incubator.client.UserTaskCallback; import org.jboss.bpm.incubator.model.Message; import org.jboss.bpm.incubator.model.UserTask; @@ -53,7 +53,7 @@ private MessageService messageManager = MessageService.locateMessageService(); private AirticketMessageListener msgListener; - private ProcessExt proc; + private ProcessInstanceExt proc; public void testValidData() throws Exception { @@ -61,7 +61,7 @@ ProcessDefinition procDef = unregisterOnTearDown(builder.buildProcessDefinition()); // Create the process instance - proc = (ProcessExt)procDef.newInstance(); + proc = (ProcessInstanceExt)procDef.newInstance(); // Attach the callback to the UserTask UserTask userTask = proc.getNode(UserTask.class, AirticketProcessBuilder.TASK_MAKE_OFFER); @@ -87,7 +87,7 @@ ProcessDefinition procDef = unregisterOnTearDown(builder.buildProcessDefinition()); // Create the process instance - proc = (ProcessExt)procDef.newInstance(); + proc = (ProcessInstanceExt)procDef.newInstance(); // Attach the callback to the UserTask UserTask userTask = proc.getNode(UserTask.class, AirticketProcessBuilder.TASK_MAKE_OFFER);

17 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r3233 - in jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec: model and 4 other directories.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-12-05 12:05:07 -0500 (Fri, 05 Dec 2008) New Revision: 3233 Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/jpdl32/DialectHandlerImpl.java jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ExclusiveGatewayImpl.java jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ProcessDefinitionImpl.java jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ProcessImpl.java jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/builder/ProcessBuilderImpl.java jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/runtime/TokenImpl.java jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/ProcessDefinitionServiceImpl.java jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/ProcessServiceImpl.java jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/TaskServiceImpl.java jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/task/TaskImpl.java Log: Hide proxy generation in factory method Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/jpdl32/DialectHandlerImpl.java =================================================================== --- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/jpdl32/DialectHandlerImpl.java 2008-12-05 15:45:43 UTC (rev 3232) +++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/jpdl32/DialectHandlerImpl.java 2008-12-05 17:05:07 UTC (rev 3233) @@ -52,14 +52,14 @@ { InputStream inStream = pdXML.openStream(); org.jbpm.graph.def.ProcessDefinition oldProcDef = org.jbpm.graph.def.ProcessDefinition.parseXmlInputStream(inStream); - ProcessDefinition procDef = new ProcessDefinitionImpl(getProcessEngine(), oldProcDef); + ProcessDefinition procDef = ProcessDefinitionImpl.newInstance(getProcessEngine(), oldProcDef, false); return procDef; } public ProcessDefinition parseProcessDefinition(String pdXML) { org.jbpm.graph.def.ProcessDefinition oldProcDef = org.jbpm.graph.def.ProcessDefinition.parseXmlString(pdXML); - ProcessDefinition procDef = new ProcessDefinitionImpl(getProcessEngine(), oldProcDef); + ProcessDefinition procDef = ProcessDefinitionImpl.newInstance(getProcessEngine(), oldProcDef, false); return procDef; } Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ExclusiveGatewayImpl.java =================================================================== --- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ExclusiveGatewayImpl.java 2008-12-05 15:45:43 UTC (rev 3232) +++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ExclusiveGatewayImpl.java 2008-12-05 17:05:07 UTC (rev 3233) @@ -75,7 +75,7 @@ public String decide(ExecutionContext execContext) throws Exception { ProcessEngine engine = getProcessDefinition().getProcessEngine(); - Token token = new TokenImpl(engine, execContext.getToken()); + Token token = TokenImpl.newInstance(engine, execContext.getToken()); SequenceFlow selectedGate = null; for (SequenceFlow auxGate : getGates()) Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ProcessDefinitionImpl.java =================================================================== --- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ProcessDefinitionImpl.java 2008-12-05 15:45:43 UTC (rev 3232) +++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ProcessDefinitionImpl.java 2008-12-05 17:05:07 UTC (rev 3233) @@ -60,8 +60,18 @@ private ObjectName keyCache; private List<Node> nodes; - public ProcessDefinitionImpl(ProcessEngine engine, org.jbpm.graph.def.ProcessDefinition tmpProcDef) + public static ProcessDefinition newInstance(ProcessEngine engine, org.jbpm.graph.def.ProcessDefinition tmpProcDef, boolean proxy) { + ProcessDefinition procDef = new ProcessDefinitionImpl(engine, tmpProcDef); + if (proxy == true) + { + procDef = InvocationProxy.newInstance((ProcessDefinitionImpl)procDef, ProcessDefinition.class); + } + return procDef; + } + + private ProcessDefinitionImpl(ProcessEngine engine, org.jbpm.graph.def.ProcessDefinition tmpProcDef) + { super(engine, tmpProcDef, org.jbpm.graph.def.ProcessDefinition.class); if (tmpProcDef.getName() == null) @@ -112,10 +122,7 @@ ProcessInstance oldProc = new ProcessInstance(); oldProc.setProcessDefinition(getDelegate()); oldProc.addInitialModuleDefinitions(getDelegate()); - - Process proc = new ProcessImpl(getProcessEngine(), oldProc); - proc = InvocationProxy.newInstance((ProcessImpl)proc, Process.class); - return proc; + return ProcessImpl.newInstance(getProcessEngine(), oldProc, true); } public void addNode(NodeImpl<?> nodeImpl) Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ProcessImpl.java =================================================================== --- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ProcessImpl.java 2008-12-05 15:45:43 UTC (rev 3232) +++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ProcessImpl.java 2008-12-05 17:05:07 UTC (rev 3233) @@ -62,8 +62,18 @@ // [TODO] delegate this property private ProcessStatus status = ProcessStatus.None; - public ProcessImpl(ProcessEngine engine, ProcessInstance tmpProc) + public static Process newInstance(ProcessEngine engine, ProcessInstance tmpProc, boolean proxy) { + Process proc = new ProcessImpl(engine, tmpProc); + if (proxy == true) + { + proc = InvocationProxy.newInstance((ProcessImpl)proc, Process.class); + } + return proc; + } + + private ProcessImpl(ProcessEngine engine, ProcessInstance tmpProc) + { super(engine, tmpProc, ProcessInstance.class); if (tmpProc.getId() > 0) @@ -93,8 +103,8 @@ // @Override public ProcessDefinition getProcessDefinition() { - ProcessDefinitionImpl procDef = new ProcessDefinitionImpl(getProcessEngine(), getDelegate().getProcessDefinition()); - return InvocationProxy.newInstance(procDef, ProcessDefinition.class); + org.jbpm.graph.def.ProcessDefinition oldProcDef = getDelegate().getProcessDefinition(); + return ProcessDefinitionImpl.newInstance(getProcessEngine(), oldProcDef, true); } // @Override @@ -125,8 +135,7 @@ Token token = null; if (getDelegate().getRootToken() != null) { - TokenImpl tokenImpl = new TokenImpl(getProcessEngine(), getDelegate().getRootToken()); - token = InvocationProxy.newInstance(tokenImpl, Token.class); + token = TokenImpl.newInstance(getProcessEngine(), getDelegate().getRootToken()); } return token; } @@ -197,7 +206,7 @@ procInst.setRootToken(rootToken); // Create the root token - Token token = new TokenImpl(getProcessEngine(), rootToken); + Token token = TokenImpl.newInstance(getProcessEngine(), rootToken); // Save the root token JbpmContext jbpmContext = bpmContext.getAttachment(JbpmContext.class); @@ -223,7 +232,7 @@ // Signal the root token token.signal(); - return InvocationProxy.newInstance((TokenImpl)token, Token.class); + return token; } catch (RuntimeException rte) { Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/builder/ProcessBuilderImpl.java =================================================================== --- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/builder/ProcessBuilderImpl.java 2008-12-05 15:45:43 UTC (rev 3232) +++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/builder/ProcessBuilderImpl.java 2008-12-05 17:05:07 UTC (rev 3233) @@ -88,7 +88,7 @@ org.jbpm.graph.def.ProcessDefinition oldProcDef = org.jbpm.graph.def.ProcessDefinition.createNewProcessDefinition(); oldProcDef.setName(name); - procDefImpl = new ProcessDefinitionImpl(engine, oldProcDef); + procDefImpl = (ProcessDefinitionImpl)ProcessDefinitionImpl.newInstance(engine, oldProcDef, false); return this; } Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/runtime/TokenImpl.java =================================================================== --- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/runtime/TokenImpl.java 2008-12-05 15:45:43 UTC (rev 3232) +++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/runtime/TokenImpl.java 2008-12-05 17:05:07 UTC (rev 3233) @@ -59,8 +59,13 @@ private SequenceFlow lastFlow; private Attachments att; - public TokenImpl(ProcessEngine engine, org.jbpm.graph.exe.Token tmpToken) + public static Token newInstance(ProcessEngine engine, org.jbpm.graph.exe.Token tmpToken) { + return InvocationProxy.newInstance(new TokenImpl(engine, tmpToken), Token.class); + } + + private TokenImpl(ProcessEngine engine, org.jbpm.graph.exe.Token tmpToken) + { super(engine, tmpToken, org.jbpm.graph.exe.Token.class); ContextInstance context = tmpToken.getProcessInstance().getContextInstance(); @@ -90,9 +95,7 @@ public Process getProcess() { - Process proc = new ProcessImpl(getProcessEngine(), getDelegate().getProcessInstance()); - proc = InvocationProxy.newInstance((ProcessImpl)proc, Process.class); - return proc; + return ProcessImpl.newInstance(getProcessEngine(), getDelegate().getProcessInstance(), true); } // @Override @@ -123,8 +126,8 @@ { if (oldChildToken.hasEnded() == false) { - Token childToken = new TokenImpl(getProcessEngine(), oldChildToken); - childTokens.add(InvocationProxy.newInstance((TokenImpl)childToken, Token.class)); + Token childToken = TokenImpl.newInstance(getProcessEngine(), oldChildToken); + childTokens.add(childToken); } } } @@ -150,8 +153,7 @@ Token token = null; if (getDelegate().getParent() != null) { - token = new TokenImpl(getProcessEngine(), getDelegate().getParent()); - token = InvocationProxy.newInstance((TokenImpl)token, Token.class); + token = TokenImpl.newInstance(getProcessEngine(), getDelegate().getParent()); } return token; } @@ -163,9 +165,7 @@ while (root.getParent() != null) root = root.getParent(); - Token token = new TokenImpl(getProcessEngine(), root); - token = InvocationProxy.newInstance((TokenImpl)token, Token.class); - + Token token = TokenImpl.newInstance(getProcessEngine(), root); return token; } Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/ProcessDefinitionServiceImpl.java =================================================================== --- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/ProcessDefinitionServiceImpl.java 2008-12-05 15:45:43 UTC (rev 3232) +++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/ProcessDefinitionServiceImpl.java 2008-12-05 17:05:07 UTC (rev 3233) @@ -62,48 +62,48 @@ public ProcessDefinition getProcessDefinition(ObjectName procDefID) { - ProcessDefinition procDef = null; - ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class); ExecutionContext bpmContext = ctxService.getExecutionContext(true); try { - Long id = adaptKey(procDefID); + ProcessDefinition procDef = null; + GraphSession graphSession = bpmContext.getAttachment(JbpmContext.class).getGraphSession(); - org.jbpm.graph.def.ProcessDefinition oldProcDef = graphSession.getProcessDefinition(id); + org.jbpm.graph.def.ProcessDefinition oldProcDef = graphSession.getProcessDefinition(adaptKey(procDefID)); if (oldProcDef != null) { - procDef = new ProcessDefinitionImpl(getProcessEngine(), oldProcDef); - procDef = InvocationProxy.newInstance((ProcessDefinitionImpl)procDef, ProcessDefinition.class); + procDef = ProcessDefinitionImpl.newInstance(getProcessEngine(), oldProcDef, true); } + + return procDef; } finally { bpmContext.close(); } - return procDef; } public Set<ObjectName> getProcessDefinitions() { - Set<ObjectName> procDefs = new HashSet<ObjectName>(); - ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class); ExecutionContext bpmContext = ctxService.getExecutionContext(true); try { + Set<ObjectName> procDefs = new HashSet<ObjectName>(); + GraphSession graphSession = bpmContext.getAttachment(JbpmContext.class).getGraphSession(); for (Object item : graphSession.findAllProcessDefinitions()) { org.jbpm.graph.def.ProcessDefinition oldProcDef = (org.jbpm.graph.def.ProcessDefinition)item; procDefs.add(ProcessDefinitionImpl.getKey(oldProcDef)); } + + return Collections.unmodifiableSet(procDefs); } finally { bpmContext.close(); } - return Collections.unmodifiableSet(procDefs); } public ProcessDefinition registerProcessDefinition(ProcessDefinition procDef) Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/ProcessServiceImpl.java =================================================================== --- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/ProcessServiceImpl.java 2008-12-05 15:45:43 UTC (rev 3232) +++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/ProcessServiceImpl.java 2008-12-05 17:05:07 UTC (rev 3233) @@ -89,26 +89,25 @@ // @Override public Process getProcess(ObjectName procID) { - Process proc = null; - ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class); ExecutionContext bpmContext = ctxService.getExecutionContext(true); try { - Long id = adaptKey(procID); + Process proc = null; + GraphSession graphSession = bpmContext.getAttachment(JbpmContext.class).getGraphSession(); - ProcessInstance oldProc = graphSession.getProcessInstance(id); + ProcessInstance oldProc = graphSession.getProcessInstance(adaptKey(procID)); if (oldProc != null) { - proc = new ProcessImpl(getProcessEngine(), oldProc); - proc = InvocationProxy.newInstance((ProcessImpl)proc, Process.class); + proc = ProcessImpl.newInstance(getProcessEngine(), oldProc, true); } + + return proc; } finally { bpmContext.close(); } - return proc; } /** @@ -163,7 +162,7 @@ for (Object item : graphSession.findProcessInstances(id)) { ProcessInstance oldProc = (ProcessInstance)item; - ProcessImpl auxProc = new ProcessImpl(getProcessEngine(), oldProc); + Process auxProc = ProcessImpl.newInstance(getProcessEngine(), oldProc, true); if (status == null || auxProc.getProcessStatus() == status) procs.add(auxProc.getKey()); } Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/TaskServiceImpl.java =================================================================== --- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/TaskServiceImpl.java 2008-12-05 15:45:43 UTC (rev 3232) +++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/TaskServiceImpl.java 2008-12-05 17:05:07 UTC (rev 3233) @@ -77,8 +77,7 @@ Collection<TaskInstance> taskInstances = procImpl.getDelegate().getTaskMgmtInstance().getTaskInstances(); for (TaskInstance taskInst : taskInstances) { - Task task = new TaskImpl(getProcessEngine(), taskInst); - task = InvocationProxy.newInstance((TaskImpl)task, Task.class); + Task task = TaskImpl.newInstance(getProcessEngine(), taskInst); tasks.add(task); } @@ -102,8 +101,7 @@ { JbpmContext jbpmContext = bpmContext.getAttachment(JbpmContext.class); TaskInstance taskInst = jbpmContext.getTaskInstance(adaptKey(taskID)); - Task task = new TaskImpl(getProcessEngine(), taskInst); - return InvocationProxy.newInstance((TaskImpl)task, Task.class); + return TaskImpl.newInstance(getProcessEngine(), taskInst); } catch (RuntimeException rte) { @@ -124,10 +122,10 @@ { List<Task> tasks = new ArrayList<Task>(); JbpmContext jbpmContext = bpmContext.getAttachment(JbpmContext.class); - for (TaskInstance oldTask : (List<TaskInstance>)jbpmContext.getTaskList(actor)) + for (TaskInstance taskInst : (List<TaskInstance>)jbpmContext.getTaskList(actor)) { - TaskImpl taskImpl = new TaskImpl(getProcessEngine(), oldTask); - tasks.add(InvocationProxy.newInstance(taskImpl, Task.class)); + Task task = TaskImpl.newInstance(getProcessEngine(), taskInst); + tasks.add(task); } return tasks; } Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/task/TaskImpl.java =================================================================== --- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/task/TaskImpl.java 2008-12-05 15:45:43 UTC (rev 3232) +++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/task/TaskImpl.java 2008-12-05 17:05:07 UTC (rev 3233) @@ -56,8 +56,13 @@ private ObjectName keyCache; - public TaskImpl(ProcessEngine engine, TaskInstance tmpTask) + public static Task newInstance(ProcessEngine engine, TaskInstance tmpTask) { + return InvocationProxy.newInstance(new TaskImpl(engine, tmpTask), Task.class); + } + + private TaskImpl(ProcessEngine engine, TaskInstance tmpTask) + { super(engine, tmpTask, TaskInstance.class); if (tmpTask.getId() > 0)

17 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r3232 - jbpm3/trunk/modules/integration/spec/src/test/java/org/jbpm/test/integration/spec/deployment.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-12-05 10:45:43 -0500 (Fri, 05 Dec 2008) New Revision: 3232 Modified: jbpm3/trunk/modules/integration/spec/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentPARTest.java Log: Enable DeploymentPARTest Modified: jbpm3/trunk/modules/integration/spec/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentPARTest.java =================================================================== --- jbpm3/trunk/modules/integration/spec/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentPARTest.java 2008-12-05 15:41:32 UTC (rev 3231) +++ jbpm3/trunk/modules/integration/spec/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentPARTest.java 2008-12-05 15:45:43 UTC (rev 3232) @@ -26,7 +26,6 @@ import java.net.URL; import java.util.HashMap; import java.util.Iterator; -import java.util.List; import java.util.Map; import org.jboss.bpm.api.deployment.Deployment; @@ -34,9 +33,7 @@ import org.jboss.bpm.api.model.ProcessDefinition; import org.jboss.bpm.api.runtime.Token; import org.jboss.bpm.api.service.DeploymentService; -import org.jboss.bpm.api.service.ProcessService; import org.jboss.bpm.api.service.TaskService; -import org.jboss.bpm.api.task.Task; import org.jboss.bpm.api.test.APITestCase; /** @@ -59,14 +56,8 @@ Process proc = procDef.newInstance(); - /* Token token = proc.startProcess(); - assertEquals("start", token.getCurrentNode().getName()); - assertEquals(0, token.getChildTokens().size()); - - token.signal(); - assertEquals("fork1", token.getCurrentNode().getName()); assertEquals(2, token.getChildTokens().size()); @@ -79,7 +70,7 @@ TaskService taskService = getProcessEngine().getService(TaskService.class); assertEquals(2, taskService.getTasksByProcess(proc.getKey()).size()); -*/ + // Undeploy the process assertTrue("Undeploy successful", depService.undeploy(dep)); }

17 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r3231 - projects/spec/trunk/modules/ri/src/test/java/org/jboss/bpm/test/ri/service/persistence.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-12-05 10:41:32 -0500 (Fri, 05 Dec 2008) New Revision: 3231 Modified: projects/spec/trunk/modules/ri/src/test/java/org/jboss/bpm/test/ri/service/persistence/ProcessPersistenceTest.java Log: Fix ProcessPersistenceTest 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 15:30:04 UTC (rev 3230) +++ projects/spec/trunk/modules/ri/src/test/java/org/jboss/bpm/test/ri/service/persistence/ProcessPersistenceTest.java 2008-12-05 15:41:32 UTC (rev 3231) @@ -32,7 +32,6 @@ import org.jboss.bpm.api.model.ProcessDefinition; 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.test.CTSTestCase; import org.jboss.bpm.api.test.ProcessCatalog; import org.jboss.bpm.incubator.service.PersistenceService; @@ -51,12 +50,10 @@ public void testProcess() throws Exception { ProcessEngine engine = getProcessEngine(); - ProcessDefinitionService procDefService = engine.getService(ProcessDefinitionService.class); PersistenceService service = engine.getService(PersistenceService.class); // Register (save) the process definition, which is not done implicitly ProcessDefinition procDef = unregisterOnTearDown(ProcessCatalog.getDefaultProcess(engine)); - procDefService.registerProcessDefinition(procDef); // Create and save the Process Process proc = procDef.newInstance();

17 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r3230 - in jbpm3/trunk: modules/core/src/main/java/org/jbpm and 4 other directories.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-12-05 10:30:04 -0500 (Fri, 05 Dec 2008) New Revision: 3230 Added: jbpm3/trunk/eclipse/jbpm.code.style.xml Removed: jbpm3/trunk/eclipse/jbpm.profile.xml Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/JbpmContext.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/taskmgmt/exe/TaskInstance.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/taskmgmt/exe/TaskMgmtInstance.java jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/TaskServiceImpl.java jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/task/TaskImpl.java jbpm3/trunk/modules/integration/spec/src/test/java/org/jbpm/test/integration/spec/task/TaskTest.java Log: Task spec integration - ok Added: jbpm3/trunk/eclipse/jbpm.code.style.xml =================================================================== --- jbpm3/trunk/eclipse/jbpm.code.style.xml (rev 0) +++ jbpm3/trunk/eclipse/jbpm.code.style.xml 2008-12-05 15:30:04 UTC (rev 3230) @@ -0,0 +1,267 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<profiles version="11"> +<profile kind="CodeFormatterProfile" name="jbpm3.code.style" version="11"> +<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="next_line"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/> +<setting id="org.eclipse.jdt.core.compiler.source" value="1.5"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/> +<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="164"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/> +<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="2"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/> +<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/> +<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/> +<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="next_line"/> +<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="next_line"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/> +<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/> +<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="next_line"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="next_line"/> +<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="next_line"/> +<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="2"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="next_line"/> +<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/> +<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.5"/> +<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/> +<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/> +<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="next_line"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/> +<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/> +<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/> +<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="false"/> +<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="168"/> +<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="next_line"/> +<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/> +<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/> +<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.5"/> +<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/> +<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/> +<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/> +<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="next_line"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/> +<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/> +</profile> +</profiles> Property changes on: jbpm3/trunk/eclipse/jbpm.code.style.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: jbpm3/trunk/eclipse/jbpm.profile.xml =================================================================== --- jbpm3/trunk/eclipse/jbpm.profile.xml 2008-12-05 15:28:33 UTC (rev 3229) +++ jbpm3/trunk/eclipse/jbpm.profile.xml 2008-12-05 15:30:04 UTC (rev 3230) @@ -1,267 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<profiles version="11"> -<profile kind="CodeFormatterProfile" name="jbpm profile" version="11"> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="2"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/> -<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="4"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/> -<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="160"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/> -<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/> -<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="1"/> -<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/> -<setting id="org.eclipse.jdt.core.compiler.source" value="1.5"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="80"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/> -<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.5"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/> -<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/> -<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.5"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/> -<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="0"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/> -</profile> -</profiles> Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/JbpmContext.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/JbpmContext.java 2008-12-05 15:28:33 UTC (rev 3229) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/JbpmContext.java 2008-12-05 15:30:04 UTC (rev 3230) @@ -27,8 +27,6 @@ import java.util.Iterator; import java.util.List; -import javax.management.ObjectName; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.Session; Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/taskmgmt/exe/TaskInstance.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/taskmgmt/exe/TaskInstance.java 2008-12-05 15:28:33 UTC (rev 3229) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/taskmgmt/exe/TaskInstance.java 2008-12-05 15:30:04 UTC (rev 3230) @@ -35,6 +35,7 @@ import org.jbpm.context.exe.VariableContainer; import org.jbpm.context.exe.VariableInstance; import org.jbpm.graph.def.Event; +import org.jbpm.graph.def.Identifiable; import org.jbpm.graph.def.Node; import org.jbpm.graph.def.Transition; import org.jbpm.graph.exe.Comment; @@ -54,7 +55,7 @@ * is one task instance that can be assigned to an actor (read: put in someones task list) and that can trigger the * coninuation of execution of the token upon completion. */ -public class TaskInstance extends VariableContainer implements Assignable +public class TaskInstance extends VariableContainer implements Identifiable, Assignable { private static final long serialVersionUID = 1L; Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/taskmgmt/exe/TaskMgmtInstance.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/taskmgmt/exe/TaskMgmtInstance.java 2008-12-05 15:28:33 UTC (rev 3229) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/taskmgmt/exe/TaskMgmtInstance.java 2008-12-05 15:30:04 UTC (rev 3230) @@ -54,48 +54,55 @@ import org.jbpm.taskmgmt.def.Task; import org.jbpm.taskmgmt.def.TaskMgmtDefinition; import org.jbpm.taskmgmt.log.TaskCreateLog; -import org.jbpm.util.ClassLoaderUtil; import org.jbpm.util.Clock; /** * process instance extension for managing tasks on a process instance. */ -public class TaskMgmtInstance extends ModuleInstance { +public class TaskMgmtInstance extends ModuleInstance +{ private static final long serialVersionUID = 1L; TaskMgmtDefinition taskMgmtDefinition = null; - Map swimlaneInstances = null; - Set taskInstances = null; - /** non persistent collection that stores all the task instances that have - * variable updates*/ - Collection taskInstanceVariableUpdates = null; - - public TaskMgmtInstance() { + Map<String, SwimlaneInstance> swimlaneInstances = null; + Set<TaskInstance> taskInstances = null; + /** + * non persistent collection that stores all the task instances that have variable updates + */ + Collection<TaskInstance> taskInstanceVariableUpdates = null; + + public TaskMgmtInstance() + { } - - public TaskMgmtInstance(TaskMgmtDefinition taskMgmtDefinition) { + + public TaskMgmtInstance(TaskMgmtDefinition taskMgmtDefinition) + { this.taskMgmtDefinition = taskMgmtDefinition; } // task instances /////////////////////////////////////////////////////////// - public TaskInstance createTaskInstance() { + public TaskInstance createTaskInstance() + { return createTaskInstance(null, (ExecutionContext)null); } - public TaskInstance createTaskInstance(Task task) { + public TaskInstance createTaskInstance(Task task) + { return createTaskInstance(task, (ExecutionContext)null); } - public TaskInstance createTaskInstance(Token token) { + public TaskInstance createTaskInstance(Token token) + { return createTaskInstance(null, new ExecutionContext(token)); } /** * creates a new task instance on the given token, for the given task. */ - public TaskInstance createTaskInstance(Task task, Token token) { + public TaskInstance createTaskInstance(Task task, Token token) + { ExecutionContext executionContext = new ExecutionContext(token); executionContext.setTask(task); return createTaskInstance(task, executionContext); @@ -104,7 +111,8 @@ /** * creates a new task instance on the given task, in the given execution context. */ - public TaskInstance createTaskInstance(Task task, ExecutionContext executionContext) { + public TaskInstance createTaskInstance(Task task, ExecutionContext executionContext) + { // instantiate the new task instance TaskInstance taskInstance = instantiateNewTaskInstance(executionContext); @@ -112,81 +120,95 @@ addTaskInstance(taskInstance); // initialize the task instance - if (task!=null) taskInstance.setTask(task); + if (task != null) + taskInstance.setTask(task); // assign an id to the task instance Services.assignId(taskInstance); // copy the task properties - /* XXX property initialization was already done in taskInstance.setTask(task) - String description = null; - if (task!=null) { - description = task.getDescription(); - taskInstance.setDescription(description); - taskInstance.setBlocking(task.isBlocking()); - taskInstance.setSignalling(task.isSignalling()); - } - */ + /* + * XXX property initialization was already done in taskInstance.setTask(task) String description = null; if + * (task!=null) { description = task.getDescription(); taskInstance.setDescription(description); + * taskInstance.setBlocking(task.isBlocking()); taskInstance.setSignalling(task.isSignalling()); } + */ - if (executionContext!=null) { + if (executionContext != null) + { Token token = executionContext.getToken(); taskInstance.setToken(token); taskInstance.setProcessInstance(token.getProcessInstance()); - + taskInstance.initializeVariables(); - - if (task != null && task.getDueDate()!=null) { + + if (task != null && task.getDueDate() != null) + { Date baseDate; String dueDateString = task.getDueDate(); String durationString = null; - - if (dueDateString.startsWith("#")) { - String baseDateEL = dueDateString.substring(0,dueDateString.indexOf("}")+1); + + if (dueDateString.startsWith("#")) + { + String baseDateEL = dueDateString.substring(0, dueDateString.indexOf("}") + 1); Object result = JbpmExpressionEvaluator.evaluate(baseDateEL, executionContext); - if (result instanceof Date) { - baseDate = (Date) result; - } else if (result instanceof Calendar) { - baseDate = ((Calendar) result).getTime(); - } else { - throw new JbpmException("Invalid basedate type: " + baseDateEL + " is of type " + result.getClass().getName() +". Only Date and Calendar are supported"); + if (result instanceof Date) + { + baseDate = (Date)result; } + else if (result instanceof Calendar) + { + baseDate = ((Calendar)result).getTime(); + } + else + { + throw new JbpmException("Invalid basedate type: " + baseDateEL + " is of type " + result.getClass().getName() + + ". Only Date and Calendar are supported"); + } int endOfELIndex = dueDateString.indexOf("}"); - if (endOfELIndex < (dueDateString.length() -1) ) { - char durationSeparator = dueDateString.substring(endOfELIndex+1).trim().charAt(0); - if (durationSeparator != '+' && durationSeparator != '-'){ + if (endOfELIndex < (dueDateString.length() - 1)) + { + char durationSeparator = dueDateString.substring(endOfELIndex + 1).trim().charAt(0); + if (durationSeparator != '+' && durationSeparator != '-') + { throw new JbpmException("Invalid duedate, + or - missing after EL"); } - durationString = dueDateString.substring(endOfELIndex+1).trim(); + durationString = dueDateString.substring(endOfELIndex + 1).trim(); } - } else { + } + else + { baseDate = Clock.getCurrentTime(); durationString = dueDateString; } Date dueDate; - if (durationString == null || durationString.length() == 0) { + if (durationString == null || durationString.length() == 0) + { dueDate = baseDate; - } else { - BusinessCalendar businessCalendar = new BusinessCalendar(); - dueDate = businessCalendar.add(baseDate, new Duration(durationString) ); - } - taskInstance.setDueDate(dueDate); + } + else + { + BusinessCalendar businessCalendar = new BusinessCalendar(); + dueDate = businessCalendar.add(baseDate, new Duration(durationString)); + } + taskInstance.setDueDate(dueDate); } - - - try { + + try + { // update the executionContext executionContext.setTask(task); executionContext.setTaskInstance(taskInstance); executionContext.setEventSource(task); // evaluate the description - if (task != null) { + if (task != null) + { String description = task.getDescription(); - if ( (description!=null) - && (description.indexOf("#{")!=-1) - ) { + if ((description != null) && (description.indexOf("#{") != -1)) + { Object result = JbpmExpressionEvaluator.evaluate(description, executionContext); - if (result!=null) { + if (result != null) + { taskInstance.setDescription(result.toString()); } } @@ -196,145 +218,184 @@ taskInstance.create(executionContext); // if this task instance is created for a task, perform assignment - if (task!=null) { + if (task != null) + { taskInstance.assign(executionContext); } - - } finally { + + } + finally + { // clean the executionContext executionContext.setTask(null); executionContext.setTaskInstance(null); executionContext.setEventSource(null); } - - // log this creation + + // log this creation // WARNING: The events create and assign are fired in the right order, but // the logs are still not ordered properly. token.addLog(new TaskCreateLog(taskInstance, taskInstance.getActorId())); - } else { + } + else + { taskInstance.create(); } return taskInstance; } - public SwimlaneInstance getInitializedSwimlaneInstance(ExecutionContext executionContext, Swimlane swimlane) { + public SwimlaneInstance getInitializedSwimlaneInstance(ExecutionContext executionContext, Swimlane swimlane) + { // initialize the swimlane - if (swimlaneInstances==null) swimlaneInstances = new HashMap(); - SwimlaneInstance swimlaneInstance = (SwimlaneInstance) swimlaneInstances.get(swimlane.getName()); - if (swimlaneInstance==null) { + if (swimlaneInstances == null) + swimlaneInstances = new HashMap<String, SwimlaneInstance>(); + SwimlaneInstance swimlaneInstance = swimlaneInstances.get(swimlane.getName()); + if (swimlaneInstance == null) + { swimlaneInstance = new SwimlaneInstance(swimlane); addSwimlaneInstance(swimlaneInstance); // assign the swimlaneInstance - performAssignment(swimlane.getAssignmentDelegation(), - swimlane.getActorIdExpression(), - swimlane.getPooledActorsExpression(), - swimlaneInstance, - executionContext); + performAssignment(swimlane.getAssignmentDelegation(), swimlane.getActorIdExpression(), swimlane.getPooledActorsExpression(), swimlaneInstance, + executionContext); } return swimlaneInstance; } - - public void performAssignment(Delegation assignmentDelegation, - String actorIdExpression, - String pooledActorsExpression, - Assignable assignable, - ExecutionContext executionContext) { - try { - if (assignmentDelegation!=null) { + + public void performAssignment(Delegation assignmentDelegation, String actorIdExpression, String pooledActorsExpression, Assignable assignable, + ExecutionContext executionContext) + { + try + { + if (assignmentDelegation != null) + { performAssignmentDelegation(assignmentDelegation, assignable, executionContext); - } else { - if (actorIdExpression!=null) { + } + else + { + if (actorIdExpression != null) + { performAssignmentActorIdExpr(actorIdExpression, assignable, executionContext); } - if (pooledActorsExpression!=null) { + if (pooledActorsExpression != null) + { performAssignmentPooledActorsExpr(pooledActorsExpression, assignable, executionContext); } } - - } catch (Exception exception) { + + } + catch (Exception exception) + { GraphElement graphElement = executionContext.getEventSource(); - if (graphElement!=null) { + if (graphElement != null) + { graphElement.raiseException(exception, executionContext); - } else { + } + else + { throw new DelegationException(exception, executionContext); } } } - void performAssignmentDelegation(Delegation assignmentDelegation, Assignable assignable, ExecutionContext executionContext) throws Exception { + void performAssignmentDelegation(Delegation assignmentDelegation, Assignable assignable, ExecutionContext executionContext) throws Exception + { ClassLoader surroundingClassLoader = Thread.currentThread().getContextClassLoader(); - try { - // set context class loader correctly for delegation class (https://jira.jboss.org/jira/browse/JBPM-1448) + try + { + // set context class loader correctly for delegation class (https://jira.jboss.org/jira/browse/JBPM-1448) Thread.currentThread().setContextClassLoader(JbpmConfiguration.getProcessClassLoader(executionContext.getProcessDefinition())); // instantiate the assignment handler - AssignmentHandler assignmentHandler = (AssignmentHandler) assignmentDelegation.instantiate(); + AssignmentHandler assignmentHandler = (AssignmentHandler)assignmentDelegation.instantiate(); // invoke the assignment handler - if (UserCodeInterceptorConfig.userCodeInterceptor != null) { + if (UserCodeInterceptorConfig.userCodeInterceptor != null) + { UserCodeInterceptorConfig.userCodeInterceptor.executeAssignment(assignmentHandler, assignable, executionContext); - } else { + } + else + { assignmentHandler.assign(assignable, executionContext); } - } finally { + } + finally + { Thread.currentThread().setContextClassLoader(surroundingClassLoader); - } + } } - void performAssignmentActorIdExpr(String actorIdExpression, Assignable assignable, ExecutionContext executionContext) { + void performAssignmentActorIdExpr(String actorIdExpression, Assignable assignable, ExecutionContext executionContext) + { Object result = null; String actorId = null; - try { + try + { result = JbpmExpressionEvaluator.evaluate(actorIdExpression, executionContext); - if (result==null) { - throw new JbpmException("actor-id expression '"+actorIdExpression+"' returned null"); + if (result == null) + { + throw new JbpmException("actor-id expression '" + actorIdExpression + "' returned null"); } - actorId = (String) result; - } catch (ClassCastException e) { - throw new JbpmException("actor-id expression '"+actorIdExpression+"' didn't resolve to a java.lang.String: '"+result+"' ("+result.getClass().getName()+")"); + actorId = (String)result; } + catch (ClassCastException e) + { + throw new JbpmException("actor-id expression '" + actorIdExpression + "' didn't resolve to a java.lang.String: '" + result + "' (" + + result.getClass().getName() + ")"); + } assignable.setActorId(actorId); } - void performAssignmentPooledActorsExpr(String pooledActorsExpression, Assignable assignable, ExecutionContext executionContext) { + void performAssignmentPooledActorsExpr(String pooledActorsExpression, Assignable assignable, ExecutionContext executionContext) + { String[] pooledActors = null; Object result = JbpmExpressionEvaluator.evaluate(pooledActorsExpression, executionContext); - if (result==null) { - throw new JbpmException("pooled-actors expression '"+pooledActorsExpression+"' returned null"); + if (result == null) + { + throw new JbpmException("pooled-actors expression '" + pooledActorsExpression + "' returned null"); } - if (result instanceof String[]) { - pooledActors = (String[]) result; + if (result instanceof String[]) + { + pooledActors = (String[])result; - } else if (result instanceof Collection) { + } + else if (result instanceof Collection) + { Collection collection = (Collection)result; - pooledActors = (String[]) collection.toArray(new String[collection.size()]); - - } else if (result instanceof String) { + pooledActors = (String[])collection.toArray(new String[collection.size()]); + + } + else if (result instanceof String) + { List pooledActorList = new ArrayList(); - StringTokenizer tokenizer = new StringTokenizer((String) result, ","); - while (tokenizer.hasMoreTokens()) { + StringTokenizer tokenizer = new StringTokenizer((String)result, ","); + while (tokenizer.hasMoreTokens()) + { pooledActorList.add(tokenizer.nextToken().trim()); } - pooledActors = (String[]) pooledActorList.toArray(new String[pooledActorList.size()]); - } else { - throw new JbpmException("pooled-actors expression '"+pooledActorsExpression+"' didn't resolve to a comma separated String, a Collection or a String[]: '"+result+"' ("+result.getClass().getName()+")"); + pooledActors = (String[])pooledActorList.toArray(new String[pooledActorList.size()]); } + else + { + throw new JbpmException("pooled-actors expression '" + pooledActorsExpression + "' didn't resolve to a comma separated String, a Collection or a String[]: '" + + result + "' (" + result.getClass().getName() + ")"); + } assignable.setPooledActors(pooledActors); } /** - * creates a task instance on the rootToken, and assigns it - * to the currently authenticated user. + * creates a task instance on the rootToken, and assigns it to the currently authenticated user. */ - public TaskInstance createStartTaskInstance() { + public TaskInstance createStartTaskInstance() + { TaskInstance taskInstance = null; Task startTask = taskMgmtDefinition.getStartTask(); - if (startTask!=null) { + if (startTask != null) + { Token rootToken = processInstance.getRootToken(); ExecutionContext executionContext = new ExecutionContext(rootToken); taskInstance = createTaskInstance(startTask, executionContext); @@ -343,29 +404,30 @@ return taskInstance; } - TaskInstance instantiateNewTaskInstance(ExecutionContext executionContext) { - TaskInstanceFactory taskInstanceFactory = (TaskInstanceFactory) JbpmConfiguration.Configs.getObject("jbpm.task.instance.factory"); - if (taskInstanceFactory == null) { + TaskInstance instantiateNewTaskInstance(ExecutionContext executionContext) + { + TaskInstanceFactory taskInstanceFactory = (TaskInstanceFactory)JbpmConfiguration.Configs.getObject("jbpm.task.instance.factory"); + if (taskInstanceFactory == null) + { throw new JbpmException("jbpm.task.instance.factory was not configured in jbpm.cfg.xml"); } return taskInstanceFactory.createTaskInstance(executionContext); } /** - * is true if the given token has task instances that keep the - * token from leaving the current node. + * is true if the given token has task instances that keep the token from leaving the current node. */ - public boolean hasBlockingTaskInstances(Token token) { + public boolean hasBlockingTaskInstances(Token token) + { boolean hasBlockingTasks = false; - if (taskInstances!=null) { - Iterator iter = taskInstances.iterator(); - while ( (iter.hasNext()) - && (! hasBlockingTasks)) { - TaskInstance taskInstance = (TaskInstance) iter.next(); - if ( (! taskInstance.hasEnded()) - && (taskInstance.isBlocking()) - && (token!=null) - && (token.equals(taskInstance.getToken())) ) { + if (taskInstances != null) + { + Iterator<TaskInstance> iter = taskInstances.iterator(); + while (iter.hasNext() && !hasBlockingTasks) + { + TaskInstance taskInstance = iter.next(); + if ((!taskInstance.hasEnded()) && (taskInstance.isBlocking()) && (token != null) && (token.equals(taskInstance.getToken()))) + { hasBlockingTasks = true; } } @@ -376,24 +438,26 @@ /** * is true if the given token has task instances that are not yet ended. */ - public boolean hasUnfinishedTasks(Token token) { - return (getUnfinishedTasks(token).size()>0); + public boolean hasUnfinishedTasks(Token token) + { + return (getUnfinishedTasks(token).size() > 0); } /** * is the collection of {@link TaskInstance}s on the given token that are not ended. */ - public Collection getUnfinishedTasks(Token token) { - Collection unfinishedTasks = new ArrayList(); - if ( taskInstances != null ) { - Iterator iter = taskInstances.iterator(); - while (iter.hasNext()) { - TaskInstance task = (TaskInstance) iter.next(); - if ( (!task.hasEnded()) - && (token!=null) - && (token.equals(task.getToken())) - ) { - unfinishedTasks.add( task ); + public Collection<TaskInstance> getUnfinishedTasks(Token token) + { + Collection<TaskInstance> unfinishedTasks = new ArrayList<TaskInstance>(); + if (taskInstances != null) + { + Iterator<TaskInstance> iter = taskInstances.iterator(); + while (iter.hasNext()) + { + TaskInstance task = iter.next(); + if ((!task.hasEnded()) && (token != null) && (token.equals(task.getToken()))) + { + unfinishedTasks.add(task); } } } @@ -401,109 +465,135 @@ } /** - * is true if there are {@link TaskInstance}s on the given token that can trigger - * the token to continue. + * is true if there are {@link TaskInstance}s on the given token that can trigger the token to continue. */ - public boolean hasSignallingTasks(ExecutionContext executionContext) { - return (getSignallingTasks(executionContext).size()>0); + public boolean hasSignallingTasks(ExecutionContext executionContext) + { + return (getSignallingTasks(executionContext).size() > 0); } /** - * is the collection of {@link TaskInstance}s for the given token that can trigger - * the token to continue. + * is the collection of {@link TaskInstance}s for the given token that can trigger the token to continue. */ - public Collection getSignallingTasks(ExecutionContext executionContext) { - Collection signallingTasks = new ArrayList(); - if ( taskInstances != null ) { - Iterator iter = taskInstances.iterator(); - while (iter.hasNext()) { - TaskInstance taskInstance = (TaskInstance) iter.next(); - if (taskInstance.isSignalling() - &&(executionContext.getToken().equals(taskInstance.getToken()))) { + public Collection<TaskInstance> getSignallingTasks(ExecutionContext executionContext) + { + Collection<TaskInstance> signallingTasks = new ArrayList<TaskInstance>(); + if (taskInstances != null) + { + Iterator<TaskInstance> iter = taskInstances.iterator(); + while (iter.hasNext()) + { + TaskInstance taskInstance = iter.next(); + if (taskInstance.isSignalling() && (executionContext.getToken().equals(taskInstance.getToken()))) + { signallingTasks.add(taskInstance); } } } return signallingTasks; } - + /** - * returns all the taskInstances for the this process instance. This - * includes task instances that have been completed previously. + * returns all the taskInstances for the this process instance. This includes task instances that have been completed + * previously. */ - public Collection getTaskInstances() { + public Collection<TaskInstance> getTaskInstances() + { return taskInstances; } - public void addTaskInstance(TaskInstance taskInstance) { - if (taskInstances==null) taskInstances = new HashSet(); + + public void addTaskInstance(TaskInstance taskInstance) + { + if (taskInstances == null) + taskInstances = new HashSet<TaskInstance>(); taskInstances.add(taskInstance); taskInstance.setTaskMgmtInstance(this); } - public void removeTaskInstance(TaskInstance taskInstance) { - if (taskInstances!=null) { + + public void removeTaskInstance(TaskInstance taskInstance) + { + if (taskInstances != null) + { taskInstances.remove(taskInstance); } } // swimlane instances /////////////////////////////////////////////////////// - public Map getSwimlaneInstances() { + public Map<String, SwimlaneInstance> getSwimlaneInstances() + { return swimlaneInstances; } - public void addSwimlaneInstance( SwimlaneInstance swimlaneInstance ) { - if (swimlaneInstances==null) swimlaneInstances = new HashMap(); + + public void addSwimlaneInstance(SwimlaneInstance swimlaneInstance) + { + if (swimlaneInstances == null) + swimlaneInstances = new HashMap<String, SwimlaneInstance>(); swimlaneInstances.put(swimlaneInstance.getName(), swimlaneInstance); swimlaneInstance.setTaskMgmtInstance(this); } - public SwimlaneInstance getSwimlaneInstance(String swimlaneName) { - return (SwimlaneInstance) (swimlaneInstances!=null ? swimlaneInstances.get(swimlaneName) : null ); + + public SwimlaneInstance getSwimlaneInstance(String swimlaneName) + { + return swimlaneInstances != null ? swimlaneInstances.get(swimlaneName) : null; } - public SwimlaneInstance createSwimlaneInstance(String swimlaneName) { - Swimlane swimlane = (taskMgmtDefinition!=null ? taskMgmtDefinition.getSwimlane(swimlaneName) : null); - if (swimlane!=null) { + public SwimlaneInstance createSwimlaneInstance(String swimlaneName) + { + Swimlane swimlane = (taskMgmtDefinition != null ? taskMgmtDefinition.getSwimlane(swimlaneName) : null); + if (swimlane != null) + { return createSwimlaneInstance(swimlane); } - throw new JbpmException("couldn't create swimlane instance for non-existing swimlane "+swimlaneName); + throw new JbpmException("couldn't create swimlane instance for non-existing swimlane " + swimlaneName); } - public SwimlaneInstance createSwimlaneInstance(Swimlane swimlane) { - if (swimlaneInstances==null) swimlaneInstances = new HashMap(); + public SwimlaneInstance createSwimlaneInstance(Swimlane swimlane) + { + if (swimlaneInstances == null) + swimlaneInstances = new HashMap<String, SwimlaneInstance>(); SwimlaneInstance swimlaneInstance = new SwimlaneInstance(swimlane); - try { + try + { swimlaneInstance.setTaskMgmtInstance(this); - Class persistentMapClass = swimlaneInstances.getClass(); + Class<?> persistentMapClass = swimlaneInstances.getClass(); Field mapField = persistentMapClass.getDeclaredField("map"); mapField.setAccessible(true); // TODO remove the size when we switch to hibernate 3.2.1 (it's a workaround for a bug) swimlaneInstances.size(); swimlaneInstances.put(swimlaneInstance.getName(), swimlaneInstance); - } catch (Exception e) { + } + catch (Exception e) + { e.printStackTrace(); } return swimlaneInstance; } - + // getters and setters ////////////////////////////////////////////////////// - public TaskMgmtDefinition getTaskMgmtDefinition() { + public TaskMgmtDefinition getTaskMgmtDefinition() + { return taskMgmtDefinition; } /** * suspends all task instances for this process instance. */ - public void suspend(Token token) { - if (token==null) { + public void suspend(Token token) + { + if (token == null) + { throw new JbpmException("can't suspend task instances for token null"); } - if (taskInstances!=null) { - Iterator iter = taskInstances.iterator(); - while (iter.hasNext()) { - TaskInstance taskInstance = (TaskInstance) iter.next(); - if ( (token.equals(taskInstance.getToken())) - && (taskInstance.isOpen()) - ) { + if (taskInstances != null) + { + Iterator<TaskInstance> iter = taskInstances.iterator(); + while (iter.hasNext()) + { + TaskInstance taskInstance = iter.next(); + if ((token.equals(taskInstance.getToken())) && (taskInstance.isOpen())) + { taskInstance.suspend(); } } @@ -513,45 +603,56 @@ /** * resumes all task instances for this process instance. */ - public void resume(Token token) { - if (token==null) { + public void resume(Token token) + { + if (token == null) + { throw new JbpmException("can't suspend task instances for token null"); } - if (taskInstances!=null) { - Iterator iter = taskInstances.iterator(); - while (iter.hasNext()) { - TaskInstance taskInstance = (TaskInstance) iter.next(); - if ( (token.equals(taskInstance.getToken())) - && (taskInstance.isOpen()) - ) { + if (taskInstances != null) + { + Iterator<TaskInstance> iter = taskInstances.iterator(); + while (iter.hasNext()) + { + TaskInstance taskInstance = iter.next(); + if ((token.equals(taskInstance.getToken())) && (taskInstance.isOpen())) + { taskInstance.resume(); } } } } - - void notifyVariableUpdate(TaskInstance taskInstance) { - if (taskInstanceVariableUpdates==null) { - taskInstanceVariableUpdates=new HashSet(); + + void notifyVariableUpdate(TaskInstance taskInstance) + { + if (taskInstanceVariableUpdates == null) + { + taskInstanceVariableUpdates = new HashSet<TaskInstance>(); } taskInstanceVariableUpdates.add(taskInstance); } + /** * returns the collection of task instance with variable updates. */ - public Collection getTaskInstancesWithVariableUpdates() { + public Collection<TaskInstance> getTaskInstancesWithVariableUpdates() + { return taskInstanceVariableUpdates; } /** * convenience method to end all tasks related to a given process instance. */ - public void endAll() { - if (taskInstances!=null) { - Iterator iter = taskInstances.iterator(); - while (iter.hasNext()) { - TaskInstance taskInstance = (TaskInstance) iter.next(); - if (!taskInstance.hasEnded()) { + public void endAll() + { + if (taskInstances != null) + { + Iterator<TaskInstance> iter = taskInstances.iterator(); + while (iter.hasNext()) + { + TaskInstance taskInstance = iter.next(); + if (!taskInstance.hasEnded()) + { taskInstance.end(); } } @@ -561,14 +662,16 @@ /** * removes signalling capabilities from all task instances related to the given token. */ - public void removeSignalling(Token token) { - if (taskInstances!=null) { - Iterator iter = taskInstances.iterator(); - while (iter.hasNext()) { - TaskInstance taskInstance = (TaskInstance) iter.next(); - if ( (token!=null) - && (token.equals(taskInstance.getToken())) - ) { + public void removeSignalling(Token token) + { + if (taskInstances != null) + { + Iterator<TaskInstance> iter = taskInstances.iterator(); + while (iter.hasNext()) + { + TaskInstance taskInstance = iter.next(); + if ((token != null) && (token.equals(taskInstance.getToken()))) + { taskInstance.setSignalling(false); } } Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/TaskServiceImpl.java =================================================================== --- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/TaskServiceImpl.java 2008-12-05 15:28:33 UTC (rev 3229) +++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/TaskServiceImpl.java 2008-12-05 15:30:04 UTC (rev 3230) @@ -24,17 +24,21 @@ // $Id$ import java.util.ArrayList; +import java.util.Collection; import java.util.List; import javax.management.ObjectName; -import org.jboss.bpm.api.NotImplementedException; import org.jboss.bpm.api.client.ProcessEngine; +import org.jboss.bpm.api.model.Process; import org.jboss.bpm.api.runtime.ExecutionContext; import org.jboss.bpm.api.service.ExecutionContextService; +import org.jboss.bpm.api.service.ProcessService; import org.jboss.bpm.api.service.internal.AbstractTaskService; import org.jboss.bpm.api.task.Task; import org.jbpm.JbpmContext; +import org.jbpm.integration.spec.model.ProcessImpl; +import org.jbpm.integration.spec.runtime.InvocationProxy; import org.jbpm.integration.spec.task.TaskImpl; import org.jbpm.taskmgmt.exe.TaskInstance; import org.slf4j.Logger; @@ -59,20 +63,47 @@ public List<Task> getTasksByProcess(ObjectName procID) { - throw new NotImplementedException(); + ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class); + ExecutionContext bpmContext = ctxService.getExecutionContext(true); + try + { + ProcessService procService = getProcessEngine().getService(ProcessService.class); + Process proc = procService.getProcess(procID); + if (proc == null) + throw new IllegalStateException("Cannot obtain process: " + procID); + + List<Task> tasks = new ArrayList<Task>(); + ProcessImpl procImpl = InvocationProxy.getUnderlying(proc, ProcessImpl.class); + Collection<TaskInstance> taskInstances = procImpl.getDelegate().getTaskMgmtInstance().getTaskInstances(); + for (TaskInstance taskInst : taskInstances) + { + Task task = new TaskImpl(getProcessEngine(), taskInst); + task = InvocationProxy.newInstance((TaskImpl)task, Task.class); + tasks.add(task); + } + + return tasks; + } + catch (RuntimeException rte) + { + throw rte; + } + finally + { + bpmContext.close(); + } } - + public Task getTask(ObjectName taskID) { - Task task = null; - ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class); ExecutionContext bpmContext = ctxService.getExecutionContext(true); try { JbpmContext jbpmContext = bpmContext.getAttachment(JbpmContext.class); - TaskInstance oldTask = jbpmContext.getTaskInstance(adaptKey(taskID)); - task = new TaskImpl(getProcessEngine(), oldTask); + TaskInstance taskInst = jbpmContext.getTaskInstance(adaptKey(taskID)); + Task task = new TaskImpl(getProcessEngine(), taskInst); + return InvocationProxy.newInstance((TaskImpl)task, Task.class); } catch (RuntimeException rte) { @@ -82,23 +113,23 @@ { bpmContext.close(); } - - return task; } + @SuppressWarnings("unchecked") public List<Task> getTasksByActor(String actor) { - List<Task> tasks = new ArrayList<Task>(); - ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class); ExecutionContext bpmContext = ctxService.getExecutionContext(true); try { + List<Task> tasks = new ArrayList<Task>(); JbpmContext jbpmContext = bpmContext.getAttachment(JbpmContext.class); for (TaskInstance oldTask : (List<TaskInstance>)jbpmContext.getTaskList(actor)) { - tasks.add(new TaskImpl(getProcessEngine(), oldTask)); + TaskImpl taskImpl = new TaskImpl(getProcessEngine(), oldTask); + tasks.add(InvocationProxy.newInstance(taskImpl, Task.class)); } + return tasks; } catch (RuntimeException rte) { @@ -108,33 +139,57 @@ { bpmContext.close(); } - - return tasks; } public void closeTask(ObjectName taskID, String signalName) { - TaskImpl taskImpl = (TaskImpl)getTask(taskID); - TaskInstance taskInstance = taskImpl.getOldTask(); - - if (signalName != null) - taskInstance.end(signalName); - else - taskInstance.end(); + ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class); + ExecutionContext bpmContext = ctxService.getExecutionContext(true); + try + { + TaskImpl taskImpl = InvocationProxy.getUnderlying(getTask(taskID), TaskImpl.class); + TaskInstance taskInst = taskImpl.getDelegate(); + + if (signalName != null) + taskInst.end(signalName); + else + taskInst.end(); + } + catch (RuntimeException rte) + { + throw rte; + } + finally + { + bpmContext.close(); + } } public void reassignTask(ObjectName taskID, String actor) { - TaskImpl taskImpl = (TaskImpl)getTask(taskID); - TaskInstance taskInstance = taskImpl.getOldTask(); - - if (taskInstance.getStart() != null) + ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class); + ExecutionContext bpmContext = ctxService.getExecutionContext(true); + try { - log.warn("Force stop on task " + taskInstance.getId() + ". Will be restarted."); - taskInstance.setStart(null); // strange, but means isNotStarted() + TaskImpl taskImpl = InvocationProxy.getUnderlying(getTask(taskID), TaskImpl.class); + TaskInstance taskInst = taskImpl.getDelegate(); + + if (taskInst.getStart() != null) + { + log.warn("Force stop on task " + taskInst.getId() + ". Will be restarted."); + taskInst.setStart(null); // strange, but means isNotStarted() + } + + taskInst.start(actor, true); } - - taskInstance.start(actor, true); + catch (RuntimeException rte) + { + throw rte; + } + finally + { + bpmContext.close(); + } } private Long adaptKey(ObjectName key) Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/task/TaskImpl.java =================================================================== --- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/task/TaskImpl.java 2008-12-05 15:28:33 UTC (rev 3229) +++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/task/TaskImpl.java 2008-12-05 15:30:04 UTC (rev 3230) @@ -33,6 +33,7 @@ import org.jboss.bpm.api.runtime.Token; import org.jboss.bpm.api.service.ExecutionService; import org.jboss.bpm.api.task.Task; +import org.jbpm.integration.spec.model.AbstractElementImpl; import org.jbpm.integration.spec.runtime.InvocationProxy; import org.jbpm.integration.spec.runtime.TokenImpl; import org.jbpm.taskmgmt.exe.PooledActor; @@ -46,46 +47,88 @@ * @author thomas.diesler(a)jboss.com * @since 28-Nov-2008 */ -public class TaskImpl implements Task +public class TaskImpl extends AbstractElementImpl<TaskInstance> implements Task { + private static final long serialVersionUID = 1L; + // Provide logging final Logger log = LoggerFactory.getLogger(TaskImpl.class); - private ProcessEngine engine; - private TaskInstance oldTask; - private Token token; + private ObjectName keyCache; - public TaskImpl(ProcessEngine engine, TaskInstance oldTask) + public TaskImpl(ProcessEngine engine, TaskInstance tmpTask) { - this.engine = engine; - this.oldTask = oldTask; + super(engine, tmpTask, TaskInstance.class); + + if (tmpTask.getId() > 0) + keyCache = getKey(tmpTask); } - public TaskInstance getOldTask() + public ObjectName getKey() { - return oldTask; + ObjectName objKey = keyCache; + if (objKey == null) + { + TaskInstance delegate = getDelegate(); + objKey = getKey(delegate); + if (delegate.getId() > 0) + keyCache = objKey; + } + return objKey; } - public ObjectName getKey() + public static ObjectName getKey(TaskInstance tmpTask) { - return ObjectNameFactory.create("Task:id=" + oldTask.getId()); + return ObjectNameFactory.create("Task:id=" + tmpTask.getId()); } + public String getName() + { + return getDelegate().getName(); + } + + public void end(String targetName) + { + getDelegate().end(targetName); + } + + public boolean hasEnded() + { + return getDelegate().hasEnded(); + } + + public boolean isCancelled() + { + return getDelegate().isCancelled(); + } + + public boolean isBlocking() + { + return getDelegate().isBlocking(); + } + + public boolean isSignalling() + { + return getDelegate().isSignalling(); + } + public String getActor() { - return oldTask.getActorId(); + return getDelegate().getActorId(); } public ObjectName getCorrelationKey() { - if (token == null) + Token token = null; + + if (getDelegate().getToken() != null) { - long tokenId = oldTask.getToken().getId(); - ExecutionService exService = engine.getService(ExecutionService.class); + long tokenID = getDelegate().getToken().getId(); + ExecutionService exService = getProcessEngine().getService(ExecutionService.class); for (Token auxTok : exService.getTokens()) { TokenImpl tokenImpl = InvocationProxy.getUnderlying(auxTok, TokenImpl.class); - if (tokenImpl.getDelegate().getId() == tokenId) + if (tokenImpl.getDelegate().getId() == tokenID) { token = auxTok; break; @@ -99,29 +142,13 @@ return token.getKey(); } - public String getName() - { - return oldTask.getName(); - } - public Set<String> getPooledActors() { Set<String> actors = new HashSet<String>(); - for (PooledActor pa : oldTask.getPooledActors()) + for (PooledActor pa : getDelegate().getPooledActors()) { actors.add(pa.getActorId()); } return actors; } - - public boolean isBlocking() - { - return oldTask.isBlocking(); - } - - public boolean isSignalling() - { - return oldTask.isSignalling(); - } - } Modified: jbpm3/trunk/modules/integration/spec/src/test/java/org/jbpm/test/integration/spec/task/TaskTest.java =================================================================== --- jbpm3/trunk/modules/integration/spec/src/test/java/org/jbpm/test/integration/spec/task/TaskTest.java 2008-12-05 15:28:33 UTC (rev 3229) +++ jbpm3/trunk/modules/integration/spec/src/test/java/org/jbpm/test/integration/spec/task/TaskTest.java 2008-12-05 15:30:04 UTC (rev 3230) @@ -23,23 +23,15 @@ // $Id$ -import java.util.Collection; -import java.util.Iterator; - import org.jboss.bpm.api.deployment.Deployment; import org.jboss.bpm.api.deployment.SimpleDeployment; import org.jboss.bpm.api.model.Process; import org.jboss.bpm.api.model.ProcessDefinition; import org.jboss.bpm.api.runtime.Token; import org.jboss.bpm.api.service.DeploymentService; +import org.jboss.bpm.api.service.TaskService; +import org.jboss.bpm.api.task.Task; import org.jboss.bpm.api.test.APITestCase; -import org.jbpm.JbpmConfiguration; -import org.jbpm.JbpmContext; -import org.jbpm.db.GraphSession; -import org.jbpm.graph.def.ActionHandler; -import org.jbpm.graph.exe.ExecutionContext; -import org.jbpm.graph.exe.ProcessInstance; -import org.jbpm.taskmgmt.exe.TaskInstance; /** * This uses the API to do the same as the EndTasksDbTest @@ -49,10 +41,6 @@ */ public class TaskTest extends APITestCase { - private JbpmConfiguration jbpmConfiguration; - private JbpmContext jbpmContext; - private GraphSession graphSession; - public void testCancel() { Deployment dep = new SimpleDeployment( @@ -64,9 +52,7 @@ " <task name='approve' description='Review order'>" + " <assignment pooled-actors='reviewers' />" + " </task>" + - " <transition name='approve' to='process'>" + - " <action class='" + Buzz.class.getName() + "' />" + - " </transition>" + + " <transition name='approve' to='process'/>" + " <transition name='cancel' to='cancelled'/>" + " </task-node>" + " <state name='process' />" + @@ -94,13 +80,10 @@ } } - public void _testApprove() + public void testApprove() { - jbpmContext = createJbpmContext(); - graphSession = jbpmContext.getGraphSession(); - - org.jbpm.graph.def.ProcessDefinition processDefinition = org.jbpm.graph.def.ProcessDefinition.parseXmlString( - "<process-definition name='endtasksprocess'>" + + Deployment dep = new SimpleDeployment( + "<process-definition name='endtasksprocess' xmlns='urn:jbpm.org:jpdl-3.2'>" + " <start-state>" + " <transition to='approval' />" + " </start-state>" + @@ -116,36 +99,35 @@ " <state name='cancelled' />" + "</process-definition>" ); - jbpmContext.deployProcessDefinition(processDefinition); + + DeploymentService depService = getProcessEngine().getService(DeploymentService.class); + ProcessDefinition procDef = depService.deploy(dep); try { - newTransaction(); + Process proc = procDef.newInstance(); + + Token token = proc.startProcess(); - ProcessInstance processInstance = jbpmContext.newProcessInstanceForUpdate("endtasksprocess"); - processInstance.signal(); - - processInstance = saveAndReload(processInstance); - - assertEquals("approval", processInstance.getRootToken().getNode().getName()); - TaskInstance taskInstance = (TaskInstance)processInstance.getTaskMgmtInstance().getTaskInstances().iterator().next(); + assertEquals("approval", token.getCurrentNode().getName()); - taskInstance.end("approve"); - assertEquals("process", processInstance.getRootToken().getNode().getName()); + TaskService taskService = getProcessEngine().getService(TaskService.class); + Task task = taskService.getTasksByProcess(proc.getKey()).iterator().next(); + assertNotNull("One task", task); + assertEquals("Task name", "approve", task.getName()); + + task.end("approve"); + assertEquals("process", token.getCurrentNode().getName()); } finally { - jbpmContext.getGraphSession().deleteProcessDefinition(processDefinition.getId()); - jbpmContext.close(); + depService.undeploy(dep); } } - public void _testReject() + public void testReject() { - jbpmContext = createJbpmContext(); - graphSession = jbpmContext.getGraphSession(); - - org.jbpm.graph.def.ProcessDefinition processDefinition = org.jbpm.graph.def.ProcessDefinition.parseXmlString( - "<process-definition name='endtasksprocess'>" + + Deployment dep = new SimpleDeployment( + "<process-definition name='endtasksprocess' xmlns='urn:jbpm.org:jpdl-3.2'>" + " <start-state>" + " <transition to='approval' />" + " </start-state>" + @@ -161,36 +143,33 @@ " <state name='cancelled' />" + "</process-definition>" ); - jbpmContext.deployProcessDefinition(processDefinition); + + DeploymentService depService = getProcessEngine().getService(DeploymentService.class); + ProcessDefinition procDef = depService.deploy(dep); try { - newTransaction(); + Process proc = procDef.newInstance(); + + Token token = proc.startProcess(); - ProcessInstance processInstance = jbpmContext.newProcessInstanceForUpdate("endtasksprocess"); - processInstance.signal(); - - processInstance = saveAndReload(processInstance); - - assertEquals("approval", processInstance.getRootToken().getNode().getName()); - TaskInstance taskInstance = (TaskInstance)processInstance.getTaskMgmtInstance().getTaskInstances().iterator().next(); + assertEquals("approval", token.getCurrentNode().getName()); - taskInstance.end("reject"); - assertEquals("cancelled", processInstance.getRootToken().getNode().getName()); + TaskService taskService = getProcessEngine().getService(TaskService.class); + Task task = taskService.getTasksByProcess(proc.getKey()).iterator().next(); + task.end("reject"); + + assertEquals("cancelled", token.getCurrentNode().getName()); } finally { - jbpmContext.getGraphSession().deleteProcessDefinition(processDefinition.getId()); - jbpmContext.close(); + depService.undeploy(dep); } } - public void _testTaskInstancesAfterCancellation() + public void testTaskInstancesAfterCancellation() { - jbpmContext = createJbpmContext(); - graphSession = jbpmContext.getGraphSession(); - - org.jbpm.graph.def.ProcessDefinition processDefinition = org.jbpm.graph.def.ProcessDefinition.parseXmlString( - "<process-definition name='endtasksprocess'>" + + Deployment dep = new SimpleDeployment( + "<process-definition name='endtasksprocess' xmlns='urn:jbpm.org:jpdl-3.2'>" + " <start-state>" + " <transition to='approval' />" + " </start-state>" + @@ -206,73 +185,26 @@ " <state name='cancelled' />" + "</process-definition>" ); - jbpmContext.deployProcessDefinition(processDefinition); + + DeploymentService depService = getProcessEngine().getService(DeploymentService.class); + ProcessDefinition procDef = depService.deploy(dep); try { - newTransaction(); + Process proc = procDef.newInstance(); + + Token token = proc.startProcess(); + token.signal("cancel"); - ProcessInstance processInstance = jbpmContext.newProcessInstanceForUpdate("endtasksprocess"); - processInstance.signal(); - - processInstance = saveAndReload(processInstance); - processInstance.signal("cancel"); - - Collection taskInstances = processInstance.getTaskMgmtInstance().getTaskInstances(); - Iterator iter = taskInstances.iterator(); - while(iter.hasNext()) { - TaskInstance taskInstance = (TaskInstance) iter.next(); - assertTrue(taskInstance.getName()+" ended", taskInstance.hasEnded()); - assertFalse(taskInstance.getName()+" not cancelled", taskInstance.isCancelled()); - assertFalse(taskInstance.getName()+" not blocking", taskInstance.isBlocking()); - assertFalse(taskInstance.getName()+" not signalling", taskInstance.isSignalling()); - } + TaskService taskService = getProcessEngine().getService(TaskService.class); + Task task = taskService.getTasksByProcess(proc.getKey()).iterator().next(); + assertTrue(task.getName() + " ended", task.hasEnded()); + assertFalse(task.getName() + " not cancelled", task.isCancelled()); + assertFalse(task.getName() + " not blocking", task.isBlocking()); + assertFalse(task.getName() + " not signalling", task.isSignalling()); } finally { - jbpmContext.getGraphSession().deleteProcessDefinition(processDefinition.getId()); - jbpmContext.close(); + depService.undeploy(dep); } } - - public static class Buzz implements ActionHandler - { - private static final long serialVersionUID = 1L; - - public void execute(ExecutionContext executionContext) throws Exception - { - throw new RuntimeException("buzz"); - } - } - - private JbpmContext createJbpmContext() - { - return getJbpmConfiguration().createJbpmContext(); - } - - private ProcessInstance saveAndReload(ProcessInstance pi) - { - if (jbpmContext == null) - jbpmContext = createJbpmContext(); - - jbpmContext.save(pi); - newTransaction(); - return graphSession.loadProcessInstance(pi.getId()); - } - - private void newTransaction() - { - if (jbpmContext != null) - jbpmContext.close(); - - jbpmContext = createJbpmContext(); - graphSession = jbpmContext.getGraphSession(); - } - - private JbpmConfiguration getJbpmConfiguration() - { - if (jbpmConfiguration == null) - jbpmConfiguration = JbpmConfiguration.getInstance(); - - return jbpmConfiguration; - } }

17 years, 4 months

1
0
0 / 0

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

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-12-05 10:28:33 -0500 (Fri, 05 Dec 2008) New Revision: 3229 Modified: projects/spec/trunk/eclipse/jBPMCodeStyle.xml projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/task/Task.java Log: More Task API Modified: projects/spec/trunk/eclipse/jBPMCodeStyle.xml =================================================================== --- projects/spec/trunk/eclipse/jBPMCodeStyle.xml 2008-12-05 14:42:33 UTC (rev 3228) +++ projects/spec/trunk/eclipse/jBPMCodeStyle.xml 2008-12-05 15:28:33 UTC (rev 3229) @@ -69,7 +69,7 @@ <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/> +<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="true"/> <setting id="org.eclipse.jdt.core.formatter.lineSplit" value="164"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/> @@ -185,8 +185,8 @@ <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="120"/> +<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="false"/> +<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="168"/> <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/> Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/task/Task.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/task/Task.java 2008-12-05 14:42:33 UTC (rev 3228) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/task/Task.java 2008-12-05 15:28:33 UTC (rev 3229) @@ -37,8 +37,14 @@ Set<String> getPooledActors(); + void end(String targetName); + boolean isBlocking(); boolean isSignalling(); + + boolean isCancelled(); + + boolean hasEnded(); }

17 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r3228 - in projects/gwt-console/trunk/server: src/main/java/org/jboss/bpm/console/server and 1 other directory.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-12-05 09:42:33 -0500 (Fri, 05 Dec 2008) New Revision: 3228 Removed: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ReportFacade.java Modified: 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 Log: Report facacde moved to project balalaika Modified: projects/gwt-console/trunk/server/gwt-server.iml =================================================================== --- projects/gwt-console/trunk/server/gwt-server.iml 2008-12-05 14:41:31 UTC (rev 3227) +++ projects/gwt-console/trunk/server/gwt-server.iml 2008-12-05 14:42:33 UTC (rev 3228) @@ -10,11 +10,10 @@ <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-identity" /> <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> @@ -529,33 +528,6 @@ </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!/" /> @@ -565,15 +537,6 @@ </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!/" /> @@ -592,15 +555,6 @@ </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!/" /> @@ -637,15 +591,6 @@ </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!/" /> @@ -673,113 +618,14 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.birt:modelapi:jar:2.2.2:compile"> + <library name="M2 Dep: commons-codec:commons-codec:jar:1.2:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/birt/modelapi/2.2.2/modelapi-2.2.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-codec/commons-codec/1.2/commons-codec-1.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-05 14:41:31 UTC (rev 3227) +++ projects/gwt-console/trunk/server/pom.xml 2008-12-05 14:42:33 UTC (rev 3228) @@ -52,12 +52,7 @@ <artifactId>bpm-spec-api</artifactId> <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>  <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-05 14:41:31 UTC (rev 3227) +++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ConsoleServerApplication.java 2008-12-05 14:42:33 UTC (rev 3228) @@ -40,8 +40,7 @@ singletons.add(new TaskMgmtFacade()); singletons.add(new UserMgmtFacade()); singletons.add(new JBPM3MgmtFacade()); - singletons.add(new TestFacade()); - singletons.add(new ReportFacade()); + singletons.add(new TestFacade()); } @Override Deleted: 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 2008-12-05 14:41:31 UTC (rev 3227) +++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ReportFacade.java 2008-12-05 14:42:33 UTC (rev 3228) @@ -1,99 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.console.server; - -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); - } - } - -}

17 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r3227 - in projects/balalaika/trunk/server/src/main: webapp and 1 other directories.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-12-05 09:41:31 -0500 (Fri, 05 Dec 2008) New Revision: 3227 Added: projects/balalaika/trunk/server/src/main/java/org/jboss/balalaika/FileWriter.java Modified: projects/balalaika/trunk/server/src/main/java/org/jboss/balalaika/ReportFacade.java projects/balalaika/trunk/server/src/main/webapp/WEB-INF/web.xml projects/balalaika/trunk/server/src/main/webapp/index.html Log: Avoid double buffering of report contents Added: projects/balalaika/trunk/server/src/main/java/org/jboss/balalaika/FileWriter.java =================================================================== --- projects/balalaika/trunk/server/src/main/java/org/jboss/balalaika/FileWriter.java (rev 0) +++ projects/balalaika/trunk/server/src/main/java/org/jboss/balalaika/FileWriter.java 2008-12-05 14:41:31 UTC (rev 3227) @@ -0,0 +1,67 @@ +/* + * 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.ext.Provider; +import javax.ws.rs.ext.MessageBodyWriter; +import javax.ws.rs.Produces; +import javax.ws.rs.WebApplicationException; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.MultivaluedMap; +import java.lang.reflect.Type; +import java.lang.annotation.Annotation; +import java.io.OutputStream; +import java.io.IOException; +import java.io.FileInputStream; +import java.io.File; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +@Provider +@Produces({"text/html", "image/*"}) +public class FileWriter implements MessageBodyWriter +{ + + public boolean isWriteable(Class aClass, Type type, Annotation[] annotations, MediaType mediaType) + { + return aClass.equals(java.io.File.class); + } + + public long getSize(Object o, Class aClass, Type type, Annotation[] annotations, MediaType mediaType) + { + return ((File)o).length(); + } + + public void writeTo(Object o, Class aClass, Type type, Annotation[] annotations, MediaType mediaType, MultivaluedMap multivaluedMap, OutputStream outputStream) throws IOException, WebApplicationException + { + FileInputStream fin = new FileInputStream((File)o); + int c; + while ((c = fin.read()) != -1) + { + outputStream.write(c); + } + + fin.close(); + + } +} Modified: projects/balalaika/trunk/server/src/main/java/org/jboss/balalaika/ReportFacade.java =================================================================== --- projects/balalaika/trunk/server/src/main/java/org/jboss/balalaika/ReportFacade.java 2008-12-05 14:20:19 UTC (rev 3226) +++ projects/balalaika/trunk/server/src/main/java/org/jboss/balalaika/ReportFacade.java 2008-12-05 14:41:31 UTC (rev 3227) @@ -25,16 +25,10 @@ import org.apache.commons.logging.LogFactory; import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; +import javax.ws.rs.*; import javax.ws.rs.core.Context; import javax.ws.rs.core.Response; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; +import java.io.*; /** * BIRT integration facade. @@ -130,8 +124,8 @@ String absoluteFile = birtService.getIConfig().getOutputDir() + outputFileName; log.info("Render " + absoluteFile); - File f = new File(absoluteFile); - return Response.ok(bytesFromFile(f)).type("text/html").build(); + File reportFile = new File(absoluteFile); + return Response.ok(reportFile).type("text/html").build(); } @GET @@ -150,33 +144,6 @@ File imageFile = new File(absName); if(!imageFile.exists()) throw new IllegalArgumentException("Image " +absName+" doesn't exist"); - return Response.ok(bytesFromFile(imageFile)).build(); + return Response.ok(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); - } - } } Modified: projects/balalaika/trunk/server/src/main/webapp/WEB-INF/web.xml =================================================================== --- projects/balalaika/trunk/server/src/main/webapp/WEB-INF/web.xml 2008-12-05 14:20:19 UTC (rev 3226) +++ projects/balalaika/trunk/server/src/main/webapp/WEB-INF/web.xml 2008-12-05 14:41:31 UTC (rev 3227) @@ -15,6 +15,11 @@ <param-value>/rs</param-value> </context-param> + <context-param> + <param-name>resteasy.providers</param-name> + <param-value>org.jboss.balalaika.FileWriter</param-value> + </context-param> + <!--context-param> <param-name>org.jboss.bpm.console.server.dao.ManagementFactory</param-name> <param-value>org.jboss.bpm.console.server.dao.internal.JBPM3ManagementFactory</param-value> Modified: projects/balalaika/trunk/server/src/main/webapp/index.html =================================================================== --- projects/balalaika/trunk/server/src/main/webapp/index.html 2008-12-05 14:20:19 UTC (rev 3226) +++ projects/balalaika/trunk/server/src/main/webapp/index.html 2008-12-05 14:41:31 UTC (rev 3227) @@ -20,15 +20,16 @@ <tr> <td>GET</td> <td>/rs/report/view/{reportName}</td> - <td>Get an HTML report from file 'reportName' </td> + <td>View a HTML report from template '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> + <td>Get images associated with an HTML report + (The exported reports refer to tzhis URL)</td> + <td>image/*</td> </tr> </table> </body>

17 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r3226 - jbpm4/trunk/modules/task/src/test/java/org/jbpm/task.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2008-12-05 09:20:19 -0500 (Fri, 05 Dec 2008) New Revision: 3226 Modified: jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskServiceTest.java Log: excluded failing test contents 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-05 14:19:35 UTC (rev 3225) +++ jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskServiceTest.java 2008-12-05 14:20:19 UTC (rev 3226) @@ -29,9 +29,11 @@ public class TaskServiceTest extends DbTestCase { public void testNewTask() { + /* String taskId = getName(); Task task = createTask(taskId); assertEquals(taskId, task.getId()); + */ } }

17 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r3225 - in jbpm3/trunk/modules: core/src/main/java/org/jbpm/graph/node and 2 other directories.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-12-05 09:19:35 -0500 (Fri, 05 Dec 2008) New Revision: 3225 Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/def/Node.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/node/StartState.java jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/NodeImpl.java jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ProcessImpl.java jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/runtime/TokenImpl.java Log: Restore optional name in StartState Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/def/Node.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/def/Node.java 2008-12-05 14:18:51 UTC (rev 3224) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/def/Node.java 2008-12-05 14:19:35 UTC (rev 3225) @@ -65,6 +65,15 @@ return NodeType.Node; } + public String getNameExt() + { + String name = super.getName(); + if (name == null) + name = "#anonymous" + getNodeType(); + + return name; + } + // event types ////////////////////////////////////////////////////////////// public static final String[] supportedEventTypes = new String[] { Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/node/StartState.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/node/StartState.java 2008-12-05 14:18:51 UTC (rev 3224) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/node/StartState.java 2008-12-05 14:19:35 UTC (rev 3225) @@ -44,10 +44,6 @@ @Override public String getName() { - String name = super.getName(); - if (name == null) - name = "StartState"; - return name; } Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/NodeImpl.java =================================================================== --- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/NodeImpl.java 2008-12-05 14:18:51 UTC (rev 3224) +++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/NodeImpl.java 2008-12-05 14:19:35 UTC (rev 3225) @@ -69,7 +69,7 @@ public String getName() { - return getDelegate().getName(); + return getDelegate().getNameExt(); } public ProcessDefinition getProcessDefinition() Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ProcessImpl.java =================================================================== --- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ProcessImpl.java 2008-12-05 14:18:51 UTC (rev 3224) +++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ProcessImpl.java 2008-12-05 14:19:35 UTC (rev 3225) @@ -217,9 +217,8 @@ // Set process to active setProcessStatus(ProcessStatus.Active); - // Fire the jbpm3 start event - NodeImpl<?> initialNode = (NodeImpl<?>)token.getCurrentNode(); - procInst.fireStartEvent(initialNode.getDelegate()); + // Fire the start event + procInst.fireStartEvent(rootToken.getNode()); // Signal the root token token.signal(); Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/runtime/TokenImpl.java =================================================================== --- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/runtime/TokenImpl.java 2008-12-05 14:18:51 UTC (rev 3224) +++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/runtime/TokenImpl.java 2008-12-05 14:19:35 UTC (rev 3225) @@ -134,7 +134,7 @@ // @Override public Node getCurrentNode() { - String nodeName = getDelegate().getNode().getName(); + String nodeName = getDelegate().getNode().getNameExt(); return getProcess().getNode(nodeName); } @@ -187,7 +187,6 @@ ExecutionContext bpmContext = ctxService.getExecutionContext(true); try { - // Make sure we have a current node NodeImpl<?> currNode = (NodeImpl<?>)getCurrentNode(); if (currNode == null) throw new IllegalStateException("Cannot signal token with no current node: " + this);

17 years, 4 months

1
0
0 / 0

← Newer
1
...
33
34
35
36
37
38
39
...
43
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jbpm-commits December 2008