You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2017/12/22 15:21:21 UTC
[sling-org-apache-sling-testing-paxexam] 08/11: SLING-7080 Update
options and versions to latest features
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-paxexam.git
commit 0c7e093771b39fefce5175b34787aa37e8310604
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Dec 22 15:10:20 2017 +0100
SLING-7080 Update options and versions to latest features
---
.../apache/sling/testing/paxexam/SlingOptions.java | 70 +++++++++++-----------
src/main/resources/templates/SlingOptions.txt | 8 +--
2 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
index 19cc2f1..1ccafa4 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -613,7 +613,31 @@ public class SlingOptions {
);
}
- public static Option slingLaunchpadNosqlCouchbase() {
+ public static Option slingNosqlGeneric() {
+ return composite(
+ sling(),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.nosql.generic").version(versionResolver)
+ );
+ }
+
+ public static Option slingNosqlCouchbase() {
+ return composite(
+ slingNosqlGeneric(),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.nosql.couchbase-client").version(versionResolver),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.nosql.couchbase-resourceprovider").version(versionResolver),
+ mavenBundle().groupId("io.wcm.osgi.wrapper").artifactId("io.wcm.osgi.wrapper.rxjava").version(versionResolver)
+ );
+ }
+
+ public static Option slingNosqlMongodb() {
+ return composite(
+ slingNosqlGeneric(),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.nosql.mongodb-resourceprovider").version(versionResolver),
+ mavenBundle().groupId("org.mongodb").artifactId("mongo-java-driver").version(versionResolver)
+ );
+ }
+
+ public static Option slingQuickstartNosqlCouchbase() {
return composite(
slingNosqlCouchbase(),
factoryConfiguration("org.apache.sling.nosql.couchbase.resourceprovider.CouchbaseNoSqlResourceProviderFactory.factory.config")
@@ -628,7 +652,7 @@ public class SlingOptions {
);
}
- public static Option slingLaunchpadNosqlMongodb() {
+ public static Option slingQuickstartNosqlMongodb() {
return composite(
slingNosqlMongodb(),
factoryConfiguration("org.apache.sling.nosql.mongodb.resourceprovider.MongoDBNoSqlResourceProviderFactory.factory.config")
@@ -640,7 +664,7 @@ public class SlingOptions {
);
}
- public static Option slingLaunchpadOak() {
+ public static Option slingQuickstartOak() {
return composite(
webconsole(),
sling(),
@@ -692,9 +716,9 @@ public class SlingOptions {
);
}
- public static Option slingLaunchpadOakTar() {
+ public static Option slingQuickstartOakTar() {
return composite(
- slingLaunchpadOak(),
+ slingQuickstartOak(),
mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-lucene").version(versionResolver),
mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-segment-tar").version(versionResolver),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.oak.server").version(versionResolver),
@@ -708,9 +732,9 @@ public class SlingOptions {
);
}
- public static Option slingLaunchpadOakMongo() {
+ public static Option slingQuickstartOakMongo() {
return composite(
- slingLaunchpadOak(),
+ slingQuickstartOak(),
mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-lucene").version(versionResolver),
mavenBundle().groupId("org.mongodb").artifactId("mongo-java-driver").version(versionResolver),
mavenBundle().groupId("com.h2database").artifactId("h2-mvstore").version(versionResolver),
@@ -726,30 +750,6 @@ public class SlingOptions {
);
}
- public static Option slingNosqlGeneric() {
- return composite(
- sling(),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.nosql.generic").version(versionResolver)
- );
- }
-
- public static Option slingNosqlCouchbase() {
- return composite(
- slingNosqlGeneric(),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.nosql.couchbase-client").version(versionResolver),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.nosql.couchbase-resourceprovider").version(versionResolver),
- mavenBundle().groupId("io.wcm.osgi.wrapper").artifactId("io.wcm.osgi.wrapper.rxjava").version(versionResolver)
- );
- }
-
- public static Option slingNosqlMongodb() {
- return composite(
- slingNosqlGeneric(),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.nosql.mongodb-resourceprovider").version(versionResolver),
- mavenBundle().groupId("org.mongodb").artifactId("mongo-java-driver").version(versionResolver)
- );
- }
-
public static Option slingScripting() {
return composite(
sling(),
@@ -938,12 +938,12 @@ public class SlingOptions {
);
}
- public static Option slingLaunchpadOakTar(final String workingDirectory, final int httpPort) {
+ public static Option slingQuickstartOakTar(final String workingDirectory, final int httpPort) {
final String slingHome = String.format("%s/sling", workingDirectory);
final String repositoryHome = String.format("%s/repository", slingHome);
final String localIndexDir = String.format("%s/index", repositoryHome);
return composite(
- slingLaunchpadOak(),
+ slingQuickstartOak(),
mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-lucene").version(versionResolver),
mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-segment-tar").version(versionResolver),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.oak.server").version(versionResolver),
@@ -960,12 +960,12 @@ public class SlingOptions {
);
}
- public static Option slingLaunchpadOakMongo(final String workingDirectory, final int httpPort, final String mongouri) {
+ public static Option slingQuickstartOakMongo(final String workingDirectory, final int httpPort, final String mongouri) {
final String slingHome = String.format("%s/sling", workingDirectory);
final String repositoryHome = String.format("%s/repository", slingHome);
final String localIndexDir = String.format("%s/index", repositoryHome);
return composite(
- slingLaunchpadOak(),
+ slingQuickstartOak(),
mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-lucene").version(versionResolver),
mavenBundle().groupId("org.mongodb").artifactId("mongo-java-driver").version(versionResolver),
mavenBundle().groupId("com.h2database").artifactId("h2-mvstore").version(versionResolver),
diff --git a/src/main/resources/templates/SlingOptions.txt b/src/main/resources/templates/SlingOptions.txt
index 21198ed..ff7673a 100644
--- a/src/main/resources/templates/SlingOptions.txt
+++ b/src/main/resources/templates/SlingOptions.txt
@@ -128,12 +128,12 @@ public class SlingOptions {
);
}
-[/] public static Option slingLaunchpadOakTar(final String workingDirectory, final int httpPort) {
+[/] public static Option slingQuickstartOakTar(final String workingDirectory, final int httpPort) {
final String slingHome = String.format("%s/sling", workingDirectory);
final String repositoryHome = String.format("%s/repository", slingHome);
final String localIndexDir = String.format("%s/index", repositoryHome);
return composite(
- slingLaunchpadOak(),
+ slingQuickstartOak(),
mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-lucene").version(versionResolver),
mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-segment-tar").version(versionResolver),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.oak.server").version(versionResolver),
@@ -150,12 +150,12 @@ public class SlingOptions {
);
}
- public static Option slingLaunchpadOakMongo(final String workingDirectory, final int httpPort, final String mongouri) {
+ public static Option slingQuickstartOakMongo(final String workingDirectory, final int httpPort, final String mongouri) {
final String slingHome = String.format("%s/sling", workingDirectory);
final String repositoryHome = String.format("%s/repository", slingHome);
final String localIndexDir = String.format("%s/index", repositoryHome);
return composite(
- slingLaunchpadOak(),
+ slingQuickstartOak(),
mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-lucene").version(versionResolver),
mavenBundle().groupId("org.mongodb").artifactId("mongo-java-driver").version(versionResolver),
mavenBundle().groupId("com.h2database").artifactId("h2-mvstore").version(versionResolver),
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.