svn commit: r1562437 - in /sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl: MergedResourceProvider.java MergedResourceProviderFactory.java

[cz...@apache.org]

Author: cziegeler
Date: Wed Jan 29 13:30:36 2014
New Revision: 1562437

URL: http://svn.apache.org/r1562437
Log:
SLING-2986 : remove accidentally added security property

Modified:
    sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourceProvider.java
    sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderFactory.java

Modified: sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourceProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourceProvider.java?rev=1562437&r1=1562436&r2=1562437&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourceProvider.java (original)
+++ sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourceProvider.java Wed Jan 29 13:30:36 2014
@@ -40,30 +40,30 @@ public class MergedResourceProvider impl
 
     private final String mergeRootPath;
 
-    public MergedResourceProvider(String mergeRootPath) {
+    public MergedResourceProvider(final String mergeRootPath) {
         this.mergeRootPath = mergeRootPath;
     }
 
     /**
      * {@inheritDoc}
      */
-    public Resource getResource(ResourceResolver resolver, HttpServletRequest request, String path) {
+    public Resource getResource(final ResourceResolver resolver, final HttpServletRequest request, final String path) {
         return getResource(resolver, path);
     }
 
     /**
      * {@inheritDoc}
      */
-    public Resource getResource(ResourceResolver resolver, String path) {
+    public Resource getResource(final ResourceResolver resolver, final String path) {
         List<String> mappedResources = new ArrayList<String>();
 
         if (resolver.getSearchPath() != null) {
-            String relativePath = getRelativePath(path);
+            final String relativePath = getRelativePath(path);
 
             // Loop over provided base paths
-            for (String basePath : resolver.getSearchPath()) {
+            for (final String basePath : resolver.getSearchPath()) {
                 // Try to get the corresponding physical resource for this base path
-                Resource baseRes = resolver.getResource(ResourceUtil.normalize(basePath + "/" + relativePath));
+                final Resource baseRes = resolver.getResource(ResourceUtil.normalize(basePath + "/" + relativePath));
                 if (baseRes != null) {
                     // Physical resource exists, add it to the list of mapped resources
                     mappedResources.add(0, baseRes.getPath());
@@ -83,7 +83,7 @@ public class MergedResourceProvider impl
     /**
      * {@inheritDoc}
      */
-    public Iterator<Resource> listChildren(Resource resource) {
+    public Iterator<Resource> listChildren(final Resource resource) {
         if (resource instanceof MergedResource) {
             MergedResource mergedResource = (MergedResource) resource;
             ResourceResolver resolver = mergedResource.getResourceResolver();

Modified: sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderFactory.java?rev=1562437&r1=1562436&r2=1562437&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderFactory.java (original)
+++ sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderFactory.java Wed Jan 29 13:30:36 2014
@@ -37,9 +37,7 @@ import org.apache.sling.commons.osgi.Pro
 @Properties({
     @Property(name = ResourceProvider.ROOTS, value=MergedResourceProviderFactory.DEFAULT_ROOT,
             label="Root",
-            description="The mount point of merged resources"),
-    @Property(name = ResourceProvider.USE_RESOURCE_ACCESS_SECURITY, boolValue=true,
-              label="Secure", description="If enabled additional access checks are performed")
+            description="The mount point of merged resources")
 })
 /**
  * The <code>MergedResourceProviderFactory</code> creates merged resource