[jbpm-commits] JBoss JBPM SVN: r3112 - in projects/spec/trunk: modules/api/src/main/java/org/jboss/bpm/api/client/internal and 3 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu Nov 27 04:39:23 EST 2008
Author: thomas.diesler at jboss.com
Date: 2008-11-27 04:39:23 -0500 (Thu, 27 Nov 2008)
New Revision: 3112
Modified:
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/client/internal/MicrocontainerConfigurationProvider.java
projects/spec/trunk/modules/cts/pom.xml
projects/spec/trunk/modules/ri/pom.xml
projects/spec/trunk/modules/ri/src/main/resources/jbpm-cfg-beans.xml
projects/spec/trunk/pom.xml
Log:
Execute CTS eith RI as default impl
Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/client/internal/MicrocontainerConfigurationProvider.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/client/internal/MicrocontainerConfigurationProvider.java 2008-11-27 09:10:21 UTC (rev 3111)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/client/internal/MicrocontainerConfigurationProvider.java 2008-11-27 09:39:23 UTC (rev 3112)
@@ -40,7 +40,7 @@
public class MicrocontainerConfigurationProvider implements ConfigurationProvider
{
/** The process engine bean name - jBPMEngine */
- public static final String BEAN_NAME = "jBPMProcessEngine";
+ public static final String BEAN_NAME = "BPMProcessEngine";
/** The default bean config: jbpm-cfg-beans.xml */
public static final String JBPM_ENGINE_CONFIG = "jbpm-cfg-beans.xml";
Modified: projects/spec/trunk/modules/cts/pom.xml
===================================================================
--- projects/spec/trunk/modules/cts/pom.xml 2008-11-27 09:10:21 UTC (rev 3111)
+++ projects/spec/trunk/modules/cts/pom.xml 2008-11-27 09:39:23 UTC (rev 3112)
@@ -37,6 +37,26 @@
<artifactId>bpm-spec-api</artifactId>
<version>${version}</version>
</dependency>
+
+ <!-- Test Dependencies -->
+ <dependency>
+ <groupId>org.jboss.bpm</groupId>
+ <artifactId>bpm-spec-dialect-api10</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.bpm</groupId>
+ <artifactId>bpm-spec-dialect-stp</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.bpm</groupId>
+ <artifactId>bpm-spec-ri</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<!-- Plugins -->
@@ -85,7 +105,10 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <skipTests>true</skipTests>
+ <excludes>
+ <exclude>org/jboss/bpm/test/incubator/**/*Test.java</exclude>
+ <exclude>org/jboss/bpm/test/pattern/**/*Test.java</exclude>
+ </excludes>
</configuration>
</plugin>
</plugins>
Modified: projects/spec/trunk/modules/ri/pom.xml
===================================================================
--- projects/spec/trunk/modules/ri/pom.xml 2008-11-27 09:10:21 UTC (rev 3111)
+++ projects/spec/trunk/modules/ri/pom.xml 2008-11-27 09:39:23 UTC (rev 3112)
@@ -69,32 +69,6 @@
<artifactId>bpm-spec-api</artifactId>
<version>${version}</version>
</dependency>
- <dependency>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>bpm-spec-dialect-api10</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>bpm-spec-dialect-jpdl32</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>bpm-spec-dialect-stp</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>bpm-spec-dialect-xpdl21</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>bpm-spec-cts</artifactId>
- <version>${version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.hibernate</groupId>
@@ -112,56 +86,25 @@
<groupId>org.mvel</groupId>
<artifactId>mvel</artifactId>
</dependency>
+
+ <!-- Test Dependencies -->
+ <dependency>
+ <groupId>org.jboss.bpm</groupId>
+ <artifactId>bpm-spec-dialect-api10</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.bpm</groupId>
+ <artifactId>bpm-spec-dialect-stp</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<!-- Plugins -->
<build>
<plugins>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>src/test</directory>
- <includes>
- <include>java/org/jboss/bpm/test/cts/**</include>
- <include>java/org/jboss/bpm/test/incubator/**</include>
- <include>java/org/jboss/bpm/test/pattern/**</include>
- </includes>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>bpm-spec-cts</artifactId>
- <type>zip</type>
- </artifactItem>
- </artifactItems>
- <outputDirectory>src/test</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>org/jboss/bpm/test/incubator/**/*Test.java</exclude>
- <exclude>org/jboss/bpm/test/pattern/**/*Test.java</exclude>
- </excludes>
- </configuration>
- </plugin>
</plugins>
</build>
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-11-27 09:10:21 UTC (rev 3111)
+++ projects/spec/trunk/modules/ri/src/main/resources/jbpm-cfg-beans.xml 2008-11-27 09:39:23 UTC (rev 3112)
@@ -2,30 +2,30 @@
xmlns="urn:jboss:bean-deployer:2.0">
<!-- Locate the single instance of the kernel -->
- <bean name="WSKernelLocator" class="org.jboss.bpm.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.jboss.bpm.ri.client.ProcessEngineImpl">
+ <bean name="BPMProcessEngine" class="org.jboss.bpm.ri.client.ProcessEngineImpl">
<property name="services">
<set elementClass="org.jboss.bpm.api.service.Service">
- <inject bean="jBPMDialectHandlerService" />
- <inject bean="jBPMMessageService" />
- <inject bean="jBPMMessageBuilderService" />
- <inject bean="jBPMPersistenceService" />
- <inject bean="jBPMProcessBuilderService" />
- <inject bean="jBPMProcessDefinitionService" />
- <inject bean="jBPMProcessService" />
- <inject bean="jBPMSignalService" />
- <inject bean="jBPMSignalBuilderService" />
- <inject bean="jBPMThreadingService" />
+ <inject bean="BPMDialectHandlerService" />
+ <inject bean="BPMMessageService" />
+ <inject bean="BPMMessageBuilderService" />
+ <inject bean="BPMPersistenceService" />
+ <inject bean="BPMProcessBuilderService" />
+ <inject bean="BPMProcessDefinitionService" />
+ <inject bean="BPMProcessService" />
+ <inject bean="BPMSignalService" />
+ <inject bean="BPMSignalBuilderService" />
+ <inject bean="BPMThreadingService" />
</set>
</property>
</bean>
<!-- The PersistenceService -->
- <bean name="jBPMPersistenceService" class="org.jboss.bpm.ri.service.HibernatePersistenceServiceImpl">
+ <bean name="BPMPersistenceService" class="org.jboss.bpm.ri.service.HibernatePersistenceServiceImpl">
<property name="annotatedClasses">
<set elementClass="java.lang.String">
<value>org.jboss.bpm.ri.model.AbstractElementImpl</value>
@@ -59,10 +59,10 @@
</set>
</property>
</bean>
- <!--bean name="jBPMPersistenceService" class="org.jboss.bpm.ri.service.InMemoryPersistenceServiceImpl"/-->
+ <!--bean name="BPMPersistenceService" class="org.jboss.bpm.ri.service.InMemoryPersistenceServiceImpl"/-->
<!-- The ProcessService -->
- <bean name="jBPMProcessService" class="org.jboss.bpm.ri.service.ProcessServiceImpl" >
+ <bean name="BPMProcessService" class="org.jboss.bpm.ri.service.ProcessServiceImpl" >
<property name="interceptors">
<list elementClass="java.lang.String">
<value>org.jboss.bpm.ri.runtime.PersistenceSessionInterceptor</value>
@@ -76,28 +76,24 @@
</bean>
<!-- The DialectHandlerService -->
- <bean name="jBPMDialectHandlerService" class="org.jboss.bpm.ri.service.DialectHandlerServiceImpl" >
+ <bean name="BPMDialectHandlerService" class="org.jboss.bpm.ri.service.DialectHandlerServiceImpl" >
<property name="dialectHandlers">
<map keyClass="java.net.URI" valueClass="org.jboss.bpm.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>
- <entry><key>http://stp.eclipse.org/bpmn</key><value><inject bean="jBPMDialectHandlerSTP"/></value></entry>
- <entry><key>http://www.wfmc.org/2008/XPDL2.1</key><value><inject bean="jBPMDialectHandlerXPDL21"/></value></entry>
+ <entry><key>urn:jbpm.jboss:api-0.1</key><value><inject bean="BPMDialectHandlerAPI10"/></value></entry>
+ <entry><key>http://stp.eclipse.org/bpmn</key><value><inject bean="BPMDialectHandlerSTP"/></value></entry>
</map>
</property>
</bean>
- <bean name="jBPMDialectHandlerAPI10" class="org.jboss.bpm.dialect.api10.DialectHandlerImpl"/>
- <bean name="jBPMDialectHandlerJPDL32" class="org.jboss.bpm.dialect.jpdl32.DialectHandlerImpl"/>
- <bean name="jBPMDialectHandlerSTP" class="org.jboss.bpm.dialect.stp.DialectHandlerImpl"/>
- <bean name="jBPMDialectHandlerXPDL21" class="org.jboss.bpm.dialect.xpdl21.DialectHandlerImpl"/>
+ <bean name="BPMDialectHandlerAPI10" class="org.jboss.bpm.dialect.api10.DialectHandlerImpl"/>
+ <bean name="BPMDialectHandlerSTP" class="org.jboss.bpm.dialect.stp.DialectHandlerImpl"/>
<!-- Other Services -->
- <bean name="jBPMMessageService" class="org.jboss.bpm.ri.service.MessageServiceImpl" />
- <bean name="jBPMMessageBuilderService" class="org.jboss.bpm.ri.service.MessageBuilderServiceImpl" />
- <bean name="jBPMProcessBuilderService" class="org.jboss.bpm.ri.service.ProcessBuilderServiceImpl" />
- <bean name="jBPMProcessDefinitionService" class="org.jboss.bpm.ri.service.ProcessDefinitionServiceImpl" />
- <bean name="jBPMSignalBuilderService" class="org.jboss.bpm.ri.service.SignalBuilderServiceImpl" />
- <bean name="jBPMSignalService" class="org.jboss.bpm.ri.service.SignalServiceImpl" />
- <bean name="jBPMThreadingService" class="org.jboss.bpm.ri.service.ThreadingServiceImpl" />
+ <bean name="BPMMessageService" class="org.jboss.bpm.ri.service.MessageServiceImpl" />
+ <bean name="BPMMessageBuilderService" class="org.jboss.bpm.ri.service.MessageBuilderServiceImpl" />
+ <bean name="BPMProcessBuilderService" class="org.jboss.bpm.ri.service.ProcessBuilderServiceImpl" />
+ <bean name="BPMProcessDefinitionService" class="org.jboss.bpm.ri.service.ProcessDefinitionServiceImpl" />
+ <bean name="BPMSignalBuilderService" class="org.jboss.bpm.ri.service.SignalBuilderServiceImpl" />
+ <bean name="BPMSignalService" class="org.jboss.bpm.ri.service.SignalServiceImpl" />
+ <bean name="BPMThreadingService" class="org.jboss.bpm.ri.service.ThreadingServiceImpl" />
</deployment>
Modified: projects/spec/trunk/pom.xml
===================================================================
--- projects/spec/trunk/pom.xml 2008-11-27 09:10:21 UTC (rev 3111)
+++ projects/spec/trunk/pom.xml 2008-11-27 09:39:23 UTC (rev 3112)
@@ -36,8 +36,8 @@
<module>modules/api</module>
<module>modules/dialects</module>
<module>modules/ri</module>
+ <module>modules/cts</module>
<module>modules/samples/airticket</module>
- <module>modules/cts</module>
</modules>
<!-- Properties -->
More information about the jbpm-commits
mailing list