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 09:58:43 UTC
[sling-org-apache-sling-resourcemerger] 03/24: SLING-2986 : remove
accidentally added security property
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.resourcemerger-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourcemerger.git
commit 4e7cb836dd29864eac64ecafacb883eb878106a8
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Jan 29 13:30:36 2014 +0000
SLING-2986 : remove accidentally added security property
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/resourcemerger@1562437 13f79535-47bb-0310-9956-ffa450edef68
---
.../sling/resourcemerger/impl/MergedResourceProvider.java | 14 +++++++-------
.../resourcemerger/impl/MergedResourceProviderFactory.java | 4 +---
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourceProvider.java b/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourceProvider.java
index 64d835c..8a57510 100644
--- a/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourceProvider.java
+++ b/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourceProvider.java
@@ -40,30 +40,30 @@ public class MergedResourceProvider implements ResourceProvider {
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 implements ResourceProvider {
/**
* {@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();
diff --git a/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderFactory.java b/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderFactory.java
index 159738c..4fd955c 100644
--- a/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderFactory.java
+++ b/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderFactory.java
@@ -37,9 +37,7 @@ import org.apache.sling.commons.osgi.PropertiesUtil;
@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
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.