Author: tommaso
Date: Thu Mar 12 13:22:51 2015
New Revision: 1666181
URL: http://svn.apache.org/r1666181
Log:
OAK-2476 - changing ns-fixturex variable to nsfixture to make Groovy happy (and
me sad)
Modified:
jackrabbit/oak/trunk/.travis.yml
jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FixturesHelper.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/OakBaseTest.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java
jackrabbit/oak/trunk/oak-parent/pom.xml
Modified: jackrabbit/oak/trunk/.travis.yml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/.travis.yml?rev=1666181&r1=1666180&r2=1666181&view=diff
==============================================================================
--- jackrabbit/oak/trunk/.travis.yml (original)
+++ jackrabbit/oak/trunk/.travis.yml Thu Mar 12 13:22:51 2015
@@ -17,8 +17,8 @@ install: true
env:
- PROFILE=pedantic
- PROFILE=unittesting
- - PROFILE=integrationTesting FIXTURES="-Dns-fixtures=SEGMENT_MK"
SUREFIRE_SKIP="-Dsurefire.skip.ut=true"
- - PROFILE=integrationTesting
FIXTURES="-Dns-fixtures=DOCUMENT_MK,DOCUMENT_NS,DOCUMENT_RDB"
SUREFIRE_SKIP="-Dsurefire.skip.ut=true"
+ - PROFILE=integrationTesting FIXTURES="-Dnsfixtures=SEGMENT_MK"
SUREFIRE_SKIP="-Dsurefire.skip.ut=true"
+ - PROFILE=integrationTesting
FIXTURES="-Dnsfixtures=DOCUMENT_MK,DOCUMENT_NS,DOCUMENT_RDB"
SUREFIRE_SKIP="-Dsurefire.skip.ut=true"
script: "mvn verify -P${PROFILE} ${FIXTURES} ${SUREFIRE_SKIP}"
language: java
jdk:
Modified:
jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FixturesHelper.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FixturesHelper.java?rev=1666181&r1=1666180&r2=1666181&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FixturesHelper.java
(original)
+++
jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FixturesHelper.java
Thu Mar 12 13:22:51 2015
@@ -22,8 +22,8 @@ import java.util.EnumSet;
import java.util.Set;
/**
- * helper class that return the list of available fixtures based on the {@code
ns-fixtures} system
- * property ({@code -Dns-fixtures=SEGMENT_MK}).
+ * helper class that return the list of available fixtures based on the {@code
nsfixtures} system
+ * property ({@code -Dnsfixtures=SEGMENT_MK}).
*
* See {@link FixturesHelper.Fixture} for a list of available fixtures
*/
@@ -35,12 +35,12 @@ public final class FixturesHelper {
/**
* System property to be used.
*/
- public static final String NS_FIXTURES = "ns-fixtures";
+ public static final String NS_FIXTURES = "nsfixtures";
private FixturesHelper() { }
/**
- * default fixtures when no {@code ns-fixtures} is provided
+ * default fixtures when no {@code nsfixtures} is provided
*/
public enum Fixture {
DOCUMENT_MK, DOCUMENT_NS, SEGMENT_MK, DOCUMENT_RDB, MEMORY_NS
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/OakBaseTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/OakBaseTest.java?rev=1666181&r1=1666180&r2=1666181&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/OakBaseTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/OakBaseTest.java
Thu Mar 12 13:22:51 2015
@@ -39,7 +39,7 @@ import org.junit.runners.Parameterized;
public abstract class OakBaseTest {
/**
- * The system property "ns-fixtures" can be used to provide a
+ * The system property "nsfixtures" can be used to provide a
* whitespace-separated list of fixtures names for which the
* tests should be run (the default is to use all fixtures).
*/
Modified:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java?rev=1666181&r1=1666180&r2=1666181&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java
Thu Mar 12 13:22:51 2015
@@ -61,7 +61,7 @@ public abstract class AbstractRepository
private Session adminSession;
/**
- * The system property "ns-fixtures" can be used to provide a
+ * The system property "nsfixtures" can be used to provide a
* whitespace-separated list of fixtures names for which the
* tests should be run (the default is to use all fixtures).
*/
Modified: jackrabbit/oak/trunk/oak-parent/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-parent/pom.xml?rev=1666181&r1=1666180&r2=1666181&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-parent/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-parent/pom.xml Thu Mar 12 13:22:51 2015
@@ -182,7 +182,7 @@
<mongo.db>${mongo.db}</mongo.db>
<mongo.db2>${mongo.db2}</mongo.db2>
<segment.db>${segment.db}</segment.db>
- <ns-fixtures>${fixtures}</ns-fixtures>
+ <nsfixtures>${fixtures}</nsfixtures>
</systemPropertyVariables>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration>
@@ -197,7 +197,7 @@
<mongo.port>${mongo.port}</mongo.port>
<mongo.db>${mongo.db}</mongo.db>
<mongo.db2>${mongo.db2}</mongo.db2>
- <ns-fixtures>${fixtures}</ns-fixtures>
+ <nsfixtures>${fixtures}</nsfixtures>
</systemPropertyVariables>
</configuration>
</plugin>
