You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by tv...@apache.org on 2011/04/05 18:33:23 UTC
svn commit: r1089121 - in /turbine/core/trunk: pom.xml
src/assembly/binaries.xml
Author: tv
Date: Tue Apr 5 16:33:22 2011
New Revision: 1089121
URL: http://svn.apache.org/viewvc?rev=1089121&view=rev
Log:
Add generation of the SQL files to the build and assembly and add config files to the assembly
Modified:
turbine/core/trunk/pom.xml
turbine/core/trunk/src/assembly/binaries.xml
Modified: turbine/core/trunk/pom.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/pom.xml?rev=1089121&r1=1089120&r2=1089121&view=diff
==============================================================================
--- turbine/core/trunk/pom.xml (original)
+++ turbine/core/trunk/pom.xml Tue Apr 5 16:33:22 2011
@@ -609,6 +609,99 @@
</plugin>
<plugin>
+ <groupId>org.apache.torque</groupId>
+ <artifactId>torque-maven-plugin</artifactId>
+ <version>3.3</version>
+ <configuration>
+ <targetDatabase>mysql</targetDatabase>
+ <schemaDir>src/torque/schema</schemaDir>
+ </configuration>
+ <executions>
+ <execution>
+ <id>torque-om</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>om</goal>
+ </goals>
+ <configuration>
+ <targetPackage>org.apache.turbine.services.security.torque.om</targetPackage>
+ <correctGetters>true</correctGetters>
+ <baseOutputDir>${project.build.directory}/generated-sources/torque</baseOutputDir>
+ <outputDir>${project.build.sourceDirectory}</outputDir>
+ <reportFile>../../target/torque/report.${project.artifact.artifactId}.om.generation</reportFile>
+ <runOnlyOnSchemaChange>true</runOnlyOnSchemaChange>
+ <enableJava5Features>true</enableJava5Features>
+ </configuration>
+ </execution>
+ <execution>
+ <id>torque-sql-mysql</id>
+ <phase>package</phase>
+ <goals>
+ <goal>sql</goal>
+ <goal>id-table-init-sql</goal>
+ </goals>
+ <configuration>
+ <runOnlyOnSchemaChange>false</runOnlyOnSchemaChange>
+ <outputDir>${project.build.directory}/generated-sql/torque/mysql</outputDir>
+ <targetDatabase>mysql</targetDatabase>
+ </configuration>
+ </execution>
+ <execution>
+ <id>torque-sql-derby</id>
+ <phase>package</phase>
+ <goals>
+ <goal>sql</goal>
+ <goal>id-table-init-sql</goal>
+ </goals>
+ <configuration>
+ <runOnlyOnSchemaChange>false</runOnlyOnSchemaChange>
+ <outputDir>${project.build.directory}/generated-sql/torque/derby</outputDir>
+ <targetDatabase>derby</targetDatabase>
+ </configuration>
+ </execution>
+ <execution>
+ <id>torque-sql-oracle</id>
+ <phase>package</phase>
+ <goals>
+ <goal>sql</goal>
+ <goal>id-table-init-sql</goal>
+ </goals>
+ <configuration>
+ <runOnlyOnSchemaChange>false</runOnlyOnSchemaChange>
+ <outputDir>${project.build.directory}/generated-sql/torque/oracle</outputDir>
+ <targetDatabase>oracle</targetDatabase>
+ </configuration>
+ </execution>
+ <execution>
+ <id>torque-sql-postgresql</id>
+ <phase>package</phase>
+ <goals>
+ <goal>sql</goal>
+ <goal>id-table-init-sql</goal>
+ </goals>
+ <configuration>
+ <runOnlyOnSchemaChange>false</runOnlyOnSchemaChange>
+ <outputDir>${project.build.directory}/generated-sql/torque/postgresql</outputDir>
+ <targetDatabase>postgresql</targetDatabase>
+ </configuration>
+ </execution>
+ <execution>
+ <id>torque-sql-mssql</id>
+ <phase>package</phase>
+ <goals>
+ <goal>sql</goal>
+ <goal>id-table-init-sql</goal>
+ </goals>
+ <configuration>
+ <runOnlyOnSchemaChange>false</runOnlyOnSchemaChange>
+ <outputDir>${project.build.directory}/generated-sql/torque/mssql</outputDir>
+ <targetDatabase>mssql</targetDatabase>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<!-- build the ssite during packaging -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
@@ -646,31 +739,6 @@
</execution>
</executions>
</plugin>
-
- <plugin>
- <groupId>org.apache.torque</groupId>
- <artifactId>torque-maven-plugin</artifactId>
- <version>3.3</version>
- <configuration>
- <targetDatabase>mysql</targetDatabase>
- <targetPackage>org.apache.turbine.services.security.torque.om</targetPackage>
- <correctGetters>true</correctGetters>
- <baseOutputDir>${project.build.directory}/generated-sources/torque</baseOutputDir>
- <outputDir>${project.build.sourceDirectory}</outputDir>
- <reportFile>../../target/torque/report.${project.artifact.artifactId}.om.generation</reportFile>
- <schemaDir>src/torque/schema</schemaDir>
- <runOnlyOnSchemaChange>true</runOnlyOnSchemaChange>
- <enableJava5Features>true</enableJava5Features>
- </configuration>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>om</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
@@ -1119,17 +1187,6 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-site-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>site</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-release-plugin</artifactId>
<configuration>
<!-- Pass these arguments to the deploy plugin. -->
@@ -1151,17 +1208,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>attached</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</profile>
@@ -1174,10 +1220,11 @@
<maven.compile.target>1.6</maven.compile.target>
<!-- Default values for the download-page generation by commons-build-plugin -->
- <commons.release.name>${project.artifactId}-${turbine.release.version}</commons.release.name>
- <commons.binary.suffix>-bin</commons.binary.suffix>
+ <!-- commons.release.name>${project.artifactId}-${turbine.release.version}</commons.release.name -->
+ <!-- commons.binary.suffix>-bin</commons.binary.suffix -->
<!-- The RC version used in the staging repository URL. -->
+ <turbine.release.version>${project.version}</turbine.release.version>
<turbine.rc.version>RC1</turbine.rc.version>
<!--
Modified: turbine/core/trunk/src/assembly/binaries.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/assembly/binaries.xml?rev=1089121&r1=1089120&r2=1089121&view=diff
==============================================================================
--- turbine/core/trunk/src/assembly/binaries.xml (original)
+++ turbine/core/trunk/src/assembly/binaries.xml Tue Apr 5 16:33:22 2011
@@ -50,5 +50,23 @@
<include>*.jar</include>
</includes>
</fileSet>
+ <fileSet>
+ <directory>${project.build.directory}/generated-sql/torque</directory>
+ <outputDirectory>/sql</outputDirectory>
+ <includes>
+ <include>**/*.sql</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/conf</directory>
+ <outputDirectory>/conf</outputDirectory>
+ <includes>
+ <include>componentConfiguration.xml</include>
+ <include>roleConfiguration.xml</include>
+ <include>turbine-classic-pipeline.xml</include>
+ <include>Log4j.properties</include>
+ <include>TurbineResources.properties</include>
+ </includes>
+ </fileSet>
</fileSets>
</assembly>
\ No newline at end of file