Author: jeff.yuchang Date: 2009-12-23 03:03:17 -0500 (Wed, 23 Dec 2009) New Revision: 433 Modified: branches/ODE/ODE-2.0-maven/bpel-store/pom.xml branches/ODE/ODE-2.0-maven/dao-jpa-db/pom.xml branches/ODE/ODE-2.0-maven/dao-jpa/pom.xml branches/ODE/ODE-2.0-maven/pom.xml Log: * comment out the openjpa-maven plugin in bpel-store for now otherwise it will throw classcastException. Modified: branches/ODE/ODE-2.0-maven/bpel-store/pom.xml =================================================================== --- branches/ODE/ODE-2.0-maven/bpel-store/pom.xml 2009-12-22 11:37:51 UTC (rev 432) +++ branches/ODE/ODE-2.0-maven/bpel-store/pom.xml 2009-12-23 08:03:17 UTC (rev 433) @@ -180,11 +180,10 @@ <build> <plugins> - - <plugin> + <!--FIXME it can't be run along with dao-jpa module --> + <!--plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>openjpa-maven-plugin</artifactId> - <version>1.0</version> <executions> <execution> <id>enhancer</id> @@ -197,18 +196,13 @@ <dependencies> <dependency> - <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa</artifactId> - <version>1.1.0</version> - </dependency> - <dependency> <groupId>wsdl4j</groupId> <artifactId>wsdl4j</artifactId> <version>${wsdl4j.version}</version> </dependency> </dependencies> - </plugin> + </plugin--> <plugin> <groupId>org.codehaus.mojo</groupId> Modified: branches/ODE/ODE-2.0-maven/dao-jpa/pom.xml =================================================================== --- branches/ODE/ODE-2.0-maven/dao-jpa/pom.xml 2009-12-22 11:37:51 UTC (rev 432) +++ branches/ODE/ODE-2.0-maven/dao-jpa/pom.xml 2009-12-23 08:03:17 UTC (rev 433) @@ -72,6 +72,10 @@ <artifactId>xercesImpl</artifactId> </dependency> <dependency> + <groupId>xerces</groupId> + <artifactId>xmlParserAPIs</artifactId> + </dependency> + <dependency> <groupId>org.apache.openjpa</groupId> <artifactId>openjpa</artifactId> </dependency> @@ -88,7 +92,7 @@ <artifactId>openjpa-maven-plugin</artifactId> <executions> <execution> - <id>enhancer</id> + <id>enhancer</id> <phase>process-classes</phase> <goals> <goal>enhance</goal> Modified: branches/ODE/ODE-2.0-maven/dao-jpa-db/pom.xml =================================================================== --- branches/ODE/ODE-2.0-maven/dao-jpa-db/pom.xml 2009-12-22 11:37:51 UTC (rev 432) +++ branches/ODE/ODE-2.0-maven/dao-jpa-db/pom.xml 2009-12-23 08:03:17 UTC (rev 433) @@ -21,7 +21,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.apache.ode</groupId> <artifactId>ode-dao-jpa-db</artifactId> - <name>ODE :: OpenJPA DDL Generation</name> + <name>ODE :: OpenJPA DDL Generation</name> <parent> <groupId>org.apache.ode</groupId> <artifactId>ode</artifactId> @@ -54,7 +54,8 @@ <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> </dependency> - <dependency> + + <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> </dependency> @@ -93,18 +94,14 @@ <dependency> <groupId>net.sourceforge.serp</groupId> <artifactId>serp</artifactId> - </dependency> - <dependency> + </dependency> + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> </dependency> <dependency> <groupId>wsdl4j</groupId> <artifactId>wsdl4j</artifactId> - </dependency> - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> Modified: branches/ODE/ODE-2.0-maven/pom.xml =================================================================== --- branches/ODE/ODE-2.0-maven/pom.xml 2009-12-22 11:37:51 UTC (rev 432) +++ branches/ODE/ODE-2.0-maven/pom.xml 2009-12-23 08:03:17 UTC (rev 433) @@ -90,7 +90,6 @@ <xerces.version>2.8.1</xerces.version> <xmlresolver.version>1.2</xmlresolver.version> <xmlbeans.version>2.3.0</xmlbeans.version> - <derby.version>10.1.2.1</derby.version> <xstream.version>1.2</xstream.version> <junit.version>4.3.1</junit.version> <hsqldb.version>1.8.0.7</hsqldb.version> @@ -100,6 +99,9 @@ <openjpa.version>1.3.0-SNAPSHOT</openjpa.version> <serp.version>1.13.1</serp.version> <dom4j.version>1.6.1</dom4j.version> + <derby.version>10.5.3.0_1</derby.version> + <jmock.version>1.2.0</jmock.version> + <xml.parser.version>2.6.2</xml.parser.version> </properties> @@ -123,8 +125,9 @@ <module>bpel-ql</module> <module>dao-hibernate</module> <module>tools</module> - <!--module>bpel-store</module> - <module>dao-hibernate-db</module--> + <module>bpel-store</module> + <module>dao-hibernate-db</module> + <module>engine</module> </modules> <build> @@ -393,6 +396,11 @@ </dependency> <dependency> <groupId>org.apache.ode</groupId> + <artifactId>ode-scheduler-simple</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.ode</groupId> <artifactId>xalan</artifactId> <version>${xalan.version}</version> </dependency> @@ -593,6 +601,12 @@ <groupId>org.apache.woden</groupId> <artifactId>woden-api</artifactId> <version>${woden.version}</version> + <exclusions> + <exclusion> + <artifactId>xerces</artifactId> + <groupId>xmlParserAPIs</groupId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.woden</groupId> @@ -728,6 +742,11 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>xerces</groupId> + <artifactId>xmlParserAPIs</artifactId> + <version>${xml.parser.version}</version> + </dependency> + <dependency> <groupId>xml-resolver</groupId> <artifactId>xml-resolver</artifactId> <version>${xmlresolver.version}</version> @@ -743,8 +762,12 @@ <artifactId>xstream</artifactId> <version>${xstream.version}</version> </dependency> - <dependency> + <groupId>jmock</groupId> + <artifactId>jmock</artifactId> + <version>${jmock.version}</version> + </dependency> + <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> <version>${derby.version}</version>