[riftsaw-commits] riftsaw SVN: r418 - in branches/ODE/ODE-2.0-maven: dao-jpa-db and 1 other directory.

Author: jeff.yuchang Date: 2009-12-18 02:39:30 -0500 (Fri, 18 Dec 2009) New Revision: 418 Added: branches/ODE/ODE-2.0-maven/dao-jpa-db/build.xml branches/ODE/ODE-2.0-maven/dao-jpa-db/pom.xml Modified: branches/ODE/ODE-2.0-maven/pom.xml Log: * add pom for dao-jpa-db module. (derby db zip built is not there yet) Added: branches/ODE/ODE-2.0-maven/dao-jpa-db/build.xml =================================================================== --- branches/ODE/ODE-2.0-maven/dao-jpa-db/build.xml (rev 0) +++ branches/ODE/ODE-2.0-maven/dao-jpa-db/build.xml 2009-12-18 07:39:30 UTC (rev 418) @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ============================================================ --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- ============================================================ --> + + +<project> + + <property name="db.scripts.dir" value="${basedir}/target" /> + <property name="descriptor.dir" value="${basedir}/src/main/descriptors"/> + <property name="scripts.dir" value="${basedir}/src/main/scripts"/> + + <path id="classpath"> + <pathelement path="${maven.runtime.classpath}"/> + </path> + + <target name="create-schema"> + + <taskdef name="mappingtool" classname="org.apache.openjpa.jdbc.ant.MappingToolTask" classpathref="classpath"/> + + <mkdir dir="target"/> + <mkdir dir="${db.scripts.dir}" /> + + <!-- Derby --> + <create-ddl db="derby"/> + + <!-- MySQL --> + <create-ddl db="mysql"/> + + <!-- Oracle --> + <create-ddl db="oracle"/> + + <!-- Postgres --> + <create-ddl db="postgres"/> + + </target> + + <!-- + ============================================ + Macro defs, no need to change anything below + ============================================ + --> + + <macrodef name="create-ddl"> + <attribute name="db"/> + + <sequential> + <echo></echo> + <echo>=====================</echo> + <echo>Create DDL @{db}</echo> + <mappingtool schemaAction="build" sqlFile=&quot;${db.scripts.dir}/partial.(a){db}.sql&quot; readSchema="false"> + <config propertiesFile=&quot;${descriptor.dir}/persistence.(a){db}.xml&quot;/&gt; + <classpath> + <path refid="classpath"/> + </classpath> + </mappingtool> + <concat destfile=&quot;${db.scripts.dir}/(a){db}.sql&quot;&gt; + <fileset file="${scripts.dir}/license-header.sql"/> + <fileset file=&quot;${scripts.dir}/simplesched-(a){db}.sql&quot;/&gt; + <fileset file=&quot;${db.scripts.dir}/partial.(a){db}.sql&quot;/&gt; + </concat> + <echo>Done.</echo> + <echo>=====================</echo> + </sequential> + </macrodef> + +</project> Added: branches/ODE/ODE-2.0-maven/dao-jpa-db/pom.xml =================================================================== --- branches/ODE/ODE-2.0-maven/dao-jpa-db/pom.xml (rev 0) +++ branches/ODE/ODE-2.0-maven/dao-jpa-db/pom.xml 2009-12-18 07:39:30 UTC (rev 418) @@ -0,0 +1,169 @@ +<?xml version="1.0"?> +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + --> +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>org.apache.ode</groupId> + <artifactId>ode-dao-jpa-db</artifactId> + <name>ODE :: OpenJPA DDL Generation</name> + <parent> + <groupId>org.apache.ode</groupId> + <artifactId>ode</artifactId> + <version>2.0-SNAPSHOT</version> + </parent> + + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jta_1.1_spec</artifactId> + </dependency> + <dependency> + <groupId>javax.persistence</groupId> + <artifactId>persistence-api</artifactId> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + <dependency> + <groupId>org.apache.ode</groupId> + <artifactId>ode-bpel-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.ode</groupId> + <artifactId>ode-bpel-dao</artifactId> + </dependency> + <dependency> + <groupId>org.apache.ode</groupId> + <artifactId>ode-utils</artifactId> + </dependency> + <dependency> + <groupId>org.apache.ode</groupId> + <artifactId>ode-runtimes</artifactId> + </dependency> + <dependency> + <groupId>org.apache.ode</groupId> + <artifactId>ode-il-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.ode</groupId> + <artifactId>ode-dao-jpa</artifactId> + </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + </dependency> + <dependency> + <groupId>org.apache.openjpa</groupId> + <artifactId>openjpa</artifactId> + </dependency> + <dependency> + <groupId>net.sourceforge.serp</groupId> + <artifactId>serp</artifactId> + </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> + <artifactId>geronimo-ejb_2.1_spec</artifactId> + </dependency> + <dependency> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + </dependency> + <dependency> + <groupId>org.apache.geronimo.modules</groupId> + <artifactId>geronimo-kernel</artifactId> + </dependency> + <dependency> + <groupId>org.apache.geronimo.components</groupId> + <artifactId>geronimo-transaction</artifactId> + </dependency> + <dependency> + <groupId>org.apache.geronimo.components</groupId> + <artifactId>geronimo-connector</artifactId> + </dependency> + <dependency> + <groupId>backport-util-concurrent</groupId> + <artifactId>backport-util-concurrent</artifactId> + </dependency> + <dependency> + <groupId>commons-dbcp</groupId> + <artifactId>commons-dbcp</artifactId> + </dependency> + <dependency> + <groupId>commons-pool</groupId> + <artifactId>commons-pool</artifactId> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>create-db-schemas</id> + <phase>process-resources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="maven.runtime.classpath" refid="maven.compile.classpath"/> + <ant antfile="build.xml" + target="create-schema"> + </ant> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + + +</project> Modified: branches/ODE/ODE-2.0-maven/pom.xml =================================================================== --- branches/ODE/ODE-2.0-maven/pom.xml 2009-12-18 05:15:31 UTC (rev 417) +++ branches/ODE/ODE-2.0-maven/pom.xml 2009-12-18 07:39:30 UTC (rev 418) @@ -58,6 +58,7 @@ <commons.logging.version>1.1.1</commons.logging.version> <commons.pool.version>1.2</commons.pool.version> <commons.primitives.version>1.0</commons.primitives.version> + <commons.dbcp.version>1.2.1</commons.dbcp.version> <httpcomponents.version>4.0-beta1</httpcomponents.version> <jaxb-api.version>2.1</jaxb-api.version> <jaxb.version>2.1.6</jaxb.version> @@ -72,13 +73,11 @@ <hibernate.version>3.3.1.GA</hibernate.version> <spring.version>2.5.6</spring.version> <geronimo.specs.version>1.0</geronimo.specs.version> - <geronimo.version>1.1</geronimo.version> + <geronimo.version>2.0.1</geronimo.version> <geronimo.activation.version>1.0.1</geronimo.activation.version> <geronimo.annotation.version>1.1</geronimo.annotation.version> <geronimo.javamail.version>1.2</geronimo.javamail.version> <geronimo.stax-api.version>1.0.1</geronimo.stax-api.version> - <geronimo.transaction.version>2.0.1</geronimo.transaction.version> - <geronimo.kernel.version>2.0.1</geronimo.kernel.version> <jetty.version>6.1.12rc1</jetty.version> <jencks.version>1.3</jencks.version> <jasper.version>4.2.20RC0</jasper.version> @@ -105,7 +104,7 @@ <modules> - <!--module>utils</module> + <module>utils</module> <module>jacob-ap</module> <module>jacob</module> <module>bpel-schemas</module> @@ -113,6 +112,8 @@ <module>bpel-api</module> <module>bpel-api-jca</module> <module>bpel-dao</module> + <module>dao-jpa</module> + <module>dao-jpa-db</module> <module>jca-ra</module> <module>jca-server</module> <module>scheduler-simple</module> @@ -121,7 +122,7 @@ <module>il-common</module> <module>bpel-ql</module> <module>dao-hibernate</module> - <module>tools</module--> + <module>tools</module> </modules> <build> @@ -383,6 +384,16 @@ </dependency> <dependency> <groupId>org.apache.ode</groupId> + <artifactId>ode-il-common</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.ode</groupId> + <artifactId>ode-dao-jpa</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.ode</groupId> <artifactId>ode-jca-ra</artifactId> <version>${project.version}</version> </dependency> @@ -493,8 +504,12 @@ <artifactId>commons-logging</artifactId> <version>${commons.logging.version}</version> </dependency> - <dependency> + <groupId>commons-dbcp</groupId> + <artifactId>commons-dbcp</artifactId> + <version>${commons.dbcp.version}</version> + </dependency> + <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jta_1.1_spec</artifactId> <version>${geronimo.specs.version}</version> @@ -512,17 +527,17 @@ <dependency> <groupId>org.apache.geronimo.components</groupId> <artifactId>geronimo-connector</artifactId> - <version>${geronimo.transaction.version}</version> + <version>${geronimo.version}</version> </dependency> <dependency> <groupId>org.apache.geronimo.components</groupId> <artifactId>geronimo-transaction</artifactId> - <version>${geronimo.transaction.version}</version> + <version>${geronimo.version}</version> </dependency> <dependency> <groupId>org.apache.geronimo.modules</groupId> <artifactId>geronimo-kernel</artifactId> - <version>${geronimo.kernel.version}</version> + <version>${geronimo.version}</version> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId>