Author: heiko.braun(a)jboss.com Date: 2009-01-23 08:43:45 -0500 (Fri, 23 Jan 2009) New Revision: 3716 Modified: jbpm4/branches/hbraun/modules/examples/pom.xml jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/hsqldb.properties jbpm4/branches/hbraun/modules/test-db/pom.xml Log: Fix dep's on hibernate.properties Modified: jbpm4/branches/hbraun/modules/examples/pom.xml =================================================================== --- jbpm4/branches/hbraun/modules/examples/pom.xml 2009-01-23 13:32:34 UTC (rev 3715) +++ jbpm4/branches/hbraun/modules/examples/pom.xml 2009-01-23 13:43:45 UTC (rev 3716) @@ -39,4 +39,52 @@ </dependency> </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>unpack.jbpm.db</id> + <phase>generate-test-resources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-jpdl</artifactId> + <classifier>config</classifier> + <overWrite>true</overWrite> + </artifactItem> + </artifactItems> + <excludeTransitive>true</excludeTransitive> + <outputDirectory>target/database-config</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>install.hibernate.database.properties</id> + <phase>generate-test-resources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <copy file="target/database-config/db.properties/${database}.properties" + tofile="target/test-classes/hibernate.properties" + overwrite="true" /> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> \ No newline at end of file Modified: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/hsqldb.properties =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/hsqldb.properties 2009-01-23 13:32:34 UTC (rev 3715) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/hsqldb.properties 2009-01-23 13:43:45 UTC (rev 3716) @@ -6,6 +6,6 @@ hibernate.connection.url=${jdbc.hsql.url} hibernate.connection.username=${jdbc.hsql.username} hibernate.connection.password=${jdbc.hsql.password} - +hibernate.hbm2ddl.auto=create-drop hibernate.cache.use_second_level_cache=true hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider Modified: jbpm4/branches/hbraun/modules/test-db/pom.xml =================================================================== --- jbpm4/branches/hbraun/modules/test-db/pom.xml 2009-01-23 13:32:34 UTC (rev 3715) +++ jbpm4/branches/hbraun/modules/test-db/pom.xml 2009-01-23 13:43:45 UTC (rev 3716) @@ -27,54 +27,79 @@ <!-- Dependencies --> <dependencies> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-api</artifactId> - <version>${version}</version> - </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-test-base</artifactId> - <version>${version}</version> - </dependency> - - <dependency> - <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-jpdl</artifactId> <version>${version}</version> <scope>test</scope> </dependency> - + <dependency> <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-task</artifactId> + <artifactId>jbpm-test-base</artifactId> <version>${version}</version> - <scope>test</scope> </dependency> - - <!-- TODO remove PVM dependency for compilation (keep it for test)--> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-pvm</artifactId> - <version>${version}</version> - <scope>test</scope> - </dependency> - + </dependencies> - + <!-- Plugins --> <build> <plugins> - <plugin> + <plugin> <!--TODO: What's this??--> <artifactId>maven-surefire-plugin</artifactId> <configuration> <testSourceDirectory>src/main/java</testSourceDirectory> <classesDirectory>target/classes</classesDirectory> - <testClassesDirectory>target/classes</testClassesDirectory> + <testClassesDirectory>target/classes</testClassesDirectory> </configuration> </plugin> + + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>unpack.jbpm.db</id> + <phase>generate-test-resources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-jpdl</artifactId> + <classifier>config</classifier> + <overWrite>true</overWrite> + </artifactItem> + </artifactItems> + <excludeTransitive>true</excludeTransitive> + <outputDirectory>target/database-config</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>install.hibernate.database.properties</id> + <phase>generate-test-resources</phase> + <goals> + <goal>run</goal> + </goals> <!-- TODO: Change to test-classes --> + <configuration> + <tasks> + <copy file="target/database-config/db.properties/${database}.properties" + tofile="target/classes/hibernate.properties" + overwrite="true" /> + </tasks> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> - + </project> \ No newline at end of file