Permalink
Browse files

cleaned up to reflect the latest spring-integration-activiti support.

  • Loading branch information...
1 parent 3754651 commit d98360fb064fb2cbe031c36291f8ac1f8cfec9db Josh Long committed Nov 26, 2010
View
248 pom.xml
@@ -1,124 +1,146 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
- <groupId>com.joshlong.activiti</groupId>
- <artifactId>components</artifactId>
- <packaging>jar</packaging>
- <name>Spring Integration Activiti Support Sandbox</name>
- <properties>
- <spring.version>3.0.4.RELEASE</spring.version>
- <si.version>2.0.0.BUILD-SNAPSHOT</si.version>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.springframework.integration</groupId>
- <artifactId>spring-integration-activiti</artifactId>
- <version>2.0.0.BUILD-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>1.2.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.3.0</version>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- <version>2.2</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.5</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-orm</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.integration</groupId>
- <artifactId>spring-integration-event</artifactId>
- <version>${si.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.integration</groupId>
- <artifactId>spring-integration-jms</artifactId>
- <version>${si.version}</version>
- </dependency>
+ <groupId>com.joshlong.activiti</groupId>
+ <artifactId>components</artifactId>
+ <packaging>jar</packaging>
+ <name>Spring Integration Activiti Support Sandbox</name>
+ <properties>
+ <spring.version>3.0.4.RELEASE</spring.version>
+ <si.version>2.0.0.BUILD-SNAPSHOT</si.version>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.integration</groupId>
+ <artifactId>spring-integration-activiti</artifactId>
+ <version>2.0.0.BUILD-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-core</artifactId>
+ <version>5.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
+ <version>2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-orm</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.integration</groupId>
+ <artifactId>spring-integration-event</artifactId>
+ <version>${si.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.integration</groupId>
+ <artifactId>spring-integration-jms</artifactId>
+ <version>${si.version}</version>
+ </dependency>
- <dependency>
- <groupId>org.springframework.integration</groupId>
- <artifactId>spring-integration-core</artifactId>
- <version>${si.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.8.3</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context-support</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <version>1.2.132</version>
- </dependency>
- <dependency>
- <groupId>org.activiti</groupId>
- <artifactId>activiti-engine</artifactId>
- <version>5.0.beta1</version>
- </dependency>
- </dependencies>
- <build>
+ <dependency>
+ <groupId>org.springframework.integration</groupId>
+ <artifactId>spring-integration-core</artifactId>
+ <version>${si.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.8.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context-support</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>1.2.132</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.activiti</groupId>
+ <artifactId>activiti-engine</artifactId>
+ <version>5.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.activiti</groupId>
+ <artifactId>activiti-spring</artifactId>
+ <version>5.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ <build>
- </build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ </plugins>
- <repositories>
- <repository>
- <id>activiti</id>
- <name>Activiti.org site</name>
- <url>http://maven.alfresco.com/nexus/content/repositories/activiti/</url>
- </repository>
- </repositories>
+ </build>
+
+ <repositories>
+ <repository>
+ <id>activiti</id>
+ <name>Activiti.org site</name>
+ <url>http://maven.alfresco.com/nexus/content/repositories/activiti/</url>
+ </repository>
+ </repositories>
</project>
@@ -15,9 +15,11 @@
*/
package com.joshlong.activiti.coordinator;
+import org.activiti.engine.impl.pvm.PvmProcessDefinition;
+import org.activiti.engine.impl.pvm.delegate.ActivityExecution;
import org.activiti.engine.impl.repository.ProcessDefinitionEntity;
-import org.activiti.pvm.activity.ActivityExecution;
-import org.activiti.pvm.process.PvmProcessDefinition;
+//import org.activiti.pvm.activity.ActivityExecution;
+//import org.activiti.pvm.process.PvmProcessDefinition;
import org.springframework.integration.activiti.gateway.AsyncActivityBehaviorMessagingGateway;
import org.springframework.util.StringUtils;
@@ -77,7 +77,7 @@ public void setRegistry(ActivitiStateHandlerRegistry registry) {
}
public Object postProcessAfterInitialization(final Object bean,
- final String beanName) throws BeansException {
+ final String beanName) throws BeansException {
// first sift through and get all the methods
// then get all the annotations
// then build the metadata and register the metadata
@@ -89,8 +89,7 @@ public Object postProcessAfterInitialization(final Object bean,
@SuppressWarnings("unchecked")
public void doWith(Method method) throws IllegalArgumentException, IllegalAccessException {
- ActivitiState activitiState = AnnotationUtils.getAnnotation(
- method, ActivitiState.class);
+ ActivitiState activitiState = AnnotationUtils.getAnnotation( method, ActivitiState.class);
String processName = component.processKey();
@@ -26,7 +26,7 @@
private volatile ClassLoader beanClassLoader = ClassUtils.getDefaultClassLoader();
/**
- * the process engine as created by a {@link org.activiti.engine.impl.cfg.spring.ProcessEngineFactoryBean}
+ * the process engine as created by a {@link org.activiti.spring.ProcessEngineFactoryBean}
*/
private ProcessEngine processEngine;
@@ -26,7 +26,7 @@
public class ProcessStartingMethodInterceptor implements MethodInterceptor {
/**
- * injected reference - can be obtained via a {@link org.activiti.engine.impl.cfg.spring.ProcessEngineFactoryBean}
+ * injected reference - can be obtained via a {@link org.activiti.spring.ProcessEngineFactoryBean}
*/
protected ProcessEngine processEngine ;
@@ -47,6 +47,7 @@ boolean shouldReturnProcessInstanceId( StartProcess startProcess, MethodInvocati
methodInvocation.getMethod().getReturnType().isAssignableFrom(String.class) );
}
+ @SuppressWarnings("unused")
boolean shouldReturnAsyncResultWithProcessInstanceId (StartProcess startProcess, MethodInvocation methodInvocation , Object result) {
return startProcess.returnProcessInstanceFuture() &&
(result instanceof AsyncResult|| methodInvocation.getMethod().getReturnType().isAssignableFrom(AsyncResult.class));
@@ -110,4 +111,4 @@ public Object invoke(MethodInvocation invocation) throws Throwable {
}
return vars;
}
-}
+}
Oops, something went wrong.

0 comments on commit d98360f

Please sign in to comment.