You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2013/04/07 20:48:32 UTC
svn commit: r1465442 - in /roller/branches/fewer_modules: planet-business/
planet-web/ pom.xml roller-core/ test-utils/pom.xml weblogger-business/
weblogger-web/ weblogger-webapp/pom.xml
Author: snoopdave
Date: Sun Apr 7 18:48:32 2013
New Revision: 1465442
URL: http://svn.apache.org/r1465442
Log:
More progress on fewer modules 80 of 134 tests passing
Removed:
roller/branches/fewer_modules/planet-business/
roller/branches/fewer_modules/planet-web/
roller/branches/fewer_modules/roller-core/
roller/branches/fewer_modules/weblogger-business/
roller/branches/fewer_modules/weblogger-web/
Modified:
roller/branches/fewer_modules/pom.xml
roller/branches/fewer_modules/test-utils/pom.xml
roller/branches/fewer_modules/weblogger-webapp/pom.xml
Modified: roller/branches/fewer_modules/pom.xml
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/pom.xml?rev=1465442&r1=1465441&r2=1465442&view=diff
==============================================================================
--- roller/branches/fewer_modules/pom.xml (original)
+++ roller/branches/fewer_modules/pom.xml Sun Apr 7 18:48:32 2013
@@ -3,10 +3,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
-
<groupId>org.apache.roller</groupId>
<artifactId>roller-project</artifactId>
-
<version>5.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -36,369 +34,4 @@
<module>weblogger-webapp</module>
</modules>
- <build>
- <defaultGoal>install</defaultGoal>
-
- <pluginManagement>
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <fork>true</fork>
- <encoding>${project.build.sourceEncoding}</encoding>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.2</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.4.1</version>
- </plugin>
-
- <!-- Allow for standalone Tomcat deployment
- using mvn tomcat7:redeploy (See
- http://www.jroller.com/gmazza/entry/web_service_tutorial#maventomcat
- for necessary config info)
- -->
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat7-maven-plugin</artifactId>
- <version>2.1</version>
- <configuration>
- <server>myTomcat</server>
- <path>/${project.build.finalName}</path>
- </configuration>
- </plugin>
-
- </plugins>
-
- </pluginManagement>
- </build>
-
- <repositories>
-
- <repository>
- <id>central</id>
- <name>Maven Repository Switchboard</name>
- <layout>default</layout>
- <url>http://repo1.maven.org/maven2</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
-
- <repository>
- <id>oauth</id>
- <url>http://oauth.googlecode.com/svn/code/maven</url>
- </repository>
-
- <repository>
- <id>oss.sonatype.org</id>
- <url>http://oss.sonatype.org/content/groups/public</url>
- </repository>
-
- <!-- EclipseLink repo
- <repository>
- <id>EclipseLink Repo</id>
- <url>http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/rt/eclipselink/maven.repo</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository> -->
-
- <!-- JBoss Hibernate JPA repo
- <repository>
- <id>JBoss Repo</id>
- <url>http://repository.jboss.com/maven2</url>
- </repository> -->
-
- <!-- for jstl-1.2 for now.. -->
- <repository>
- <id>java.net</id>
- <url>http://download.java.net/maven/2/</url>
- </repository>
-
- </repositories>
-
- <dependencyManagement>
- <dependencies>
-
- <!-- core deps -->
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.16</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.4</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.4</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
- <version>2.0</version>
- </dependency>
-
- <!-- business deps -->
-
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-core</artifactId>
- <version>3.6.0</version>
- </dependency>
-
- <dependency>
- <groupId>net.java.dev.rome</groupId>
- <artifactId>rome</artifactId>
- <version>1.0.0</version>
- </dependency>
-
- <dependency>
- <groupId>net.java.dev.rome</groupId>
- <artifactId>rome-fetcher</artifactId>
- <version>1.0.0</version>
- </dependency>
-
- <dependency>
- <groupId>net.java.dev.rome</groupId>
- <artifactId>rome-propono</artifactId>
- <version>1.0.0</version>
- </dependency>
-
- <dependency>
- <groupId>jdom</groupId>
- <artifactId>jdom</artifactId>
- <version>1.1</version>
- </dependency>
-
- <dependency>
- <groupId>net.oauth.core</groupId>
- <artifactId>oauth</artifactId>
- <version>20090531</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>net.oauth.core</groupId>
- <artifactId>oauth-provider</artifactId>
- <version>20090531</version>
- <scope>compile</scope>
- </dependency>
-
- <!-- web deps -->
-
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>1.1</version>
- <scope>compile</scope>
- </dependency>
-
-
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-core</artifactId>
- <version>2.3.8</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-tiles-plugin</artifactId>
- <version>2.3.8</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-spring-plugin</artifactId>
- <version>2.3.8</version>
- </dependency>
-
- <!-- <dependency>
- <groupId>com.google.inject.integration</groupId>
- <artifactId>guice-struts2-plugin</artifactId>
- <version>2.0</version>
- <type>jar</type>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>opensymphony</groupId>
- <artifactId>xwork</artifactId>
- </exclusion>
- </exclusions>
- </dependency> -->
-
- <dependency>
- <groupId>org.apache.tiles</groupId>
- <artifactId>tiles-core</artifactId>
- <version>2.0.6</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tiles</groupId>
- <artifactId>tiles-api</artifactId>
- <version>2.0.6</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tiles</groupId>
- <artifactId>tiles-jsp</artifactId>
- <version>2.0.6</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.7</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.texen</groupId>
- <artifactId>texen</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.xmlrpc</groupId>
- <artifactId>xmlrpc-common</artifactId>
- <version>3.1.2</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.xmlrpc</groupId>
- <artifactId>xmlrpc-client</artifactId>
- <version>3.1.2</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.xmlrpc</groupId>
- <artifactId>xmlrpc-server</artifactId>
- <version>3.1.2</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.ws.commons.util</groupId>
- <artifactId>ws-commons-util</artifactId>
- <version>1.0.2</version>
- </dependency>
-
- <!-- Java EE deps -->
-
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <version>2.0.1</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>1.2</version>
- </dependency>
-
- <!-- test deps -->
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbynet</artifactId>
- <version>${derby.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyclient</artifactId>
- <version>${derby.version}</version>
- </dependency>
-
- <dependency>
- <groupId>simple-jndi</groupId>
- <artifactId>simple-jndi</artifactId>
- <version>0.11.4</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.7.1</version>
- </dependency>
-
- </dependencies>
- </dependencyManagement>
</project>
Modified: roller/branches/fewer_modules/test-utils/pom.xml
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/test-utils/pom.xml?rev=1465442&r1=1465441&r2=1465442&view=diff
==============================================================================
--- roller/branches/fewer_modules/test-utils/pom.xml (original)
+++ roller/branches/fewer_modules/test-utils/pom.xml Sun Apr 7 18:48:32 2013
@@ -15,6 +15,15 @@
<groupId>org.apache.roller</groupId>
<artifactId>test-utils</artifactId>
+ <properties>
+ <testOutputDirectory>${project.build.testOutputDirectory}</testOutputDirectory>
+ <testMediaDir> ${project.build.testOutputDirectory}${file.separator}mediafiles</testMediaDir>
+ <testUploadsDir>${project.build.testOutputDirectory}${file.separator}uploadsdir</testUploadsDir>
+ <testThemesDir> ${project.build.testOutputDirectory}${file.separator}themes</testThemesDir>
+ <testIndexDir> ${project.build.testOutputDirectory}${file.separator}index</testIndexDir>
+ <testPlanetCache>${project.build.testOutputDirectory}${file.separator}planetcache</testPlanetCache>
+ </properties>
+
<dependencies>
<dependency>
@@ -26,36 +35,48 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <version>4.11</version>
<scope>compile</scope>
</dependency>
<dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.4</version>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
+ <version>1.7.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyclient</artifactId>
+ <version>${derby.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
+ <version>${derby.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbynet</artifactId>
+ <version>${derby.version}</version>
<scope>compile</scope>
</dependency>
Modified: roller/branches/fewer_modules/weblogger-webapp/pom.xml
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/pom.xml?rev=1465442&r1=1465441&r2=1465442&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-webapp/pom.xml (original)
+++ roller/branches/fewer_modules/weblogger-webapp/pom.xml Sun Apr 7 18:48:32 2013
@@ -26,6 +26,48 @@
</properties>
<repositories>
+
+ <repository>
+ <id>central</id>
+ <name>Maven Repository Switchboard</name>
+ <layout>default</layout>
+ <url>http://repo1.maven.org/maven2</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+
+ <repository>
+ <id>oauth</id>
+ <url>http://oauth.googlecode.com/svn/code/maven</url>
+ </repository>
+
+ <repository>
+ <id>oss.sonatype.org</id>
+ <url>http://oss.sonatype.org/content/groups/public</url>
+ </repository>
+
+ <!-- EclipseLink repo
+ <repository>
+ <id>EclipseLink Repo</id>
+ <url>http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/rt/eclipselink/maven.repo</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository> -->
+
+ <!-- JBoss Hibernate JPA repo
+ <repository>
+ <id>JBoss Repo</id>
+ <url>http://repository.jboss.com/maven2</url>
+ </repository> -->
+
+ <!-- for jstl-1.2 for now.. -->
+ <repository>
+ <id>java.net</id>
+ <url>http://download.java.net/maven/2/</url>
+ </repository>
+
<repository>
<id>com.atlassian</id>
<name>Atlassian Repository</name>
@@ -45,6 +87,7 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
+ <version>2.2.1</version>
<exclusions>
<exclusion>
<groupId>commons-pool</groupId>
@@ -100,80 +143,95 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
+ <version>1.2.16</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
+ <version>2.4</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
+ <version>3.2.1</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
+ <version>2.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
+ <version>4.11</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId>
<scope>compile</scope>
+ <version>3.6.0</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
+ <version>1.7</version>
</dependency>
<dependency>
<groupId>org.apache.texen</groupId>
<artifactId>texen</artifactId>
+ <version>1.0</version>
</dependency>
<dependency>
<groupId>org.apache.xmlrpc</groupId>
<artifactId>xmlrpc-common</artifactId>
+ <version>3.1.3</version>
</dependency>
<dependency>
<groupId>org.apache.xmlrpc</groupId>
<artifactId>xmlrpc-client</artifactId>
+ <version>3.1.3</version>
</dependency>
<dependency>
<groupId>org.apache.xmlrpc</groupId>
<artifactId>xmlrpc-server</artifactId>
+ <version>3.1.3</version>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.util</groupId>
<artifactId>ws-commons-util</artifactId>
+ <version>1.0.2</version>
</dependency>
<dependency>
<groupId>net.oauth.core</groupId>
<artifactId>oauth</artifactId>
<scope>compile</scope>
+ <version>20100601</version>
</dependency>
<dependency>
<groupId>net.oauth.core</groupId>
<artifactId>oauth-provider</artifactId>
<scope>compile</scope>
+ <version>20100601</version>
</dependency>
<!-- web -->
@@ -181,6 +239,7 @@
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-tiles-plugin</artifactId>
+ <version>2.3.12</version>
<exclusions>
<exclusion>
<artifactId>commons-logging-api</artifactId>
@@ -192,11 +251,13 @@
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-jsp</artifactId>
+ <version>2.0.6</version>
</dependency>
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-api</artifactId>
+ <version>2.0.6</version>
<exclusions>
<exclusion>
<artifactId>commons-logging-api</artifactId>
@@ -372,12 +433,14 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
+ <version>1.2</version>
<!-- <scope>provided</scope> -->
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
+ <version>1.4.7</version>
<scope>provided</scope>
<exclusions>
<exclusion>
@@ -431,6 +494,7 @@
<dependency>
<groupId>org.apache.derby</groupId>
+ <version>${derby.version}</version>
<artifactId>derby</artifactId>
<scope>provided</scope>
</dependency>
@@ -438,12 +502,14 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbynet</artifactId>
+ <version>${derby.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyclient</artifactId>
+ <version>${derby.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -459,6 +525,58 @@
<finalName>roller</finalName>
+ <pluginManagement>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ <fork>true</fork>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.3</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.2</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.4.1</version>
+ </plugin>
+
+ <!-- Allow for standalone Tomcat deployment
+ using mvn tomcat7:redeploy (See
+ http://www.jroller.com/gmazza/entry/web_service_tutorial#maventomcat
+ for necessary config info)
+ -->
+ <plugin>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat7-maven-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <server>myTomcat</server>
+ <path>/${project.build.finalName}</path>
+ </configuration>
+ </plugin>
+
+ </plugins>
+
+ </pluginManagement>
+
<plugins>
<plugin>
@@ -555,6 +673,92 @@
</dependencies>
</plugin>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.4.3</version>
+
+ <executions>
+
+ <execution>
+ <id>copy-test-properties</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${basedir}/target/testsetup</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>copy-test-config</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${basedir}/target/</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>copy-resources</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/roller/WEB-INF/classes/dbscripts</outputDirectory>
+ <resources>
+ <resource>
+ <directory>target/dbscripts</directory>
+ <filtering>false</filtering>
+ <includes>
+ <include>**/*.sql</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>copy-dbscripts-resources</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <includeEmptyDirs>true</includeEmptyDirs>
+ <outputDirectory>${project.build.directory}/dbscripts</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/main/resources/sql</directory>
+ <filtering>false</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+
+ </executions>
+
+ <configuration>
+ <includeEmptyDirs>true</includeEmptyDirs>
+ </configuration>
+
+ </plugin>
+
<!-- <plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
@@ -656,6 +860,27 @@
<executions>
<execution>
+ <id>gen-db-scripts</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <taskdef name="texen"
+ classname="org.apache.velocity.texen.ant.TexenTask"
+ classpathref="maven.compile.classpath"/>
+ <texen
+ controlTemplate ="control.vm"
+ contextProperties="${basedir}/target/dbscripts/dbscripts.properties"
+ templatePath ="${basedir}/target/dbscripts"
+ outputDirectory ="${basedir}/target/dbscripts"
+ outputFile="README.txt"/>
+ </tasks>
+ </configuration>
+ </execution>
+
+ <execution>
<id>startdb</id>
<phase>process-test-resources</phase>
<goals>
@@ -664,12 +889,12 @@
<configuration>
<tasks>
<!-- Derby only for unit testing: skip when maven.text.skip is set -->
- <delete dir="${project.build.directory}/derby-system" verbose="true" failonerror="false" />
+ <delete dir="${basedir}/target/derby-system" verbose="true" failonerror="false" />
<taskdef name="startdb" classname="org.apache.roller.weblogger.ant.StartDerbyTask"
classpathref="maven.test.classpath"/>
- <startdb databaseDir="${project.build.directory}/derby-system"
+ <startdb databaseDir="${basedir}/target/derby-system"
port="3223"
- databaseScriptsDir="${project.build.directory}/roller/WEB-INF/classes/dbscripts"
+ databaseScriptsDir="${basedir}/target/dbscripts"
skip="${maven.test.skip}" >
</startdb>
</tasks>
@@ -687,12 +912,12 @@
<!-- Derby only for unit testing: skip when maven.text.skip is set -->
<taskdef name="stopdb" classname="org.apache.roller.weblogger.ant.StopDerbyTask"
classpathref="maven.test.classpath"/>
- <stopdb databaseDir="${project.build.directory}/derby-system"
+ <stopdb databaseDir="${basedir}/target/derby-system"
port="3223"
- databaseScriptsDir="${project.build.directory}/roller/WEB-INF/classes/dbscripts"
+ databaseScriptsDir="${basedir}/target/dbscripts"
skip="${maven.test.skip}" >
</stopdb>
- <delete dir="${project.build.directory}/derby-system" verbose="true" failonerror="false" />
+ <delete dir="${basedir}/target/derby-system" verbose="true" failonerror="false" />
</tasks>
</configuration>
</execution>
@@ -701,47 +926,136 @@
</plugin>
<plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.4.1</version>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <version>1.0-beta-3</version>
<executions>
<execution>
- <id>copy-resources</id>
- <phase>process-resources</phase>
+ <phase>validate</phase>
<goals>
- <goal>copy-resources</goal>
+ <goal>create</goal>
</goals>
- <configuration>
- <outputDirectory>${project.build.directory}/roller/WEB-INF/classes/dbscripts</outputDirectory>
- <resources>
- <resource>
- <directory>../weblogger-business/target/dbscripts</directory>
- <filtering>false</filtering>
- <includes>
- <include>**/*.sql</include>
- </includes>
- </resource>
- </resources>
- </configuration>
</execution>
</executions>
+ <configuration>
+ <doUpdate>false</doUpdate>
+ <revisionOnScmFailure>UNKNOWN</revisionOnScmFailure>
+ </configuration>
</plugin>
-
+
</plugins>
<testResources>
<testResource>
- <directory>src/test/resources</directory>
+ <directory>${project.basedir}/../weblogger-webapp/src/main/webapp/</directory>
+ <filtering>false</filtering>
+ <includes>
+ <include>themes/**</include>
+ </includes>
+ </testResource>
+ <testResource>
+ <directory>${project.basedir}/src/test/resources</directory>
<filtering>true</filtering>
+ <includes>
+ <include>**/**</include>
+ </includes>
</testResource>
</testResources>
<resources>
<resource>
- <directory>src/main/resources</directory>
+ <directory>${project.basedir}/src/main/resources</directory>
+ <filtering>false</filtering>
+ <includes>
+ <include>org/**</include>
+ </includes>
+ <excludes>
+ <exclude>**/sql/**</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <!-- ensure version and persistence files get substitions -->
+ <directory>${project.basedir}/src/main/resources</directory>
<filtering>true</filtering>
+ <includes>
+ <include>roller-version.properties</include>
+ <include>META-INF/**</include>
+ </includes>
</resource>
</resources>
</build>
+ <profiles>
+
+ <profile>
+ <id>jboss</id>
+ <!-- building for JBoss, turn on 'java:/' prefix on datasource JNDI name -->
+ <activation>
+ <property><name>jboss</name></property>
+ </activation>
+ <properties>
+ <datasourceName>java:/RollerDS</datasourceName>
+ </properties>
+ </profile>
+
+ <profile>
+ <id>notjboss</id>
+ <!-- not building for JBoss, don't use 'java:/' prefix on datasource JNDI name -->
+ <activation>
+ <property><name>!jboss</name></property>
+ </activation>
+ <properties>
+ <datasourceName>jdbc/rollerdb</datasourceName>
+ </properties>
+ </profile>
+
+ <profile>
+ <id>openjpa</id>
+ <!-- building for Tomcat, so add OpenJPA bytecode enhancement -->
+ <activation>
+ <property>
+ <name>!javaee</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa</artifactId>
+ <scope>provided</scope>
+ <version>2.2.1</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <jpaProviderClass>org.apache.openjpa.persistence.PersistenceProviderImpl</jpaProviderClass>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>openjpa-enhance</id>
+ <phase>process-classes</phase>
+ <configuration>
+ <tasks>
+ <taskdef name="openjpac" classname="org.apache.openjpa.ant.PCEnhancerTask"
+ classpathref="maven.compile.classpath"/>
+ <openjpac enforcePropertyRestrictions="false">
+ <classpath refid="maven.compile.classpath"/>
+ </openjpac>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ </profiles>
+
</project>