You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by to...@apache.org on 2015/10/22 15:06:27 UTC
svn commit: r1710009 [2/2] - in /sling/trunk: bundles/jcr/resource/
bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/
bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/
bundles/jcr/resource/sr...
Modified: sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryActivator.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryActivator.java?rev=1710009&r1=1710008&r2=1710009&view=diff
==============================================================================
--- sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryActivator.java (original)
+++ sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryActivator.java Thu Oct 22 13:06:27 2015
@@ -137,7 +137,7 @@ public class ResourceResolverFactoryActi
private static final String PROP_ALLOW_DIRECT = "resource.resolver.allowDirect";
@Property(unbounded=PropertyUnbounded.ARRAY,
- value = "org.apache.sling.jcr.resource.internal.helper.jcr.JcrResourceProviderFactory",
+ value = "org.apache.sling.jcr.resource.internal.helper.jcr.JcrResourceProvider",
label = "Required Providers",
description = "A resource resolver factory is only " +
"available (registered) if all resource providers mentioned in this configuration " +
Modified: sling/trunk/launchpad/builder/src/main/provisioning/sling.txt
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/sling.txt?rev=1710009&r1=1710008&r2=1710009&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/provisioning/sling.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/sling.txt Thu Oct 22 13:06:27 2015
@@ -29,7 +29,7 @@
org.apache.httpcomponents/httpcore-osgi/4.4
org.apache.httpcomponents/httpclient-osgi/4.4
org.apache.sling/org.apache.sling.adapter/2.1.6
- org.apache.sling/org.apache.sling.api/2.9.0
+ org.apache.sling/org.apache.sling.api/2.9.1-SNAPSHOT
org.apache.sling/org.apache.sling.auth.core/1.3.12
org.apache.sling/org.apache.sling.auth.form/1.0.8
org.apache.sling/org.apache.sling.bundleresource.impl/2.2.0
@@ -55,7 +55,7 @@
org.apache.sling/org.apache.sling.launchpad.content/2.0.8
org.apache.sling/org.apache.sling.models.api/1.2.2
org.apache.sling/org.apache.sling.models.impl/1.2.2
- org.apache.sling/org.apache.sling.resourceresolver/1.2.6
+ org.apache.sling/org.apache.sling.resourceresolver/1.2.7-SNAPSHOT
org.apache.sling/org.apache.sling.scripting.api/2.1.8
org.apache.sling/org.apache.sling.scripting.core/2.0.34
org.apache.sling/org.apache.sling.scripting.javascript/2.0.26