You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 10:20:26 UTC
[sling-org-apache-sling-testing-paxexam] 46/48: update SlingOptions
and SlingVersionResolver
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.testing.paxexam-0.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-paxexam.git
commit 60e45a3ff7a33911c05cbe07146ab1275ae9ac37
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sun Aug 14 07:15:37 2016 +0000
update SlingOptions and SlingVersionResolver
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/org.apache.sling.testing.paxexam@1756301 13f79535-47bb-0310-9956-ffa450edef68
---
.../apache/sling/testing/paxexam/SlingOptions.java | 347 ++++++++++-----------
.../testing/paxexam/SlingVersionResolver.java | 6 +-
2 files changed, 174 insertions(+), 179 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 4d2588a..0cc1101 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -143,6 +143,21 @@ public class SlingOptions {
);
}
+ public static Option slingAuthOpenid() {
+ return composite(
+ sling(),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.auth.openid").version(versionResolver)
+ );
+ }
+
+ public static Option slingAuthSelector() {
+ return composite(
+ slingAuthForm(),
+ slingAuthOpenid(),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.auth.selector").version(versionResolver)
+ );
+ }
+
public static Option slingCommonsCompiler() {
return composite(
slingCommonsClassloader(),
@@ -167,6 +182,13 @@ public class SlingOptions {
);
}
+ public static Option slingCommonsHtml() {
+ return composite(
+ scr(),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.html").version(versionResolver)
+ );
+ }
+
public static Option slingCommonsMetrics() {
return composite(
scr(),
@@ -241,6 +263,20 @@ public class SlingOptions {
);
}
+ public static Option slingExtensionDistribution() {
+ return composite(
+ sling(),
+ slingJcr(),
+ slingExtensionEvent(),
+ slingExtensionHealthcheck(),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.distribution.api").version(versionResolver),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.distribution.core").version(versionResolver),
+ mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpcore-osgi").version(versionResolver),
+ mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpclient-osgi").version(versionResolver),
+ mavenBundle().groupId("org.apache.jackrabbit.vault").artifactId("org.apache.jackrabbit.vault").version(versionResolver)
+ );
+ }
+
public static Option slingExtensionEvent() {
return composite(
sling(),
@@ -273,6 +309,18 @@ public class SlingOptions {
);
}
+ public static Option slingExtensionHealthcheck() {
+ return composite(
+ sling(),
+ slingJcr(),
+ slingScripting(),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.hc.core").version(versionResolver),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.hc.jmx").version(versionResolver),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.hc.support").version(versionResolver),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.hc.webconsole").version(versionResolver)
+ );
+ }
+
public static Option slingExtensionI18n() {
return composite(
sling(),
@@ -295,6 +343,13 @@ public class SlingOptions {
);
}
+ public static Option slingExtensionQuery() {
+ return composite(
+ sling(),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.query").version(versionResolver)
+ );
+ }
+
public static Option slingExtensionResourceInventory() {
return composite(
sling(),
@@ -303,12 +358,42 @@ public class SlingOptions {
);
}
+ public static Option slingExtensionResourcemerger() {
+ return composite(
+ sling(),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.resourcemerger").version(versionResolver)
+ );
+ }
+
+ public static Option slingExtensionRewriter() {
+ return composite(
+ sling(),
+ slingCommonsHtml(),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.rewriter").version(versionResolver)
+ );
+ }
+
+ public static Option slingExtensionSecurity() {
+ return composite(
+ sling(),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.security").version(versionResolver)
+ );
+ }
+
public static Option slingExtensionThreaddump() {
return composite(
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.extensions.threaddump").version(versionResolver)
);
}
+ public static Option slingExtensionUrlrewriter() {
+ return composite(
+ sling(),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.urlrewriter").version(versionResolver),
+ mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.urlrewritefilter").version(versionResolver)
+ );
+ }
+
public static Option slingExtensionXss() {
return composite(
sling(),
@@ -403,6 +488,33 @@ public class SlingOptions {
);
}
+ public static Option slingLaunchpadNosqlCouchbase() {
+ return composite(
+ slingNosqlCouchbase(),
+ factoryConfiguration("org.apache.sling.nosql.couchbase.resourceprovider.CouchbaseNoSqlResourceProviderFactory.factory.config")
+ .put("provider.roots", "[\"/\"]")
+ .asOption(),
+ factoryConfiguration("org.apache.sling.nosql.couchbase.client.CouchbaseClient.factory.config")
+ .put("bucketName", "sling")
+ .put("enabled", "true")
+ .put("couchbaseHosts", "localhost:8091")
+ .put("clientId", "sling-resourceprovider-couchbase")
+ .asOption()
+ );
+ }
+
+ public static Option slingLaunchpadNosqlMongodb() {
+ return composite(
+ slingNosqlMongodb(),
+ factoryConfiguration("org.apache.sling.nosql.mongodb.resourceprovider.MongoDBNoSqlResourceProviderFactory.factory.config")
+ .put("collection", "resources")
+ .put("database", "sling")
+ .put("connectionString", "localhost:27017")
+ .put("provider.roots", "[\"/\"]")
+ .asOption()
+ );
+ }
+
public static Option slingLaunchpadOak() {
return composite(
webconsole(),
@@ -415,16 +527,11 @@ public class SlingOptions {
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.prefs").version(versionResolver),
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.webconsole.plugins.memoryusage").version(versionResolver),
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.webconsole.plugins.packageadmin").version(versionResolver),
- newConfiguration("org.apache.sling.jcr.repoinit.impl.RepositoryInitializer")
- .put("model.section.name", "")
- .put("text.url", "classpath://org.apache.sling.karaf-repoinit/repoinit.txt")
- .asOption(),
newConfiguration("org.apache.sling.resourceresolver.impl.observation.OsgiObservationBridge")
- .put("resource.change.types", "[\"ADDED\", \"CHANGED\", \"REMOVED\"]")
- .put("resource.paths", "/")
+ .put("enabled", "true")
.asOption(),
factoryConfiguration("org.apache.felix.jaas.Configuration.factory")
- .put("jaas.ranking", "I\"300\"")
+ .put("jaas.ranking", "300")
.put("jaas.classname", "org.apache.jackrabbit.oak.spi.security.authentication.GuestLoginModule")
.put("jaas.controlFlag", "optional")
.asOption(),
@@ -433,7 +540,7 @@ public class SlingOptions {
.put("jaas.controlFlag", "required")
.asOption(),
factoryConfiguration("org.apache.felix.jaas.Configuration.factory")
- .put("jaas.ranking", "I\"200\"")
+ .put("jaas.ranking", "200")
.put("jaas.classname", "org.apache.jackrabbit.oak.security.authentication.token.TokenLoginModule")
.put("jaas.controlFlag", "sufficient")
.asOption(),
@@ -491,6 +598,30 @@ 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(),
@@ -500,6 +631,26 @@ public class SlingOptions {
);
}
+ public static Option slingScriptingGroovy() {
+ return composite(
+ sling(),
+ slingScripting(),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.groovy").version(versionResolver),
+ mavenBundle().groupId("org.codehaus.groovy").artifactId("groovy").version(versionResolver),
+ mavenBundle().groupId("org.codehaus.groovy").artifactId("groovy-json").version(versionResolver),
+ mavenBundle().groupId("org.codehaus.groovy").artifactId("groovy-templates").version(versionResolver)
+ );
+ }
+
+ public static Option slingScriptingJava() {
+ return composite(
+ sling(),
+ slingScripting(),
+ slingCommonsCompiler(),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.java").version(versionResolver)
+ );
+ }
+
public static Option slingScriptingJavascript() {
return composite(
slingScripting(),
@@ -531,6 +682,16 @@ public class SlingOptions {
);
}
+ public static Option slingScriptingThymeleaf() {
+ return composite(
+ sling(),
+ slingScripting(),
+ slingExtensionI18n(),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.thymeleaf").version(versionResolver),
+ mavenBundle().groupId("org.javassist").artifactId("javassist").version(versionResolver)
+ );
+ }
+
public static Option slingServlets() {
return composite(
sling(),
@@ -551,14 +712,14 @@ public class SlingOptions {
mavenBundle().groupId("org.apache.jackrabbit").artifactId("jackrabbit-spi-commons").version(versionResolver),
mavenBundle().groupId("org.apache.jackrabbit").artifactId("jackrabbit-webdav").version(versionResolver),
mavenBundle().groupId("javax.jcr").artifactId("jcr").version(versionResolver),
+ mavenBundle().groupId("javax.servlet").artifactId("javax.servlet-api").version(versionResolver),
mavenBundle().groupId("commons-codec").artifactId("commons-codec").version(versionResolver),
mavenBundle().groupId("commons-collections").artifactId("commons-collections").version(versionResolver),
mavenBundle().groupId("commons-fileupload").artifactId("commons-fileupload").version(versionResolver),
mavenBundle().groupId("commons-io").artifactId("commons-io").version(versionResolver),
mavenBundle().groupId("commons-lang").artifactId("commons-lang").version(versionResolver),
- mavenBundle().groupId("org.apache.geronimo.bundles").artifactId("commons-httpclient").version(versionResolver),
mavenBundle().groupId("com.google.guava").artifactId("guava").version(versionResolver),
- mavenBundle().groupId("javax.servlet").artifactId("javax.servlet-api").version(versionResolver),
+ mavenBundle().groupId("org.apache.geronimo.bundles").artifactId("commons-httpclient").version(versionResolver),
mavenBundle().groupId("org.apache.geronimo.specs").artifactId("geronimo-atinject_1.0_spec").version(versionResolver),
mavenBundle().groupId("org.apache.geronimo.specs").artifactId("geronimo-el_2.2_spec").version(versionResolver),
mavenBundle().groupId("org.apache.geronimo.specs").artifactId("geronimo-interceptor_1.1_spec").version(versionResolver),
@@ -574,172 +735,6 @@ public class SlingOptions {
);
}
- public static Option slingAuthOpenid() {
- return composite(
- sling(),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.auth.openid").version(versionResolver)
- );
- }
-
- public static Option slingAuthSelector() {
- return composite(
- slingAuthForm(),
- slingAuthOpenid(),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.auth.selector").version(versionResolver)
- );
- }
-
- public static Option slingCommonsHtml() {
- return composite(
- scr(),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.html").version(versionResolver)
- );
- }
-
- public static Option slingExtensionDistribution() {
- return composite(
- sling(),
- slingJcr(),
- slingExtensionEvent(),
- slingExtensionHealthcheck(),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.distribution.api").version(versionResolver),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.distribution.core").version(versionResolver),
- mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpcore-osgi").version(versionResolver),
- mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpclient-osgi").version(versionResolver),
- mavenBundle().groupId("org.apache.jackrabbit.vault").artifactId("org.apache.jackrabbit.vault").version(versionResolver)
- );
- }
-
- public static Option slingExtensionHealthcheck() {
- return composite(
- sling(),
- slingJcr(),
- slingScripting(),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.hc.core").version(versionResolver),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.hc.jmx").version(versionResolver),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.hc.support").version(versionResolver),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.hc.webconsole").version(versionResolver)
- );
- }
-
- public static Option slingExtensionQuery() {
- return composite(
- sling(),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.query").version(versionResolver)
- );
- }
-
- public static Option slingExtensionResourcemerger() {
- return composite(
- sling(),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.resourcemerger").version(versionResolver)
- );
- }
-
- public static Option slingExtensionRewriter() {
- return composite(
- sling(),
- slingCommonsHtml(),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.rewriter").version(versionResolver)
- );
- }
-
- public static Option slingExtensionSecurity() {
- return composite(
- sling(),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.security").version(versionResolver)
- );
- }
-
- public static Option slingExtensionUrlrewriter() {
- return composite(
- sling(),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.urlrewriter").version(versionResolver),
- mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.urlrewritefilter").version(versionResolver)
- );
- }
-
- public static Option slingLaunchpadNosqlCouchbase() {
- return composite(
- slingNosqlCouchbase(),
- factoryConfiguration("org.apache.sling.nosql.couchbase.resourceprovider.CouchbaseNoSqlResourceProviderFactory.factory.config")
- .put("provider.roots", "[\"/\"]")
- .asOption(),
- factoryConfiguration("org.apache.sling.nosql.couchbase.client.CouchbaseClient.factory.config")
- .put("bucketName", "sling")
- .put("enabled", "B\"true\"")
- .put("couchbaseHosts", "localhost:8091")
- .put("clientId", "sling-resourceprovider-couchbase")
- .asOption()
- );
- }
-
- public static Option slingLaunchpadNosqlMongodb() {
- return composite(
- slingNosqlMongodb(),
- factoryConfiguration("org.apache.sling.nosql.mongodb.resourceprovider.MongoDBNoSqlResourceProviderFactory.factory.config")
- .put("collection", "resources")
- .put("database", "sling")
- .put("connectionString", "localhost:27017")
- .put("provider.roots", "[\"/\"]")
- .asOption()
- );
- }
-
- 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 slingScriptingGroovy() {
- return composite(
- sling(),
- slingScripting(),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.groovy").version(versionResolver),
- mavenBundle().groupId("org.codehaus.groovy").artifactId("groovy").version(versionResolver),
- mavenBundle().groupId("org.codehaus.groovy").artifactId("groovy-json").version(versionResolver),
- mavenBundle().groupId("org.codehaus.groovy").artifactId("groovy-templates").version(versionResolver)
- );
- }
-
- public static Option slingScriptingJava() {
- return composite(
- sling(),
- slingScripting(),
- slingCommonsCompiler(),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.java").version(versionResolver)
- );
- }
-
- public static Option slingScriptingThymeleaf() {
- return composite(
- sling(),
- slingScripting(),
- slingExtensionI18n(),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.thymeleaf").version(versionResolver),
- mavenBundle().groupId("org.javassist").artifactId("javassist").version(versionResolver)
- );
- }
-
public static Option composumSling() {
return composite(
sling(),
diff --git a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
index b42cd76..757e2aa 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -124,7 +124,7 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.sling:org.apache.sling.distribution.api", "0.3.0");
versions.put("org.apache.sling:org.apache.sling.distribution.core", "0.1.18");
versions.put("org.apache.sling:org.apache.sling.engine", "2.4.6");
- versions.put("org.apache.sling:org.apache.sling.event", "4.0.2");
+ versions.put("org.apache.sling:org.apache.sling.event", "4.1.0");
versions.put("org.apache.sling:org.apache.sling.event.dea", "1.0.4");
versions.put("org.apache.sling:org.apache.sling.extensions.explorer", "1.0.4");
versions.put("org.apache.sling:org.apache.sling.extensions.threaddump", "0.2.2");
@@ -134,7 +134,7 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.sling:org.apache.sling.hc.jmx", "1.0.6");
versions.put("org.apache.sling:org.apache.sling.hc.support", "1.0.4");
versions.put("org.apache.sling:org.apache.sling.hc.webconsole", "1.1.2");
- versions.put("org.apache.sling:org.apache.sling.i18n", "2.4.6");
+ versions.put("org.apache.sling:org.apache.sling.i18n", "2.4.10");
versions.put("org.apache.sling:org.apache.sling.installer.console", "1.0.0");
versions.put("org.apache.sling:org.apache.sling.installer.core", "3.6.8");
versions.put("org.apache.sling:org.apache.sling.installer.factory.configuration", "1.1.2");
@@ -190,7 +190,7 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.codehaus.groovy:groovy-json", "2.4.7");
versions.put("org.codehaus.groovy:groovy-templates", "2.4.7");
versions.put("org.javassist:javassist", "3.20.0-GA");
- versions.put("org.mongodb:mongo-java-driver", "2.14.2");
+ versions.put("org.mongodb:mongo-java-driver", "2.14.3");
}
private String key(final String groupId, final String artifactId) {
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.