Author: mszefler
Date: Tue Nov 28 18:36:22 2006
New Revision: 480344
URL: http://svn.apache.org/viewvc?view=rev&rev=480344
Log:
* Simplification of process-store DAO mechanism
* Remove in-memory store, replace with in Hibernate for testing.
* Event scheme to support distributed deployment.
* Re-factor of ProcesStore / BpelServer relationship.
* Thread safety.
* Some tests for processStore
* Consolidate all schema generation in bpel-schemas
* Maven fixes
Modified:
incubator/ode/trunk/axis2-war/build.xml
incubator/ode/trunk/axis2-war/pom.xml
Modified: incubator/ode/trunk/axis2-war/build.xml
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/axis2-war/build.xml?view=diff&rev=480344&r1=480343&r2=480344
==============================================================================
--- incubator/ode/trunk/axis2-war/build.xml (original)
+++ incubator/ode/trunk/axis2-war/build.xml Tue Nov 28 18:36:22 2006
@@ -61,7 +61,7 @@
<copy todir="${maven.project.build.directory}/resources/WEB-INF"
file="${maven.project.build.directory}/../../axis2/src/main/wsdl/deploy.wsdl"/>
<copy todir="${maven.project.build.directory}/resources/WEB-INF"
-
file="${maven.project.build.directory}/../../bpel-api/src/main/xsd/pmapi.xsd"/>
+
file="${maven.project.build.directory}/../../bpel-schemas/src/main/xsd/pmapi.xsd"/>
</target>
Modified: incubator/ode/trunk/axis2-war/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/axis2-war/pom.xml?view=diff&rev=480344&r1=480343&r2=480344
==============================================================================
--- incubator/ode/trunk/axis2-war/pom.xml (original)
+++ incubator/ode/trunk/axis2-war/pom.xml Tue Nov 28 18:36:22 2006
@@ -19,87 +19,87 @@
-->
<project>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode-axis2-war</artifactId>
- <name>ODE :: Axis2 WAR</name>
- <packaging>war</packaging>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-axis2-war</artifactId>
+ <name>ODE :: Axis2 WAR</name>
+ <packaging>war</packaging>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode</artifactId>
- <version>2.0-SNAPSHOT</version>
- </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode</artifactId>
<version>2.0-SNAPSHOT</version>
+ </parent>
+ <version>2.0-SNAPSHOT</version>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <executions>
- <execution>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <executions>
+ <execution>
<goals>
<goal>war</goal>
</goals>
- <configuration>
- <addMavenDescriptor>false</addMavenDescriptor>
- <webResources>
- <resource>
-
<directory>${basedir}/target/resources</directory>
- <targetPath>WEB-INF</targetPath>
- </resource>
- </webResources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>3</id>
- <phase>process-resources</phase>
+ <configuration>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ <webResources>
+ <resource>
+ <directory>${basedir}/target/resources</directory>
+ <targetPath>WEB-INF</targetPath>
+ </resource>
+ </webResources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>3</id>
+ <phase>process-resources</phase>
<goals>
<goal>run</goal>
</goals>
- <configuration>
- <tasks>
- <ant antfile="build.xml" target="default"
inheritRefs="true"/>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <configuration>
+ <tasks>
+ <ant antfile="build.xml" target="default" inheritRefs="true"/>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
<version>6.0.1</version>
<configuration></configuration>
</plugin>
- </plugins>
- </build>
-
- <dependencies>
+ </plugins>
+ </build>
+
+ <dependencies>
<!-- Axis2 JARs -->
- <dependency>
- <groupId>axis2</groupId>
- <artifactId>axis2</artifactId>
- <version>${axis2Version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>axis2</groupId>
- <artifactId>axis2</artifactId>
- <version>${axis2Version}</version>
- <type>war</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>axis2</groupId>
- <artifactId>axis2-adb</artifactId>
- <version>${axis2Version}</version>
- <scope>runtime</scope>
- </dependency>
+ <dependency>
+ <groupId>axis2</groupId>
+ <artifactId>axis2</artifactId>
+ <version>${axis2Version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>axis2</groupId>
+ <artifactId>axis2</artifactId>
+ <version>${axis2Version}</version>
+ <type>war</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>axis2</groupId>
+ <artifactId>axis2-adb</artifactId>
+ <version>${axis2Version}</version>
+ <scope>runtime</scope>
+ </dependency>
<!--
<dependency>
<groupId>axis2</groupId>
@@ -109,54 +109,54 @@
<scope>runtime</scope>
</dependency>
-->
- <dependency>
- <groupId>axis2</groupId>
- <artifactId>axis2-codegen</artifactId>
- <version>${axis2Version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>axis2</groupId>
- <artifactId>axis2-common</artifactId>
- <version>${axis2Version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>axis2</groupId>
- <artifactId>axis2-core</artifactId>
- <version>${axis2Version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>axis2</groupId>
- <artifactId>axis2-java2wsdl</artifactId>
- <version>${axis2Version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>axis2</groupId>
- <artifactId>axis2-jibx</artifactId>
- <version>${axis2Version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>axis2</groupId>
- <artifactId>axis2-kernel</artifactId>
- <version>${axis2Version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>axis2</groupId>
- <artifactId>axis2-saaj</artifactId>
- <version>${axis2Version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>axis2</groupId>
- <artifactId>axis2-security</artifactId>
- <version>${axis2Version}</version>
- <scope>runtime</scope>
- </dependency>
+ <dependency>
+ <groupId>axis2</groupId>
+ <artifactId>axis2-codegen</artifactId>
+ <version>${axis2Version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>axis2</groupId>
+ <artifactId>axis2-common</artifactId>
+ <version>${axis2Version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>axis2</groupId>
+ <artifactId>axis2-core</artifactId>
+ <version>${axis2Version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>axis2</groupId>
+ <artifactId>axis2-java2wsdl</artifactId>
+ <version>${axis2Version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>axis2</groupId>
+ <artifactId>axis2-jibx</artifactId>
+ <version>${axis2Version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>axis2</groupId>
+ <artifactId>axis2-kernel</artifactId>
+ <version>${axis2Version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>axis2</groupId>
+ <artifactId>axis2-saaj</artifactId>
+ <version>${axis2Version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>axis2</groupId>
+ <artifactId>axis2-security</artifactId>
+ <version>${axis2Version}</version>
+ <scope>runtime</scope>
+ </dependency>
<!--
<dependency>
<groupId>axis2</groupId>
@@ -166,165 +166,160 @@
<scope>runtime</scope>
</dependency>
-->
- <dependency>
- <groupId>axis2</groupId>
- <artifactId>axis2-xmlbeans</artifactId>
- <version>${axis2Version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>ws-commons</groupId>
- <artifactId>axiom-api</artifactId>
- <version>${axis2Version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>ws-commons</groupId>
- <artifactId>axiom-dom</artifactId>
- <version>${axis2Version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>ws-commons</groupId>
- <artifactId>axiom-impl</artifactId>
- <version>${axis2Version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>ws-commons</groupId>
- <artifactId>neethi</artifactId>
- <version>1.0.1</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons</groupId>
- <artifactId>XmlSchema</artifactId>
- <version>1.0.2</version>
- <scope>runtime</scope>
- </dependency>
+ <dependency>
+ <groupId>axis2</groupId>
+ <artifactId>axis2-xmlbeans</artifactId>
+ <version>${axis2Version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>ws-commons</groupId>
+ <artifactId>axiom-api</artifactId>
+ <version>${axis2Version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>ws-commons</groupId>
+ <artifactId>axiom-dom</artifactId>
+ <version>${axis2Version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>ws-commons</groupId>
+ <artifactId>axiom-impl</artifactId>
+ <version>${axis2Version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>ws-commons</groupId>
+ <artifactId>neethi</artifactId>
+ <version>1.0.1</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons</groupId>
+ <artifactId>XmlSchema</artifactId>
+ <version>1.0.2</version>
+ <scope>runtime</scope>
+ </dependency>
<!-- ODE JARs -->
- <dependency>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode-axis2</artifactId>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-axis2</artifactId>
<!-- Move to master POM -->
- <version>${project.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode-bpel-api</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode-bpel-compiler</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode-bpel-dd</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode-bpel-obj</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode-bpel-ql</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode-bpel-runtime</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode-bpel-scheduler-quartz</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode-bpel-schemas</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode-dao-hibernate</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode-jacob</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode-minerva</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode-utils</artifactId>
- <scope>runtime</scope>
- </dependency>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-bpel-api</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-bpel-compiler</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-bpel-obj</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-bpel-ql</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-bpel-runtime</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-bpel-scheduler-quartz</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-bpel-schemas</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-dao-hibernate</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-jacob</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-minerva</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-utils</artifactId>
+ <scope>runtime</scope>
+ </dependency>
<!-- Other dependencies (brought by Axis2) -->
- <dependency>
- <groupId>annogen</groupId>
- <artifactId>annogen</artifactId>
- <version>0.1.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- <version>2.1</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>1.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-activation</artifactId>
- <version>1.0.2-rc4</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-javamail</artifactId>
- <version>1.3.1-rc5</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-jms</artifactId>
- <version>1.1-rc4</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
+ <dependency>
+ <groupId>annogen</groupId>
+ <artifactId>annogen</artifactId>
+ <version>0.1.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ <version>2.1</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>1.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-activation</artifactId>
+ <version>1.0.2-rc4</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-javamail</artifactId>
+ <version>1.3.1-rc5</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-jms</artifactId>
+ <version>1.1-rc4</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-jta</artifactId>
<version>1.0.1B-rc4</version>
@@ -337,54 +332,54 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-kernel</artifactId>
- <version>${geronimoVersion}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-transaction</artifactId>
- <version>${geronimoVersion}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jencks</groupId>
- <artifactId>jencks</artifactId>
- <version>${jencksVersion}</version>
- <classifier>all</classifier>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>jibx</groupId>
- <artifactId>jibx-run</artifactId>
- <version>1.1-beta3</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>jibx</groupId>
- <artifactId>jibx-run</artifactId>
- <version>1.1-beta3</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <version>2.9.3</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <scope>runtime</scope>
- </dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-kernel</artifactId>
+ <version>${geronimoVersion}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-transaction</artifactId>
+ <version>${geronimoVersion}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jencks</groupId>
+ <artifactId>jencks</artifactId>
+ <version>${jencksVersion}</version>
+ <classifier>all</classifier>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>jibx</groupId>
+ <artifactId>jibx-run</artifactId>
+ <version>1.1-beta3</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>jibx</groupId>
+ <artifactId>jibx-run</artifactId>
+ <version>1.1-beta3</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <version>2.9.3</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <scope>runtime</scope>
+ </dependency>
<!-- ODE Database -->
- <dependency>
- <scope>compile</scope>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode-dao-hibernate-db-derby</artifactId>
- <type>tar</type>
- </dependency>
- </dependencies>
+ <dependency>
+ <scope>compile</scope>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-dao-hibernate-db-derby</artifactId>
+ <type>tar</type>
+ </dependency>
+ </dependencies>
</project>
