[jbpm-commits] JBoss JBPM SVN: r3113 - in jbpm3/trunk: modules/distribution and 20 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-11-27 05:25:31 -0500 (Thu, 27 Nov 2008) New Revision: 3113 Added: jbpm3/trunk/modules/integration/api/src/main/resources/org.jboss.bpm.api.client.ConfigurationProvider Removed: jbpm3/trunk/modules/integration/api/src/main/resources/org.jbpm.api.client.ConfigurationProvider Modified: jbpm3/trunk/modules/distribution/pom.xml jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml jbpm3/trunk/modules/enterprise/jar/pom.xml jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/config/AppServerConfigurationsTest.java jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/config/ContainerProvidedJarsTest.java jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/ejbtimer/EjbSchedulerTest.java jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/jms/JmsMessageTest.java jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/jta/JtaDbPersistenceTest.java jbpm3/trunk/modules/integration/api/.project jbpm3/trunk/modules/integration/api/pom.xml jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/client/ProcessEngineImpl.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/client/TokenImpl.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/jpdl32/DialectHandlerImpl.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/EndEventImpl.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/ExclusiveGatewayImpl.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/ExpressionImpl.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/GatewayImpl.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/NodeImpl.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/ProcessDefinitionImpl.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/ProcessImpl.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/SequenceFlowImpl.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/StartEventImpl.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/TaskImpl.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/WaitStateImpl.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/builder/GatewayBuilderImpl.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/builder/ProcessBuilderImpl.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/runtime/ExpressionEvaluator.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/runtime/NodeExecuteInterceptor.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/runtime/RuntimeContext.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/runtime/TokenAttachmentDelegate.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/DialectHandlerServiceImpl.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/MutableService.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/NoopPersistenceServiceImpl.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/ProcessBuilderServiceImpl.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/ProcessDefinitionServiceImpl.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/ProcessServiceImpl.java jbpm3/trunk/modules/integration/api/src/main/resources/jbpm-cfg-beans.xml jbpm3/trunk/modules/integration/api/src/test/java/org/jbpm/test/integration/jpdl/DialectHandlerTest.java jbpm3/trunk/modules/integration/jboss42/pom.xml jbpm3/trunk/modules/integration/jboss42/src/main/etc/jboss-beans.xml jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/PARSubDeployer.java jbpm3/trunk/modules/integration/jboss42/src/test/java/org/jbpm/test/integration/deployment/SimpleDeploymentTest.java jbpm3/trunk/pom.xml Log: Use JBoss BPM Spec integration Modified: jbpm3/trunk/modules/distribution/pom.xml =================================================================== --- jbpm3/trunk/modules/distribution/pom.xml 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/distribution/pom.xml 2008-11-27 10:25:31 UTC (rev 3113) @@ -82,12 +82,12 @@ </dependency> <dependency> <groupId>org.jbpm.jbpm3</groupId> - <artifactId>jbpm-integration-api</artifactId> + <artifactId>bpm-spec-integration-jbpm3</artifactId> <version>${version}</version> </dependency> <dependency> <groupId>org.jbpm.jbpm3</groupId> - <artifactId>jbpm-integration-api</artifactId> + <artifactId>bpm-spec-integration-jbpm3</artifactId> <classifier>config</classifier> <version>${version}</version> </dependency> @@ -115,12 +115,12 @@ <type>jdocbook</type> </dependency> <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-spec-api</artifactId> + <groupId>org.jboss.bpm</groupId> + <artifactId>bpm-spec-api</artifactId> </dependency> <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-spec-dialect-api10</artifactId> + <groupId>org.jboss.bpm</groupId> + <artifactId>bpm-spec-dialect-api10</artifactId> </dependency> <!-- jBPM Projects --> Modified: jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml =================================================================== --- jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml 2008-11-27 10:25:31 UTC (rev 3113) @@ -54,7 +54,7 @@ <outputDirectory>resources/jbpm-integration-config</outputDirectory> <useStrictFiltering>true</useStrictFiltering> <includes> - <include>*:jbpm-integration-api:jar:config</include> + <include>*:bpm-spec-integration-jbpm3:jar:config</include> <include>*:jbpm-integration-jboss42:jar:config</include> </includes> <unpack>true</unpack> Modified: jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml =================================================================== --- jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml 2008-11-27 10:25:31 UTC (rev 3113) @@ -141,13 +141,7 @@ <!-- jbpm3/lib --> <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="$INSTALL_PATH/lib" override="true"> - <include name="jbpm-enterprise-bundle.ear" /> - <include name="jbpm-jpdl.jar" /> - <include name="jbpm-identity.jar" /> - <include name="jbpm-integration-api" /> - <include name="jbpm-integration-jboss42.jar" /> - <include name="jbpm-spec-api.jar" /> - <include name="jsf-console.war" /> + <include name="bpm-spec-api.jar" /> <include name="activation.jar" /> <include name="antlr.jar" /> <include name="asm.jar" /> @@ -158,7 +152,13 @@ <include name="dom4j.jar" /> <include name="hibernate.jar" /> <include name="hsqldb.jar" /> + <include name="jbpm-enterprise-bundle.ear" /> + <include name="jbpm-jpdl.jar" /> + <include name="jbpm-identity.jar" /> + <include name="bpm-spec-integration-jbpm3" /> + <include name="jbpm-integration-jboss42.jar" /> <include name="junit.jar" /> + <include name="jsf-console.war" /> <include name="slf4j-api.jar" /> <include name="slf4j-log4j12.jar" /> <include name="log4j.jar" /> @@ -179,9 +179,9 @@ <!-- jbpm/jbpm-integration.beans --> <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-integration.beans" override="true"> - <include name="jbpm-integration-api.jar" /> - <include name="jbpm-spec-api.jar" /> - <include name="jbpm-spec-dialect-api10.jar" /> + <include name="bpm-spec-api.jar" /> + <include name="bpm-spec-dialect-api10.jar" /> + <include name="bpm-spec-integration-jbpm3.jar" /> </fileset> <fileset dir=&quot;(a){deploy.artifacts.dir}/resources/jbpm-integration-config&quot; targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-integration.beans/META-INF" override="true"> <include name="jboss-beans.xml" /> Modified: jbpm3/trunk/modules/enterprise/jar/pom.xml =================================================================== --- jbpm3/trunk/modules/enterprise/jar/pom.xml 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/enterprise/jar/pom.xml 2008-11-27 10:25:31 UTC (rev 3113) @@ -85,8 +85,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-spec-api</artifactId> + <groupId>org.jboss.bpm</groupId> + <artifactId>bpm-spec-api</artifactId> <scope>test</scope> </dependency> <dependency> Modified: jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/config/AppServerConfigurationsTest.java =================================================================== --- jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/config/AppServerConfigurationsTest.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/config/AppServerConfigurationsTest.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -25,7 +25,7 @@ import org.apache.cactus.ServletTestCase; import org.jbpm.JbpmConfiguration; -import org.jbpm.api.test.IntegrationTestSetup; +import org.jboss.bpm.api.test.IntegrationTestSetup; import org.jbpm.msg.jms.JmsMessageServiceFactory; import org.jbpm.persistence.jta.JtaDbPersistenceServiceFactory; import org.jbpm.scheduler.ejbtimer.EntitySchedulerServiceFactory; Modified: jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/config/ContainerProvidedJarsTest.java =================================================================== --- jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/config/ContainerProvidedJarsTest.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/config/ContainerProvidedJarsTest.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -31,8 +31,8 @@ import junit.framework.TestCase; -import org.jbpm.api.model.builder.ObjectNameFactory; -import org.jbpm.api.test.IntegrationTestHelper; +import org.jboss.bpm.api.model.builder.ObjectNameFactory; +import org.jboss.bpm.api.test.IntegrationTestHelper; /** * Test that there are jars deployed which should in fact be provided by the container Modified: jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/ejbtimer/EjbSchedulerTest.java =================================================================== --- jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/ejbtimer/EjbSchedulerTest.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/ejbtimer/EjbSchedulerTest.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -34,7 +34,7 @@ import org.apache.commons.logging.LogFactory; import org.jbpm.EventCallback; import org.jbpm.JbpmContext; -import org.jbpm.api.test.IntegrationTestSetup; +import org.jboss.bpm.api.test.IntegrationTestSetup; import org.jbpm.command.Command; import org.jbpm.command.DeployProcessCommand; import org.jbpm.command.StartProcessInstanceCommand; Modified: jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/jms/JmsMessageTest.java =================================================================== --- jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/jms/JmsMessageTest.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/jms/JmsMessageTest.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -33,7 +33,7 @@ import org.apache.commons.logging.LogFactory; import org.jbpm.EventCallback; import org.jbpm.JbpmContext; -import org.jbpm.api.test.IntegrationTestSetup; +import org.jboss.bpm.api.test.IntegrationTestSetup; import org.jbpm.command.Command; import org.jbpm.command.DeployProcessCommand; import org.jbpm.command.StartProcessInstanceCommand; Modified: jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/jta/JtaDbPersistenceTest.java =================================================================== --- jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/jta/JtaDbPersistenceTest.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/jta/JtaDbPersistenceTest.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -31,7 +31,7 @@ import org.apache.cactus.ServletTestCase; import org.jbpm.JbpmConfiguration; import org.jbpm.JbpmContext; -import org.jbpm.api.test.IntegrationTestSetup; +import org.jboss.bpm.api.test.IntegrationTestSetup; import org.jbpm.graph.def.ProcessDefinition; import org.jbpm.graph.exe.ProcessInstance; import org.jbpm.persistence.jta.JtaDbPersistenceService; Modified: jbpm3/trunk/modules/integration/api/.project =================================================================== --- jbpm3/trunk/modules/integration/api/.project 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/.project 2008-11-27 10:25:31 UTC (rev 3113) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>jbpm-integration-api</name> + <name>bpm-spec-integration-jbpm3</name> <comment></comment> <projects> </projects> Modified: jbpm3/trunk/modules/integration/api/pom.xml =================================================================== --- jbpm3/trunk/modules/integration/api/pom.xml 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/pom.xml 2008-11-27 10:25:31 UTC (rev 3113) @@ -15,9 +15,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <name>JBoss jBPM3 - Integration API</name> + <name>JBoss jBPM3 - Integration Spec</name> <groupId>org.jbpm.jbpm3</groupId> - <artifactId>jbpm-integration-api</artifactId> + <artifactId>bpm-spec-integration-jbpm3</artifactId> <packaging>jar</packaging> <!-- Parent --> @@ -36,8 +36,8 @@ <!-- Dependencies --> <dependencies> <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-spec-api</artifactId> + <groupId>org.jboss.bpm</groupId> + <artifactId>bpm-spec-api</artifactId> </dependency> <dependency> <groupId>org.jbpm.jbpm3</groupId> @@ -73,13 +73,13 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-spec-dialect-api10</artifactId> + <groupId>org.jboss.bpm</groupId> + <artifactId>bpm-spec-dialect-api10</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-spec-cts</artifactId> + <groupId>org.jboss.bpm</groupId> + <artifactId>bpm-spec-cts</artifactId> <scope>test</scope> <type>zip</type> </dependency> @@ -138,12 +138,6 @@ <filesets> <fileset> <directory>src/cts</directory> - <directory>src/test</directory> - <includes> - <include>java/org/jbpm/test/cts/**</include> - <include>java/org/jbpm/test/incubator/**</include> - <include>java/org/jbpm/test/pattern/**</include> - </includes> </fileset> </filesets> </configuration> @@ -159,8 +153,8 @@ <configuration> <artifactItems> <artifactItem> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-spec-cts</artifactId> + <groupId>org.jboss.bpm</groupId> + <artifactId>bpm-spec-cts</artifactId> <type>zip</type> </artifactItem> </artifactItems> @@ -181,8 +175,8 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludes> - <exclude>org/jbpm/test/incubator/**/*Test.java</exclude> - <exclude>org/jbpm/test/pattern/**/*Test.java</exclude> + <exclude>org/jboss/bpm/test/incubator/**/*Test.java</exclude> + <exclude>org/jboss/bpm/test/pattern/**/*Test.java</exclude> </excludes> </configuration> </plugin> Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/client/ProcessEngineImpl.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/client/ProcessEngineImpl.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/client/ProcessEngineImpl.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -25,8 +25,8 @@ import java.util.Set; -import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.service.Service; +import org.jboss.bpm.api.client.ProcessEngine; +import org.jboss.bpm.api.service.Service; import org.jbpm.integration.service.MutableService; /** Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/client/TokenImpl.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/client/TokenImpl.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/client/TokenImpl.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -28,17 +28,17 @@ import javax.management.ObjectName; -import org.jbpm.api.Constants; -import org.jbpm.api.NotImplementedException; -import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.client.Token; -import org.jbpm.api.model.Node; -import org.jbpm.api.model.Process; -import org.jbpm.api.model.SequenceFlow; -import org.jbpm.api.model.Process.ProcessStatus; -import org.jbpm.api.model.builder.ObjectNameFactory; -import org.jbpm.api.runtime.Attachments; -import org.jbpm.api.runtime.BasicAttachments; +import org.jboss.bpm.api.Constants; +import org.jboss.bpm.api.NotImplementedException; +import org.jboss.bpm.api.client.ProcessEngine; +import org.jboss.bpm.api.client.Token; +import org.jboss.bpm.api.model.Node; +import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.SequenceFlow; +import org.jboss.bpm.api.model.Process.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.jbpm.context.exe.ContextInstance; import org.jbpm.integration.model.ProcessImpl; import org.jbpm.integration.runtime.TokenAttachmentDelegate; Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/jpdl32/DialectHandlerImpl.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/jpdl32/DialectHandlerImpl.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/jpdl32/DialectHandlerImpl.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -29,10 +29,10 @@ import java.net.URI; import java.net.URL; -import org.jbpm.api.NotImplementedException; -import org.jbpm.api.model.ProcessDefinition; -import org.jbpm.api.service.AbstractDialectHandler; -import org.jbpm.api.service.DialectHandler; +import org.jboss.bpm.api.NotImplementedException; +import org.jboss.bpm.api.model.ProcessDefinition; +import org.jboss.bpm.api.service.AbstractDialectHandler; +import org.jboss.bpm.api.service.DialectHandler; import org.jbpm.integration.model.ProcessDefinitionImpl; /** Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/EndEventImpl.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/EndEventImpl.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/EndEventImpl.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -21,8 +21,8 @@ */ package org.jbpm.integration.model; -import org.jbpm.api.model.EndEvent; -import org.jbpm.api.model.ProcessDefinition; +import org.jboss.bpm.api.model.EndEvent; +import org.jboss.bpm.api.model.ProcessDefinition; import org.jbpm.graph.node.EndState; /** Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/ExclusiveGatewayImpl.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/ExclusiveGatewayImpl.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/ExclusiveGatewayImpl.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -23,12 +23,12 @@ // $Id$ -import org.jbpm.api.client.Token; -import org.jbpm.api.model.ExclusiveGateway; -import org.jbpm.api.model.Expression; -import org.jbpm.api.model.ProcessDefinition; -import org.jbpm.api.model.SequenceFlow; -import org.jbpm.api.model.SequenceFlow.ConditionType; +import org.jboss.bpm.api.client.Token; +import org.jboss.bpm.api.model.ExclusiveGateway; +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.model.SequenceFlow.ConditionType; import org.jbpm.graph.exe.ExecutionContext; import org.jbpm.graph.node.Decision; import org.jbpm.graph.node.DecisionHandler; Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/ExpressionImpl.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/ExpressionImpl.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/ExpressionImpl.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -23,7 +23,7 @@ //$Id$ -import org.jbpm.api.model.Expression; +import org.jboss.bpm.api.model.Expression; /** * An Expression, which is used in the definition of attributes for @{link StartEvent}, Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/GatewayImpl.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/GatewayImpl.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/GatewayImpl.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -23,10 +23,10 @@ import java.util.List; -import org.jbpm.api.NotImplementedException; -import org.jbpm.api.model.Gateway; -import org.jbpm.api.model.ProcessDefinition; -import org.jbpm.api.model.SequenceFlow; +import org.jboss.bpm.api.NotImplementedException; +import org.jboss.bpm.api.model.Gateway; +import org.jboss.bpm.api.model.ProcessDefinition; +import org.jboss.bpm.api.model.SequenceFlow; import org.jbpm.graph.node.Decision; /** Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/NodeImpl.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/NodeImpl.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/NodeImpl.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -27,13 +27,13 @@ import javax.management.ObjectName; -import org.jbpm.api.Constants; -import org.jbpm.api.InvalidProcessException; -import org.jbpm.api.model.Node; -import org.jbpm.api.model.Process; -import org.jbpm.api.model.ProcessDefinition; -import org.jbpm.api.model.SequenceFlow; -import org.jbpm.api.model.builder.ObjectNameFactory; +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.Process; +import org.jboss.bpm.api.model.ProcessDefinition; +import org.jboss.bpm.api.model.SequenceFlow; +import org.jboss.bpm.api.model.builder.ObjectNameFactory; import org.jbpm.graph.def.Transition; /** Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/ProcessDefinitionImpl.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/ProcessDefinitionImpl.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/ProcessDefinitionImpl.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -29,14 +29,14 @@ import javax.management.ObjectName; -import org.jbpm.api.Constants; -import org.jbpm.api.InvalidProcessException; -import org.jbpm.api.NotImplementedException; -import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.model.Node; -import org.jbpm.api.model.Process; -import org.jbpm.api.model.ProcessDefinition; -import org.jbpm.api.model.builder.ObjectNameFactory; +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.Node; +import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.ProcessDefinition; +import org.jboss.bpm.api.model.builder.ObjectNameFactory; import org.jbpm.graph.def.Transition; import org.jbpm.graph.node.EndState; import org.jbpm.graph.node.StartState; Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/ProcessImpl.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/ProcessImpl.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/ProcessImpl.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -28,17 +28,17 @@ import javax.management.ObjectName; -import org.jbpm.api.Constants; -import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.client.Token; -import org.jbpm.api.client.Token.TokenStatus; -import org.jbpm.api.model.Node; -import org.jbpm.api.model.Process; -import org.jbpm.api.model.ProcessDefinition; -import org.jbpm.api.model.builder.ObjectNameFactory; -import org.jbpm.api.runtime.Attachments; -import org.jbpm.api.runtime.Attachments.Key; -import org.jbpm.api.service.ProcessService; +import org.jboss.bpm.api.Constants; +import org.jboss.bpm.api.client.ProcessEngine; +import org.jboss.bpm.api.client.Token; +import org.jboss.bpm.api.client.Token.TokenStatus; +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.builder.ObjectNameFactory; +import org.jboss.bpm.api.runtime.Attachments; +import org.jboss.bpm.api.runtime.Attachments.Key; +import org.jboss.bpm.api.service.ProcessService; import org.jbpm.graph.exe.ProcessInstance; import org.jbpm.integration.client.TokenImpl; Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/SequenceFlowImpl.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/SequenceFlowImpl.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/SequenceFlowImpl.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -21,9 +21,9 @@ */ package org.jbpm.integration.model; -import org.jbpm.api.model.Expression; -import org.jbpm.api.model.SequenceFlow; -import org.jbpm.api.model.Expression.ExpressionLanguage; +import org.jboss.bpm.api.model.Expression; +import org.jboss.bpm.api.model.SequenceFlow; +import org.jboss.bpm.api.model.Expression.ExpressionLanguage; import org.jbpm.graph.def.Node; import org.jbpm.graph.def.Transition; Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/StartEventImpl.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/StartEventImpl.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/StartEventImpl.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -23,11 +23,11 @@ import java.util.List; -import org.jbpm.api.InvalidProcessException; -import org.jbpm.api.NotImplementedException; -import org.jbpm.api.model.ProcessDefinition; -import org.jbpm.api.model.SequenceFlow; -import org.jbpm.api.model.StartEvent; +import org.jboss.bpm.api.InvalidProcessException; +import org.jboss.bpm.api.NotImplementedException; +import org.jboss.bpm.api.model.ProcessDefinition; +import org.jboss.bpm.api.model.SequenceFlow; +import org.jboss.bpm.api.model.StartEvent; import org.jbpm.graph.def.Transition; import org.jbpm.graph.node.StartState; Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/TaskImpl.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/TaskImpl.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/TaskImpl.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -24,10 +24,10 @@ import java.util.List; import java.util.Set; -import org.jbpm.api.NotImplementedException; -import org.jbpm.api.model.ProcessDefinition; -import org.jbpm.api.model.SequenceFlow; -import org.jbpm.api.model.Task; +import org.jboss.bpm.api.NotImplementedException; +import org.jboss.bpm.api.model.ProcessDefinition; +import org.jboss.bpm.api.model.SequenceFlow; +import org.jboss.bpm.api.model.Task; import org.jbpm.graph.def.Node; import org.jbpm.graph.def.Transition; Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/WaitStateImpl.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/WaitStateImpl.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/WaitStateImpl.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -21,8 +21,8 @@ */ package org.jbpm.integration.model; -import org.jbpm.api.model.ProcessDefinition; -import org.jbpm.api.model.WaitState; +import org.jboss.bpm.api.model.ProcessDefinition; +import org.jboss.bpm.api.model.WaitState; import org.jbpm.graph.node.State; /** Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/builder/GatewayBuilderImpl.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/builder/GatewayBuilderImpl.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/builder/GatewayBuilderImpl.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -23,9 +23,9 @@ //$Id$ -import org.jbpm.api.NotImplementedException; -import org.jbpm.api.model.Expression.ExpressionLanguage; -import org.jbpm.api.model.builder.GatewayBuilder; +import org.jboss.bpm.api.NotImplementedException; +import org.jboss.bpm.api.model.Expression.ExpressionLanguage; +import org.jboss.bpm.api.model.builder.GatewayBuilder; /** * The GatewayBuilder can be used to build a Gateway dynamically. Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/builder/ProcessBuilderImpl.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/builder/ProcessBuilderImpl.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/builder/ProcessBuilderImpl.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -27,19 +27,19 @@ import java.util.List; import java.util.Set; -import org.jbpm.api.InvalidProcessException; -import org.jbpm.api.NotImplementedException; -import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.model.EndEvent; -import org.jbpm.api.model.Node; -import org.jbpm.api.model.Process; -import org.jbpm.api.model.ProcessDefinition; -import org.jbpm.api.model.StartEvent; -import org.jbpm.api.model.Expression.ExpressionLanguage; -import org.jbpm.api.model.Gateway.GatewayType; -import org.jbpm.api.model.Task.TaskType; -import org.jbpm.api.model.builder.GatewayBuilder; -import org.jbpm.api.model.builder.ProcessBuilder; +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.EndEvent; +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.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.model.builder.ProcessBuilder; import org.jbpm.graph.def.Transition; import org.jbpm.graph.node.Decision; import org.jbpm.graph.node.EndState; Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/runtime/ExpressionEvaluator.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/runtime/ExpressionEvaluator.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/runtime/ExpressionEvaluator.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -26,11 +26,11 @@ import java.util.HashMap; import java.util.Map; -import org.jbpm.api.client.Token; -import org.jbpm.api.model.Expression; -import org.jbpm.api.model.Expression.ExpressionLanguage; -import org.jbpm.api.runtime.Attachments; -import org.jbpm.api.runtime.Attachments.Key; +import org.jboss.bpm.api.client.Token; +import org.jboss.bpm.api.model.Expression; +import org.jboss.bpm.api.model.Expression.ExpressionLanguage; +import org.jboss.bpm.api.runtime.Attachments; +import org.jboss.bpm.api.runtime.Attachments.Key; import org.mvel.MVEL; /** Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/runtime/NodeExecuteInterceptor.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/runtime/NodeExecuteInterceptor.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/runtime/NodeExecuteInterceptor.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -23,7 +23,7 @@ //$Id$ -import org.jbpm.api.client.Token; +import org.jboss.bpm.api.client.Token; /** * An interceptor that invokes the Node.execute Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/runtime/RuntimeContext.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/runtime/RuntimeContext.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/runtime/RuntimeContext.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -26,7 +26,7 @@ import java.util.ArrayList; import java.util.List; -import org.jbpm.api.client.Token; +import org.jboss.bpm.api.client.Token; /** * A runtime context that passes through a chain of interceptors. Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/runtime/TokenAttachmentDelegate.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/runtime/TokenAttachmentDelegate.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/runtime/TokenAttachmentDelegate.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -27,7 +27,7 @@ import java.util.HashSet; import java.util.Set; -import org.jbpm.api.runtime.Attachments; +import org.jboss.bpm.api.runtime.Attachments; import org.jbpm.context.exe.ContextInstance; import org.jbpm.integration.client.TokenImpl; Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/DialectHandlerServiceImpl.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/DialectHandlerServiceImpl.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/DialectHandlerServiceImpl.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -26,9 +26,9 @@ import java.net.URI; import java.util.Map; -import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.service.DialectHandler; -import org.jbpm.api.service.DialectHandlerService; +import org.jboss.bpm.api.client.ProcessEngine; +import org.jboss.bpm.api.service.DialectHandler; +import org.jboss.bpm.api.service.DialectHandlerService; /** * A registry that maps namespaceURI to a {@link DialectHandler} Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/MutableService.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/MutableService.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/MutableService.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -23,8 +23,8 @@ // $Id$ -import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.service.Service; +import org.jboss.bpm.api.client.ProcessEngine; +import org.jboss.bpm.api.service.Service; /** * A mutable service Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/NoopPersistenceServiceImpl.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/NoopPersistenceServiceImpl.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/NoopPersistenceServiceImpl.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -29,12 +29,12 @@ import javax.management.ObjectName; import org.hibernate.Session; -import org.jbpm.api.ProcessNotFoundException; -import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.model.Node; -import org.jbpm.api.model.Process; -import org.jbpm.api.model.ProcessDefinition; -import org.jbpm.api.service.PersistenceService; +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.ProcessDefinition; +import org.jboss.bpm.api.service.PersistenceService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/ProcessBuilderServiceImpl.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/ProcessBuilderServiceImpl.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/ProcessBuilderServiceImpl.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -23,10 +23,10 @@ // $Id$ -import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.model.Process; -import org.jbpm.api.service.ProcessBuilderService; -import org.jbpm.api.model.builder.ProcessBuilder; +import org.jboss.bpm.api.client.ProcessEngine; +import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.builder.ProcessBuilder; +import org.jboss.bpm.api.service.ProcessBuilderService; import org.jbpm.integration.model.builder.ProcessBuilderImpl; /** * The ProcessBuilder can be used to build a {@link Process} dynamically. Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/ProcessDefinitionServiceImpl.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/ProcessDefinitionServiceImpl.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/ProcessDefinitionServiceImpl.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -30,12 +30,12 @@ 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.ProcessService; import org.jbpm.JbpmConfiguration; import org.jbpm.JbpmContext; -import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.model.ProcessDefinition; -import org.jbpm.api.service.ProcessDefinitionService; -import org.jbpm.api.service.ProcessService; import org.jbpm.integration.model.ProcessDefinitionImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/ProcessServiceImpl.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/ProcessServiceImpl.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/ProcessServiceImpl.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -33,12 +33,12 @@ import javax.management.ObjectName; -import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.model.Process; -import org.jbpm.api.model.ProcessDefinition; -import org.jbpm.api.model.Process.ProcessStatus; -import org.jbpm.api.service.ProcessDefinitionService; -import org.jbpm.api.service.ProcessService; +import org.jboss.bpm.api.client.ProcessEngine; +import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.ProcessDefinition; +import org.jboss.bpm.api.model.Process.ProcessStatus; +import org.jboss.bpm.api.service.ProcessDefinitionService; +import org.jboss.bpm.api.service.ProcessService; import org.jbpm.integration.model.ProcessImpl; import org.jbpm.integration.runtime.NodeInterceptor; import org.slf4j.Logger; Modified: jbpm3/trunk/modules/integration/api/src/main/resources/jbpm-cfg-beans.xml =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/resources/jbpm-cfg-beans.xml 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/resources/jbpm-cfg-beans.xml 2008-11-27 10:25:31 UTC (rev 3113) @@ -1,31 +1,31 @@ <!-- Note, this uses the bean-deployer-2.0 schema - $Id$ + $Id: $ --> <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd" xmlns="urn:jboss:bean-deployer:2.0"> <!-- Locate the single instance of the kernel --> - <bean name="jBPMKernelLocator" class="org.jbpm.api.client.internal.KernelLocator"> + <bean name="BPMKernelLocator" class="org.jboss.bpm.api.client.internal.KernelLocator"> <property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property> </bean> <!-- The ProcessEngine --> - <bean name="jBPMProcessEngine" class="org.jbpm.integration.client.ProcessEngineImpl"> + <bean name="BPMProcessEngine" class="org.jbpm.integration.client.ProcessEngineImpl"> <property name="services"> - <set elementClass="org.jbpm.api.service.Service"> - <inject bean="jBPMDialectHandlerService"/> - <inject bean="jBPMProcessBuilderService"/> - <inject bean="jBPMProcessDefinitionService"/> - <inject bean="jBPMProcessService"/> + <set elementClass="org.jboss.bpm.api.service.Service"> + <inject bean="BPMDialectHandlerService"/> + <inject bean="BPMProcessBuilderService"/> + <inject bean="BPMProcessDefinitionService"/> + <inject bean="BPMProcessService"/> </set> </property> </bean> <!-- The PersistenceService --> - <bean name="jBPMPersistenceService" class="org.jbpm.integration.service.NoopPersistenceServiceImpl" /> + <bean name="BPMPersistenceService" class="org.jbpm.integration.service.NoopPersistenceServiceImpl" /> <!-- The ProcessService --> - <bean name="jBPMProcessService" class="org.jbpm.integration.service.ProcessServiceImpl"> + <bean name="BPMProcessService" class="org.jbpm.integration.service.ProcessServiceImpl"> <property name="interceptors"> <list elementClass="java.lang.String"> <value>org.jbpm.integration.runtime.NodeExecuteInterceptor</value> @@ -34,19 +34,19 @@ </bean> <!-- The DialectHandlerService --> - <bean name="jBPMDialectHandlerService" class="org.jbpm.integration.service.DialectHandlerServiceImpl"> + <bean name="BPMDialectHandlerService" class="org.jbpm.integration.service.DialectHandlerServiceImpl"> <property name="dialectHandlers"> - <map keyClass="java.net.URI" valueClass="org.jbpm.api.service.DialectHandler"> - <entry><key>urn:jbpm.jboss:api-0.1</key><value><inject bean="jBPMDialectHandlerAPI10"/></value></entry> - <entry><key>urn:jbpm.org:jpdl-3.2</key><value><inject bean="jBPMDialectHandlerJPDL32"/></value></entry> + <map keyClass="java.net.URI" valueClass="org.jboss.bpm.api.service.DialectHandler"> + <entry><key>urn:jbpm.jboss:api-0.1</key><value><inject bean="BPMDialectHandlerAPI10"/></value></entry> + <entry><key>urn:jbpm.org:jpdl-3.2</key><value><inject bean="BPMDialectHandlerJPDL32"/></value></entry> </map> </property> </bean> - <bean name="jBPMDialectHandlerAPI10" class="org.jbpm.dialect.api10.DialectHandlerImpl" /> - <bean name="jBPMDialectHandlerJPDL32" class="org.jbpm.integration.jpdl32.DialectHandlerImpl" /> + <bean name="BPMDialectHandlerAPI10" class="org.jboss.bpm.dialect.api10.DialectHandlerImpl" /> + <bean name="BPMDialectHandlerJPDL32" class="org.jbpm.integration.jpdl32.DialectHandlerImpl" /> <!-- Other Services --> - <bean name="jBPMProcessBuilderService" class="org.jbpm.integration.service.ProcessBuilderServiceImpl" /> - <bean name="jBPMProcessDefinitionService" class="org.jbpm.integration.service.ProcessDefinitionServiceImpl" /> + <bean name="BPMProcessBuilderService" class="org.jbpm.integration.service.ProcessBuilderServiceImpl" /> + <bean name="BPMProcessDefinitionService" class="org.jbpm.integration.service.ProcessDefinitionServiceImpl" /> </deployment> Copied: jbpm3/trunk/modules/integration/api/src/main/resources/org.jboss.bpm.api.client.ConfigurationProvider (from rev 3106, jbpm3/trunk/modules/integration/api/src/main/resources/org.jbpm.api.client.ConfigurationProvider) =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/resources/org.jboss.bpm.api.client.ConfigurationProvider (rev 0) +++ jbpm3/trunk/modules/integration/api/src/main/resources/org.jboss.bpm.api.client.ConfigurationProvider 2008-11-27 10:25:31 UTC (rev 3113) @@ -0,0 +1 @@ +org.jboss.bpm.api.client.internal.MicrocontainerConfigurationProvider \ No newline at end of file Deleted: jbpm3/trunk/modules/integration/api/src/main/resources/org.jbpm.api.client.ConfigurationProvider =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/resources/org.jbpm.api.client.ConfigurationProvider 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/resources/org.jbpm.api.client.ConfigurationProvider 2008-11-27 10:25:31 UTC (rev 3113) @@ -1 +0,0 @@ -org.jbpm.api.client.internal.MicrocontainerConfigurationProvider \ No newline at end of file Modified: jbpm3/trunk/modules/integration/api/src/test/java/org/jbpm/test/integration/jpdl/DialectHandlerTest.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/test/java/org/jbpm/test/integration/jpdl/DialectHandlerTest.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/test/java/org/jbpm/test/integration/jpdl/DialectHandlerTest.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -25,14 +25,14 @@ import java.net.URL; -import org.jbpm.api.client.Configuration; -import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.client.Token; -import org.jbpm.api.model.Process; -import org.jbpm.api.model.ProcessDefinition; -import org.jbpm.api.model.Process.ProcessStatus; -import org.jbpm.api.service.ProcessDefinitionService; -import org.jbpm.api.test.CTSTestCase; +import org.jboss.bpm.api.client.Configuration; +import org.jboss.bpm.api.client.ProcessEngine; +import org.jboss.bpm.api.client.Token; +import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.ProcessDefinition; +import org.jboss.bpm.api.model.Process.ProcessStatus; +import org.jboss.bpm.api.service.ProcessDefinitionService; +import org.jboss.bpm.api.test.CTSTestCase; /** * Test simple jPDL process deployment Modified: jbpm3/trunk/modules/integration/jboss42/pom.xml =================================================================== --- jbpm3/trunk/modules/integration/jboss42/pom.xml 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/jboss42/pom.xml 2008-11-27 10:25:31 UTC (rev 3113) @@ -36,15 +36,15 @@ <!-- Dependencies --> <dependencies> - <!-- jBPM Dependencies --> + <!-- BPM Dependencies --> <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-jpdl</artifactId> <version>${version}</version> </dependency> <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-spec-api</artifactId> + <groupId>org.jboss.bpm</groupId> + <artifactId>bpm-spec-api</artifactId> </dependency> <dependency> Modified: jbpm3/trunk/modules/integration/jboss42/src/main/etc/jboss-beans.xml =================================================================== --- jbpm3/trunk/modules/integration/jboss42/src/main/etc/jboss-beans.xml 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/jboss42/src/main/etc/jboss-beans.xml 2008-11-27 10:25:31 UTC (rev 3113) @@ -5,27 +5,27 @@ <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer"> <!-- Locate the single instance of the kernel --> - <bean name="jBPMKernelLocator" class="org.jbpm.api.client.internal.KernelLocator"> + <bean name="BPMKernelLocator" class="org.jboss.bpm.api.client.internal.KernelLocator"> <property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property> </bean> <!-- The ProcessEngine --> - <bean name="jBPMProcessEngine" class="org.jbpm.integration.client.ProcessEngineImpl"> + <bean name="BPMProcessEngine" class="org.jbpm.integration.client.ProcessEngineImpl"> <property name="services"> - <set elementClass="org.jbpm.api.service.Service"> - <inject bean="jBPMDialectHandlerService"/> - <inject bean="jBPMProcessBuilderService"/> - <inject bean="jBPMProcessDefinitionService"/> - <inject bean="jBPMProcessService"/> + <set elementClass="org.jboss.bpm.api.service.Service"> + <inject bean="BPMDialectHandlerService"/> + <inject bean="BPMProcessBuilderService"/> + <inject bean="BPMProcessDefinitionService"/> + <inject bean="BPMProcessService"/> </set> </property> </bean> <!-- The PersistenceService --> - <bean name="jBPMPersistenceService" class="org.jbpm.integration.service.NoopPersistenceServiceImpl" /> + <bean name="BPMPersistenceService" class="org.jbpm.integration.service.NoopPersistenceServiceImpl" /> <!-- The ProcessService --> - <bean name="jBPMProcessService" class="org.jbpm.integration.service.ProcessServiceImpl"> + <bean name="BPMProcessService" class="org.jbpm.integration.service.ProcessServiceImpl"> <property name="interceptors"> <list elementClass="java.lang.String"> <value>org.jbpm.integration.runtime.NodeExecuteInterceptor</value> @@ -34,19 +34,19 @@ </bean> <!-- The DialectHandlerService --> - <bean name="jBPMDialectHandlerService" class="org.jbpm.integration.service.DialectHandlerServiceImpl"> + <bean name="BPMDialectHandlerService" class="org.jbpm.integration.service.DialectHandlerServiceImpl"> <property name="dialectHandlers"> - <map keyClass="java.net.URI" valueClass="org.jbpm.api.service.DialectHandler"> - <entry><key>urn:jbpm.jboss:api-0.1</key><value><inject bean="jBPMDialectHandlerAPI10"/></value></entry> - <entry><key>urn:jbpm.org:jpdl-3.2</key><value><inject bean="jBPMDialectHandlerJPDL32"/></value></entry> + <map keyClass="java.net.URI" valueClass="org.jboss.bpm.api.service.DialectHandler"> + <entry><key>urn:jbpm.jboss:api-0.1</key><value><inject bean="BPMDialectHandlerAPI10"/></value></entry> + <entry><key>urn:jbpm.org:jpdl-3.2</key><value><inject bean="BPMDialectHandlerJPDL32"/></value></entry> </map> </property> </bean> - <bean name="jBPMDialectHandlerAPI10" class="org.jbpm.dialect.api10.DialectHandlerImpl" /> - <bean name="jBPMDialectHandlerJPDL32" class="org.jbpm.integration.jpdl32.DialectHandlerImpl" /> + <bean name="BPMDialectHandlerAPI10" class="org.jboss.bpm.dialect.api10.DialectHandlerImpl" /> + <bean name="BPMDialectHandlerJPDL32" class="org.jbpm.integration.jpdl32.DialectHandlerImpl" /> <!-- Other Services --> - <bean name="jBPMProcessBuilderService" class="org.jbpm.integration.service.ProcessBuilderServiceImpl" /> - <bean name="jBPMProcessDefinitionService" class="org.jbpm.integration.service.ProcessDefinitionServiceImpl" /> + <bean name="BPMProcessBuilderService" class="org.jbpm.integration.service.ProcessBuilderServiceImpl" /> + <bean name="BPMProcessDefinitionService" class="org.jbpm.integration.service.ProcessDefinitionServiceImpl" /> </deployment> Modified: jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/PARSubDeployer.java =================================================================== --- jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/PARSubDeployer.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/PARSubDeployer.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -30,10 +30,10 @@ import org.jboss.deployment.DeploymentException; import org.jboss.deployment.DeploymentInfo; import org.jboss.deployment.SubDeployerSupport; -import org.jbpm.api.client.Configuration; -import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.model.ProcessDefinition; -import org.jbpm.api.service.ProcessDefinitionService; +import org.jboss.bpm.api.client.Configuration; +import org.jboss.bpm.api.client.ProcessEngine; +import org.jboss.bpm.api.model.ProcessDefinition; +import org.jboss.bpm.api.service.ProcessDefinitionService; /** * A deployer service that manages jBPM Process Archive Deployments Modified: jbpm3/trunk/modules/integration/jboss42/src/test/java/org/jbpm/test/integration/deployment/SimpleDeploymentTest.java =================================================================== --- jbpm3/trunk/modules/integration/jboss42/src/test/java/org/jbpm/test/integration/deployment/SimpleDeploymentTest.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/jboss42/src/test/java/org/jbpm/test/integration/deployment/SimpleDeploymentTest.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -23,7 +23,7 @@ // $Id$ -import org.jbpm.api.test.IntegrationTestCase; +import org.jboss.bpm.api.test.IntegrationTestCase; /** * Test simple jPDL process deployment Modified: jbpm3/trunk/pom.xml =================================================================== --- jbpm3/trunk/pom.xml 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/pom.xml 2008-11-27 10:25:31 UTC (rev 3113) @@ -65,10 +65,10 @@ <javax.persistence.version>1.0</javax.persistence.version> <javax.jaxb.version>2.1</javax.jaxb.version> <jaxen.version>1.1.1</jaxen.version> - <jbpm.api.version>1.0.0-SNAPSHOT</jbpm.api.version> <jbpm.designer.version>3.1.5</jbpm.designer.version> <jbpm.gwt-console.version>1.0.0-SNAPSHOT</jbpm.gwt-console.version> <jbpm.jsf-console.version>3.3.0.GA</jbpm.jsf-console.version> + <jboss.bpm.spec.version>1.0.0-SNAPSHOT</jboss.bpm.spec.version> <jboss.client.version>4.2.2.GA</jboss.client.version> <jboss.gravel.version>1.0.0.GA</jboss.gravel.version> <jboss.seam.version>2.0.2.GA</jboss.seam.version> @@ -91,22 +91,6 @@ <dependencies> <!-- jBPM Dependencies --> <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-spec-api</artifactId> - <version>${jbpm.api.version}</version> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-spec-dialect-api10</artifactId> - <version>${jbpm.api.version}</version> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-spec-cts</artifactId> - <version>${jbpm.api.version}</version> - <type>zip</type> - </dependency> - <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jsf-console</artifactId> <version>${jbpm.jsf-console.version}</version> @@ -131,6 +115,24 @@ <type>zip</type> </dependency> + <!-- BPM Spec Dependencies--> + <dependency> + <groupId>org.jboss.bpm</groupId> + <artifactId>bpm-spec-api</artifactId> + <version>${jboss.bpm.spec.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.bpm</groupId> + <artifactId>bpm-spec-dialect-api10</artifactId> + <version>${jboss.bpm.spec.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.bpm</groupId> + <artifactId>bpm-spec-cts</artifactId> + <version>${jboss.bpm.spec.version}</version> + <type>zip</type> + </dependency> + <!-- Thirdparty Dependencies --> <dependency> <groupId>bsh</groupId>