You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by at...@apache.org on 2007/08/23 17:40:03 UTC
svn commit: r569049 - in /portals/jetspeed-2/trunk: pom.xml
settings.xml.sample
Author: ate
Date: Thu Aug 23 08:40:02 2007
New Revision: 569049
URL: http://svn.apache.org/viewvc?rev=569049&view=rev
Log:
JS2-770: Provide a new maven-2 (only) build environment and restructure the source tree according to the maven-2 conventions
See: http://issues.apache.org/jira/browse/JS2-770
Fixing up and improving bootstrapping the build (if you need it) and initializing the databases.
Modified:
portals/jetspeed-2/trunk/pom.xml
portals/jetspeed-2/trunk/settings.xml.sample
Modified: portals/jetspeed-2/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/pom.xml?rev=569049&r1=569048&r2=569049&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/pom.xml (original)
+++ portals/jetspeed-2/trunk/pom.xml Thu Aug 23 08:40:02 2007
@@ -1144,16 +1144,77 @@
</testResources>
</build>
- <modules>
- <module>maven</module>
- <module>jetspeed-portal-resources</module>
- <module>jetspeed-api</module>
- <module>jetspeed-commons</module>
- <module>components</module>
- </modules>
-
<profiles>
-
+ <profile>
+ <id>all</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>maven</module>
+ <module>jetspeed-portal-resources</module>
+ <module>jetspeed-api</module>
+ <module>jetspeed-commons</module>
+ <module>components</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>init</id>
+ <modules>
+ <module>maven</module>
+ <module>jetspeed-portal-resources</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>init-db</id>
+ <build>
+ <plugins>
+ <plugin>
+ <inherited>false</inherited>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-maven-plugins</artifactId>
+ <version>${pom.version}</version>
+ <dependencies>
+ <dependency>
+ <groupId>${org.apache.jetspeed.test.jdbc.driver.groupId}</groupId>
+ <artifactId>${org.apache.jetspeed.test.jdbc.driver.artifactId}</artifactId>
+ <version>${org.apache.jetspeed.test.jdbc.driver.version}</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>pom-init-db</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>init-db</goal>
+ </goals>
+ <configuration>
+ <unpackResources>
+ <resourceBundle>${groupId}:jetspeed-portal-resources:${pom.version}</resourceBundle>
+ <resources>
+ <unpack includes="ddl/${org.apache.jetspeed.test.database.default.name}/"/>
+ </resources>
+ </unpackResources>
+ <sqlScripts>
+ <sqlScript>
+ <path>${project.build.directory}/ddl/${org.apache.jetspeed.test.database.default.name}/drop-schema.sql</path>
+ <ignoreErrors>true</ignoreErrors>
+ </sqlScript>
+ <sqlScript>
+ <path>${project.build.directory}/ddl/${org.apache.jetspeed.test.database.default.name}/create-schema.sql</path>
+ </sqlScript>
+ </sqlScripts>
+ <username>${org.apache.jetspeed.test.database.user}</username>
+ <password>${org.apache.jetspeed.test.database.password}</password>
+ <url>${org.apache.jetspeed.test.database.url}</url>
+ <driver>${org.apache.jetspeed.test.database.driver}</driver>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
<profile>
<id>test</id>
<activation>
@@ -1165,9 +1226,16 @@
<properties>
<maven.test.skip>false</maven.test.skip>
</properties>
+ <modules>
+ <module>maven</module>
+ <module>jetspeed-portal-resources</module>
+ <module>jetspeed-api</module>
+ <module>jetspeed-commons</module>
+ <module>components</module>
+ </modules>
</profile>
<profile>
- <id>setup</id>
+ <id>prod-db</id>
<build>
<pluginManagement>
<plugins>
@@ -1212,7 +1280,7 @@
</build>
</profile>
<profile>
- <id>test-setup</id>
+ <id>test-db</id>
<build>
<pluginManagement>
<plugins>
@@ -1227,9 +1295,13 @@
<version>${org.apache.jetspeed.test.jdbc.driver.version}</version>
</dependency>
</dependencies>
- <goals>
- <goal>init-db</goal>
- </goals>
+ <executions>
+ <execution>
+ <goals>
+ <goal>init-db</goal>
+ </goals>
+ </execution>
+ </executions>
<configuration>
<unpackResources>
<resourceBundle>${groupId}:jetspeed-portal-resources:${pom.version}</resourceBundle>
Modified: portals/jetspeed-2/trunk/settings.xml.sample
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/settings.xml.sample?rev=569049&r1=569048&r2=569049&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/settings.xml.sample (original)
+++ portals/jetspeed-2/trunk/settings.xml.sample Thu Aug 23 08:40:02 2007
@@ -32,6 +32,13 @@
deployment. -->
<settings xmlns="http://maven.apache.org/POM/4.0.0">
+ <!-- custom plugin resolution groups -->
+
+ <pluginGroups>
+ <pluginGroup>org.apache.portals.jetspeed-2</pluginGroup>
+ </pluginGroups>
+
+
<!-- Local Repository Location -->
<!--
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org