Author: jeff.yuchang Date: 2010-01-07 01:44:26 -0500 (Thu, 07 Jan 2010) New Revision: 441 Modified: branches/ODE/ODE-2.0-maven/bpel-store/pom.xml branches/ODE/ODE-2.0-maven/dao-hibernate-db/build.xml branches/ODE/ODE-2.0-maven/dao-hibernate-db/pom.xml branches/ODE/ODE-2.0-maven/dao-jpa-db/build.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/jbi/pom.xml branches/ODE/ODE-2.0-maven/pom.xml Log: * using maven antrun plugin to invoke the openjpa enhance. * add derby db built script. (with sql task, maven output is not running well, so comment it for now.) Modified: branches/ODE/ODE-2.0-maven/bpel-store/pom.xml =================================================================== --- branches/ODE/ODE-2.0-maven/bpel-store/pom.xml 2010-01-06 14:14:58 UTC (rev 440) +++ branches/ODE/ODE-2.0-maven/bpel-store/pom.xml 2010-01-07 06:44:26 UTC (rev 441) @@ -180,30 +180,37 @@ <build> <plugins> - <!--FIXME it can't be run along with dao-jpa module --> - <!--plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>openjpa-maven-plugin</artifactId> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> - <id>enhancer</id> + <id>openjpa-enhancer</id> <phase>process-classes</phase> <goals> - <goal>enhance</goal> + <goal>run</goal> </goals> + <configuration> + <tasks> + <property name="maven.runtime.classpath" refid="maven.test.classpath"/> + <path id="classpath"> + <pathelement path="${maven.runtime.classpath}"/> + </path> + <taskdef name="openjpac" classname="org.apache.openjpa.ant.PCEnhancerTask" classpathref="classpath"/> + <openjpac> + <fileset dir="${basedir}/src/main"> + <include name="**/*.java" /> + </fileset> + <classpath> + <pathelement location="${basedir}/target/classes"/> + <pathelement path="${maven.runtime.classpath}"/> + </classpath> + </openjpac> + </tasks> + </configuration> </execution> </executions> + </plugin> - <dependencies> - <dependency> - <groupId>wsdl4j</groupId> - <artifactId>wsdl4j</artifactId> - <version>${wsdl4j.version}</version> - </dependency> - </dependencies> - - </plugin--> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>xdoclet-maven-plugin</artifactId> Modified: branches/ODE/ODE-2.0-maven/dao-hibernate-db/build.xml =================================================================== --- branches/ODE/ODE-2.0-maven/dao-hibernate-db/build.xml 2010-01-06 14:14:58 UTC (rev 440) +++ branches/ODE/ODE-2.0-maven/dao-hibernate-db/build.xml 2010-01-07 06:44:26 UTC (rev 441) @@ -36,6 +36,9 @@ <mkdir dir="target"/> <mkdir dir="${db.scripts.dir}" /> + <!-- Derby --> + <create-ddl db="derby"/> + <!-- MySQL --> <create-ddl db="mysql"/> @@ -56,6 +59,24 @@ </target> + <target name="create-derby-db"> + <property name="dblocation" value="${basedir}/target/derby/hibdb" /> + <sql + driver="org.apache.derby.jdbc.EmbeddedDriver" + url="jdbc:derby:${dblocation};create=true" + userid="sa" + password="" + autocommit="yes" + > + <transaction src="${basedir}/target/derby.sql"/> + <classpath> + <path refid="classpath"/> + </classpath> + </sql> + <zip destfile="${basedir}/target/ode-dao-hibernate-db-${ode.version}.zip" basedir="${basedir}/target/derby/" /> + + </target> + <!-- ============================================ Macro defs, no need to change anything below @@ -73,7 +94,7 @@ properties=&quot;${sql.dir}/ode.(a){db}.properties&quot; quiet="yes" text="yes" - drop="no" + create="yes" delimiter=";" output=&quot;${db.scripts.dir}/partial.(a){db}.sql&quot;&gt; <fileset dir="${dao-hibernate.classes}/"> Modified: branches/ODE/ODE-2.0-maven/dao-hibernate-db/pom.xml =================================================================== --- branches/ODE/ODE-2.0-maven/dao-hibernate-db/pom.xml 2010-01-06 14:14:58 UTC (rev 440) +++ branches/ODE/ODE-2.0-maven/dao-hibernate-db/pom.xml 2010-01-07 06:44:26 UTC (rev 441) @@ -52,6 +52,14 @@ <groupId>log4j</groupId> <artifactId>log4j</artifactId> </dependency> + <dependency> + <groupId>org.apache.derby</groupId> + <artifactId>derby</artifactId> + </dependency> + <dependency> + <groupId>org.apache.derby</groupId> + <artifactId>derbytools</artifactId> + </dependency> </dependencies> <build> @@ -67,7 +75,9 @@ <configuration> <tasks> <property name="maven.runtime.classpath" refid="maven.compile.classpath"/> + <property name="ode.version" value="${ode.version}" /> <ant antfile="build.xml" target="create-schema" inheritRefs="true"/> + <!--ant antfile="build.xml" target="create-derby-db" /--> </tasks> </configuration> <goals> Modified: branches/ODE/ODE-2.0-maven/dao-jpa/pom.xml =================================================================== --- branches/ODE/ODE-2.0-maven/dao-jpa/pom.xml 2010-01-06 14:14:58 UTC (rev 440) +++ branches/ODE/ODE-2.0-maven/dao-jpa/pom.xml 2010-01-07 06:44:26 UTC (rev 441) @@ -88,21 +88,37 @@ <build> <plugins> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>openjpa-maven-plugin</artifactId> + <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> - <id>enhancer</id> + <id>openjpa-enhancer</id> <phase>process-classes</phase> <goals> - <goal>enhance</goal> + <goal>run</goal> </goals> + <configuration> + <tasks> + <property name="maven.runtime.classpath" refid="maven.compile.classpath"/> + <path id="classpath"> + <pathelement path="${maven.runtime.classpath}"/> + </path> + <taskdef name="openjpac" classname="org.apache.openjpa.ant.PCEnhancerTask" classpathref="classpath"/> + <openjpac> + <fileset dir="${basedir}/src/main"> + <include name="**/*.java" /> + </fileset> + <classpath> + <pathelement location="${basedir}/target/classes"/> + <pathelement path="${maven.runtime.classpath}"/> + </classpath> + </openjpac> + </tasks> + </configuration> </execution> </executions> </plugin> - </plugins> - </build> + </build> </project> Modified: branches/ODE/ODE-2.0-maven/dao-jpa-db/build.xml =================================================================== --- branches/ODE/ODE-2.0-maven/dao-jpa-db/build.xml 2010-01-06 14:14:58 UTC (rev 440) +++ branches/ODE/ODE-2.0-maven/dao-jpa-db/build.xml 2010-01-07 06:44:26 UTC (rev 441) @@ -48,6 +48,24 @@ </target> + <target name="create-derby-db"> + <property name="dblocation" value="${basedir}/target/derby/jpadb" /> + <sql + driver="org.apache.derby.jdbc.EmbeddedDriver" + url="jdbc:derby:${dblocation};create=true" + userid="sa" + password="" + autocommit="yes" + > + <transaction src="${basedir}/target/derby.sql"/> + <classpath> + <path refid="classpath"/> + </classpath> + </sql> + <zip destfile="${basedir}/target/ode-dao-jpa-db-${ode.version}.zip" basedir="${basedir}/target/derby/" /> + + </target> + <!-- ============================================ Macro defs, no need to change anything below Modified: branches/ODE/ODE-2.0-maven/dao-jpa-db/pom.xml =================================================================== --- branches/ODE/ODE-2.0-maven/dao-jpa-db/pom.xml 2010-01-06 14:14:58 UTC (rev 440) +++ branches/ODE/ODE-2.0-maven/dao-jpa-db/pom.xml 2010-01-07 06:44:26 UTC (rev 441) @@ -110,6 +110,14 @@ <dependency> <groupId>hsqldb</groupId> <artifactId>hsqldb</artifactId> + </dependency> + <dependency> + <groupId>org.apache.derby</groupId> + <artifactId>derby</artifactId> + </dependency> + <dependency> + <groupId>org.apache.derby</groupId> + <artifactId>derbytools</artifactId> </dependency> <dependency> <groupId>org.apache.geronimo.modules</groupId> @@ -151,9 +159,9 @@ <configuration> <tasks> <property name="maven.runtime.classpath" refid="maven.compile.classpath"/> - <ant antfile="build.xml" - target="create-schema"> - </ant> + <property name="ode.version" value="${ode.version}"/> + <ant antfile="build.xml" target="create-schema" /> + <!--ant antfile="build.xml" target="create-derby-db" /--> </tasks> </configuration> </execution> Modified: branches/ODE/ODE-2.0-maven/jbi/pom.xml =================================================================== --- branches/ODE/ODE-2.0-maven/jbi/pom.xml 2010-01-06 14:14:58 UTC (rev 440) +++ branches/ODE/ODE-2.0-maven/jbi/pom.xml 2010-01-07 06:44:26 UTC (rev 441) @@ -204,26 +204,26 @@ <skipTests>true</skipTests> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>jbi-package</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <finalName>ode-jbi-${project.version}</finalName> - <appendAssemblyId>false</appendAssemblyId> - <descriptors> - <descriptor>src/main/assembly/bin.xml</descriptor> - </descriptors> - <tarLongFileMode>gnu</tarLongFileMode> - </configuration> - </execution> - </executions> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>jbi-package</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <finalName>ode-jbi-${project.version}</finalName> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>src/main/assembly/bin.xml</descriptor> + </descriptors> + <tarLongFileMode>gnu</tarLongFileMode> + </configuration> + </execution> + </executions> </plugin> </plugins> </build> Modified: branches/ODE/ODE-2.0-maven/pom.xml =================================================================== --- branches/ODE/ODE-2.0-maven/pom.xml 2010-01-06 14:14:58 UTC (rev 440) +++ branches/ODE/ODE-2.0-maven/pom.xml 2010-01-07 06:44:26 UTC (rev 441) @@ -182,20 +182,6 @@ </dependencies> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>openjpa-maven-plugin</artifactId> - <version>1.0</version> - <dependencies> - <dependency> - <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa</artifactId> - <version>1.1.0</version> - </dependency> - </dependencies> - - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>xmlbeans-maven-plugin</artifactId> @@ -782,6 +768,11 @@ <version>${derby.version}</version> </dependency> <dependency> + <groupId>org.apache.derby</groupId> + <artifactId>derbytools</artifactId> + <version>${derby.version}</version> + </dependency> + <dependency> <groupId>hsqldb</groupId> <artifactId>hsqldb</artifactId> <version>${hsqldb.version}</version>