Author: gertv
Date: Wed Nov 7 12:52:41 2012
New Revision: 1406596
URL: http://svn.apache.org/viewvc?rev=1406596&view=rev
Log:
SMX4-1274: Upgrade to Activiti 5.10
Modified:
servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
servicemix/smx4/features/trunk/examples/activiti/activiti-camel/src/main/resources/OSGI-INF/activiti/OrderProcess.bpmn20.xml
servicemix/smx4/features/trunk/examples/activiti/activiti-camel/src/main/resources/OSGI-INF/blueprint/activiti-camel.xml
servicemix/smx4/features/trunk/parent/pom.xml
servicemix/smx4/features/trunk/pom.xml
Modified:
servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml?rev=1406596&r1=1406595&r2=1406596&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
(original)
+++
servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
Wed Nov 7 12:52:41 2012
@@ -331,7 +331,7 @@
<feature version="${aries.transaction.version}">transaction</feature>
<feature version="${camel.version}">camel</feature>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j.bundle.version}</bundle>
- <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mybatis/${mybatis.bundle.version}</bundle>
+ <bundle
dependency="true">mvn:org.mybatis/mybatis/${mybatis.version}/</bundle>
<bundle
dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix.specs.version}</bundle>
<bundle
dependency="true">mvn:commons-lang/commons-lang/${commons-lang.version}</bundle>
<bundle dependency="true">mvn:com.h2database/h2/${h2.version}</bundle>
Modified:
servicemix/smx4/features/trunk/examples/activiti/activiti-camel/src/main/resources/OSGI-INF/activiti/OrderProcess.bpmn20.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/activiti/activiti-camel/src/main/resources/OSGI-INF/activiti/OrderProcess.bpmn20.xml?rev=1406596&r1=1406595&r2=1406596&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/examples/activiti/activiti-camel/src/main/resources/OSGI-INF/activiti/OrderProcess.bpmn20.xml
(original)
+++
servicemix/smx4/features/trunk/examples/activiti/activiti-camel/src/main/resources/OSGI-INF/activiti/OrderProcess.bpmn20.xml
Wed Nov 7 12:52:41 2012
@@ -19,7 +19,7 @@
typeLanguage="http://www.w3.org/2001/XMLSchema";
expressionLanguage="http://www.w3.org/1999/XPath";
targetNamespace="http://www.activiti.org/test";>
- <process id="OrderProcess">
+ <process id="OrderProcess" isExecutable="true">
<startEvent id="start"/>
Modified:
servicemix/smx4/features/trunk/examples/activiti/activiti-camel/src/main/resources/OSGI-INF/blueprint/activiti-camel.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/activiti/activiti-camel/src/main/resources/OSGI-INF/blueprint/activiti-camel.xml?rev=1406596&r1=1406595&r2=1406596&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/examples/activiti/activiti-camel/src/main/resources/OSGI-INF/blueprint/activiti-camel.xml
(original)
+++
servicemix/smx4/features/trunk/examples/activiti/activiti-camel/src/main/resources/OSGI-INF/blueprint/activiti-camel.xml
Wed Nov 7 12:52:41 2012
@@ -34,16 +34,6 @@
<reference id="runtimeService"
interface="org.activiti.engine.RuntimeService" />
<!--
- In Activiti 5.9, the ActivitiComponent does not have a default
constructor, so you
- have to explicitly instantiate it here
-
- This will not be necessary any more in later versions of Activiti
- -->
- <bean id="activiti" class="org.activiti.camel.ActivitiComponent">
- <argument ref="camelContext" />
- </bean>
-
- <!--
Register a context provider to link the Camel context to the
OrderProcess definition.
Doing this will allow your BPMN process to communicate with the Camel
routes using the
${camel} expression
Modified: servicemix/smx4/features/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/parent/pom.xml?rev=1406596&r1=1406595&r2=1406596&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/parent/pom.xml (original)
+++ servicemix/smx4/features/trunk/parent/pom.xml Wed Nov 7 12:52:41 2012
@@ -38,7 +38,7 @@
<!-- Properties -->
<properties>
<activemq.version>5.7.0</activemq.version>
- <activiti.version>5.9</activiti.version>
+ <activiti.version>5.10</activiti.version>
<camel.version>2.10.2</camel.version>
<cxf.version>2.6.3</cxf.version>
Modified: servicemix/smx4/features/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=1406596&r1=1406595&r2=1406596&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Wed Nov 7 12:52:41 2012
@@ -169,7 +169,6 @@
<josql.bundle.version>1.5_4</josql.bundle.version>
<jsmpp.bundle.version>2.1.0_2</jsmpp.bundle.version>
<mvel.bundle.version>2.0.8_4</mvel.bundle.version>
- <mybatis.bundle.version>3.0.2_1</mybatis.bundle.version>
<opensaml.bundle.version>2.4.1_1</opensaml.bundle.version>
<jodatime.bundle.version>1.5.2_2</jodatime.bundle.version>
<oscore.bundle.version>2.2.4_4</oscore.bundle.version>
@@ -220,6 +219,7 @@
<jetty.version>7.4.5.v20110725</jetty.version>
<jettison.version>1.3</jettison.version>
<lingo.version>1.3</lingo.version>
+ <mybatis.version>3.1.1</mybatis.version>
<scriptengines.version>1.1</scriptengines.version>
<spring.version>3.0.7.RELEASE</spring.version>
<spring.osgi.version>1.2.1</spring.osgi.version>
