You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2011/10/11 02:59:52 UTC
svn commit: r1181324 - in /incubator/lcf/trunk: ./ connectors/filesystem/
connectors/rss/ connectors/webcrawler/ framework/agents/ framework/core/
framework/pull-agent/ tests/cmis/ tests/filesystem/
Author: kwright
Date: Tue Oct 11 00:59:51 2011
New Revision: 1181324
URL: http://svn.apache.org/viewvc?rev=1181324&view=rev
Log:
Re-enable HSQLDB tests in standard profile, and move work area to target so that clean will work. Part of CONNECTORS-269.
Modified:
incubator/lcf/trunk/CHANGES.txt
incubator/lcf/trunk/connectors/filesystem/pom.xml
incubator/lcf/trunk/connectors/rss/pom.xml
incubator/lcf/trunk/connectors/webcrawler/pom.xml
incubator/lcf/trunk/framework/agents/pom.xml
incubator/lcf/trunk/framework/core/pom.xml
incubator/lcf/trunk/framework/pull-agent/pom.xml
incubator/lcf/trunk/pom.xml
incubator/lcf/trunk/tests/cmis/pom.xml
incubator/lcf/trunk/tests/filesystem/pom.xml
Modified: incubator/lcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/CHANGES.txt?rev=1181324&r1=1181323&r2=1181324&view=diff
==============================================================================
--- incubator/lcf/trunk/CHANGES.txt (original)
+++ incubator/lcf/trunk/CHANGES.txt Tue Oct 11 00:59:51 2011
@@ -3,6 +3,10 @@ $Id$
======================= 0.4-dev =====================
+CONNECTORS-269: Get the maven build working properly again, including
+the HSQLDB tests, and the clean operation.
+(Piergiorgio Lucidi, Karl Wright)
+
CONNECTORS-264: Changing the repositoryId to an empty value is not possible
(Piergiorgio Lucidi)
Modified: incubator/lcf/trunk/connectors/filesystem/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/filesystem/pom.xml?rev=1181324&r1=1181323&r2=1181324&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/filesystem/pom.xml (original)
+++ incubator/lcf/trunk/connectors/filesystem/pom.xml Tue Oct 11 00:59:51 2011
@@ -40,6 +40,7 @@
<exclude>**/*Postgresql*.java</exclude>
</excludes>
<forkMode>always</forkMode>
+ <workingDirectory>target/test-output</workingDirectory>
</configuration>
</plugin>
</plugins>
Modified: incubator/lcf/trunk/connectors/rss/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/rss/pom.xml?rev=1181324&r1=1181323&r2=1181324&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/rss/pom.xml (original)
+++ incubator/lcf/trunk/connectors/rss/pom.xml Tue Oct 11 00:59:51 2011
@@ -31,6 +31,19 @@
<build>
<sourceDirectory>${basedir}/connector/src/main/java</sourceDirectory>
<testSourceDirectory>${basedir}/connector/src/test/java</testSourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/*Postgresql*.java</exclude>
+ </excludes>
+ <forkMode>always</forkMode>
+ <workingDirectory>target/test-output</workingDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
<dependencies>
Modified: incubator/lcf/trunk/connectors/webcrawler/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/webcrawler/pom.xml?rev=1181324&r1=1181323&r2=1181324&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/webcrawler/pom.xml (original)
+++ incubator/lcf/trunk/connectors/webcrawler/pom.xml Tue Oct 11 00:59:51 2011
@@ -31,6 +31,19 @@
<build>
<sourceDirectory>${basedir}/connector/src/main/java</sourceDirectory>
<testSourceDirectory>${basedir}/connector/src/test/java</testSourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/*Postgresql*.java</exclude>
+ </excludes>
+ <forkMode>always</forkMode>
+ <workingDirectory>target/test-output</workingDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
<dependencies>
Modified: incubator/lcf/trunk/framework/agents/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/agents/pom.xml?rev=1181324&r1=1181323&r2=1181324&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/agents/pom.xml (original)
+++ incubator/lcf/trunk/framework/agents/pom.xml Tue Oct 11 00:59:51 2011
@@ -50,6 +50,7 @@
<exclude>**/*Postgresql*.java</exclude>
</excludes>
<forkMode>always</forkMode>
+ <workingDirectory>target/test-output</workingDirectory>
</configuration>
</plugin>
</plugins>
Modified: incubator/lcf/trunk/framework/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/core/pom.xml?rev=1181324&r1=1181323&r2=1181324&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/core/pom.xml (original)
+++ incubator/lcf/trunk/framework/core/pom.xml Tue Oct 11 00:59:51 2011
@@ -49,6 +49,7 @@
<exclude>**/*Postgresql*.java</exclude>
</excludes>
<forkMode>always</forkMode>
+ <workingDirectory>target/test-output</workingDirectory>
</configuration>
</plugin>
</plugins>
Modified: incubator/lcf/trunk/framework/pull-agent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/pull-agent/pom.xml?rev=1181324&r1=1181323&r2=1181324&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/pull-agent/pom.xml (original)
+++ incubator/lcf/trunk/framework/pull-agent/pom.xml Tue Oct 11 00:59:51 2011
@@ -49,6 +49,7 @@
<exclude>**/*Postgresql*.java</exclude>
</excludes>
<forkMode>always</forkMode>
+ <workingDirectory>target/test-output</workingDirectory>
</configuration>
</plugin>
</plugins>
Modified: incubator/lcf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/pom.xml?rev=1181324&r1=1181323&r2=1181324&view=diff
==============================================================================
--- incubator/lcf/trunk/pom.xml (original)
+++ incubator/lcf/trunk/pom.xml Tue Oct 11 00:59:51 2011
@@ -94,7 +94,6 @@
<configuration>
<forkMode>always</forkMode>
<excludes>
- <exclude>**/*HSQLDBTest.java</exclude>
<exclude>**/*PostgresqlTest.java</exclude>
</excludes>
</configuration>
@@ -104,28 +103,6 @@
<profiles>
<profile>
- <id>hsqldb</id>
- <build>
- <defaultGoal>test</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/*HSQLDBTest.java</include>
- </includes>
- </configuration>
- <executions>
- <execution>
- <phase>test</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>postgresql</id>
<build>
<defaultGoal>test</defaultGoal>
Modified: incubator/lcf/trunk/tests/cmis/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/cmis/pom.xml?rev=1181324&r1=1181323&r2=1181324&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/cmis/pom.xml (original)
+++ incubator/lcf/trunk/tests/cmis/pom.xml Tue Oct 11 00:59:51 2011
@@ -91,16 +91,16 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemPropertyVariables>
- <crawlerWarPath>target/dependency/mcf-crawler-ui-${project.version}.war</crawlerWarPath>
- <authorityserviceWarPath>target/dependency/mcf-authority-service-${project.version}.war</authorityserviceWarPath>
- <apiWarPath>target/dependency/mcf-api-service-${project.version}.war</apiWarPath>
- <openCmisServerWarPath>target/dependency/chemistry-opencmis-server-inmemory-war-0.5.0-SNAPSHOT.war</openCmisServerWarPath>
+ <crawlerWarPath>../dependency/mcf-crawler-ui-${project.version}.war</crawlerWarPath>
+ <authorityserviceWarPath>../dependency/mcf-authority-service-${project.version}.war</authorityserviceWarPath>
+ <apiWarPath>../dependency/mcf-api-service-${project.version}.war</apiWarPath>
+ <openCmisServerWarPath>../dependency/chemistry-opencmis-server-inmemory-war-0.5.0-SNAPSHOT.war</openCmisServerWarPath>
</systemPropertyVariables>
<excludes>
<exclude>**/*Postgresql*.java</exclude>
</excludes>
<forkMode>always</forkMode>
- <workingDirectory>.</workingDirectory>
+ <workingDirectory>target/test-output</workingDirectory>
</configuration>
</plugin>
</plugins>
Modified: incubator/lcf/trunk/tests/filesystem/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/filesystem/pom.xml?rev=1181324&r1=1181323&r2=1181324&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/filesystem/pom.xml (original)
+++ incubator/lcf/trunk/tests/filesystem/pom.xml Tue Oct 11 00:59:51 2011
@@ -75,16 +75,16 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemPropertyVariables>
- <crawlerWarPath>target/dependency/mcf-crawler-ui-${project.version}.war</crawlerWarPath>
- <authorityserviceWarPath>target/dependency/mcf-authority-service-${project.version}.war</authorityserviceWarPath>
- <apiWarPath>target/dependency/mcf-api-service-${project.version}.war</apiWarPath>
+ <crawlerWarPath>../dependency/mcf-crawler-ui-${project.version}.war</crawlerWarPath>
+ <authorityserviceWarPath>../dependency/mcf-authority-service-${project.version}.war</authorityserviceWarPath>
+ <apiWarPath>../dependency/mcf-api-service-${project.version}.war</apiWarPath>
</systemPropertyVariables>
<excludes>
<exclude>**/*Postgresql*.java</exclude>
<exclude>**/*HSQLDB*.java</exclude>
</excludes>
<forkMode>always</forkMode>
- <workingDirectory>.</workingDirectory>
+ <workingDirectory>target/test-output</workingDirectory>
</configuration>
</plugin>