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:00:18 UTC
[sling-org-apache-sling-resourceresolver] annotated tag
org.apache.sling.resourceresolver-1.0.2 created (now e1568b9)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to annotated tag org.apache.sling.resourceresolver-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourceresolver.git.
at e1568b9 (tag)
tagging 41ff730ad3d778fd30c46d81554498db72ec477d (commit)
by Carsten Ziegeler
on Sat Dec 15 14:53:38 2012 +0000
- Log -----------------------------------------------------------------
org.apache.sling.resourceresolver-1.0.2
-----------------------------------------------------------------------
This annotated tag includes the following new commits:
new 777e1fc SLING-2396 : Add new resourceresolver project
new 6163957 SLING-2396 : Add new resourceresolver project
new e5ad427 SLING-2396 : Add new resourceresolver project
new 5050b38 SLING-2396 : Add new resourceresolver project
new 2f0f1e5 SLING-2396 : Add new resourceresolver project
new 05106cb fixing build for a fresh environment
new 17f193b Update to latest parent pom
new 95f0ba7 Use released versions
new dba4068 Remove unused code
new 5454cb5 SLING-2530 : Implement CRUD based on resources (WiP)
new c9375a7 SLING-2530 : Implement CRUD based on resources (WiP)
new fd67f24 SLING-2530 : Implement CRUD based on resources (WiP)
new e6a6bee SLING-2530 : Implement CRUD based on resources (WiP)
new 3c93301 SLING-2530 : Implement CRUD based on resources
new 32ed7ac SLING-2530 : Implement CRUD based on resources
new 84d0fb0 SLING-2530 : Implement CRUD based on resources
new d022f3e SLING-2530 : Implement CRUD based on resources
new c582423 SLING-2530 : Implement CRUD based on resources
new a45fd14 SLING-2530 : Implement CRUD based on resources
new eec4a61 SLING-2530 : Implement CRUD based on resources
new 17946c7 SLING-2530 : Implement CRUD based on resources
new d3d3c42 SLING-2396 : Add new resourceresolver project
new 656e8f1 SLING-2579 : ResourceResolverFactory should only be available if specific ResourceProvider/Factories are registered
new 1edd269 SLING-2583 - introducing MapConfigurationProvider interface
new b03e3d6 SLING-2521 - improving (dramatically) performance of sling:alias lookups during resolution by pre-caching aliases
new fcd45b8 SLING-2521 - handling jcr:content child node case
new 3165e3b SLING-2521 - handling duplicate alias case
new 41d61ea SLING-2521 - adding MapEntries unit test
new c848a2f SLING-2319 - fixing description of mapping property
new fce18b3 SLING-2560 Support reverse mapping with regular expressions: - sling:match may be a replacement pattern (with $1 etc. references) - sling:internalRedirect may be a regular expression - sling:internalRedirect regaular expressions ignored for the resolution map
new 14913d4 SLING-2598 : Don't process already defined vanity paths
new 8906e03 SLING-2598 : Don't process already defined vanity paths
new 25fd2cd SLING-2530 : Implement CRUD based on resources
new 50e0528 SLING-2530 : Implement CRUD based on resources
new e8c3dc4 SLING-2530 : Implement CRUD based on resources
new bcf156e SLING-2530 : Implement CRUD based on resources
new 6076283 SLING-2626 : NPE in ResourceResolverImpl.getResource. Apply slightly modifed version of patch from Radu Cotescu
new 54a4a23 SLING-2541 : General mechanism to chain resource providers
new 0770ac0 SLING-2639 - adding check for extension in resource names with vanity paths
new 1d3c6a5 SLING-2640 - log current providers after bind/unbind
new 037450b SLING-2640 - ResourceProviderEntry did not correctly remove a root provider
new 7fcd9e3 SLING-2641 : Make listChildren() Iterable
new 239f607 SLING-2530 : Implement CRUD based on resources
new 55dde35 SLING-2530 : Implement CRUD based on resources
new b647a49 Preparing release
new 14e4425 [maven-release-plugin] prepare release org.apache.sling.resourceresolver-1.0.0
new ea248db [maven-release-plugin] prepare for next development iteration
new d4bf2a1 Set dependencies to latest snapshots after release
new 62fe67a SLING-2665 - allow the default redirect status code to be configured
new 9fe2e02 Update to released bundles
new a2175a4 SLING-2691 : Correctly update mapping if a jcr:content node is removed
new b7a268c SLING-2691 : Correctly update mapping if a jcr:content node is removed
new b53aaff SLING-2644 - Make the jackrabbit/accessmanager and jackrabbit/usermanager to work with newer servlets/post bundle
new 5cac90a Revert change to snapshot dependency
new ccb5f15 [maven-release-plugin] prepare release org.apache.sling.resourceresolver-1.0.2
new 41ff730 [maven-release-plugin] copy for tag org.apache.sling.resourceresolver-1.0.2
The 56 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
--
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].
[sling-org-apache-sling-resourceresolver] 10/10:
[maven-release-plugin] copy for tag org.apache.sling.resourceresolver-1.0.2
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.resourceresolver-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourceresolver.git
commit 41ff730ad3d778fd30c46d81554498db72ec477d
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Sat Dec 15 14:53:38 2012 +0000
[maven-release-plugin] copy for tag org.apache.sling.resourceresolver-1.0.2
git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.resourceresolver-1.0.2@1422258 13f79535-47bb-0310-9956-ffa450edef68
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-resourceresolver] 08/10: Revert change to
snapshot dependency
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.resourceresolver-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourceresolver.git
commit 5cac90a60d76d8c71e6da869d68e1d8ec757e64e
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Sat Dec 15 14:52:30 2012 +0000
Revert change to snapshot dependency
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/resourceresolver@1422256 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 974adbf..cec2716 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,7 +124,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.osgi</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-resourceresolver] 05/10: SLING-2691 :
Correctly update mapping if a jcr:content node is removed
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.resourceresolver-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourceresolver.git
commit a2175a445839abad2d5c27edea25868b4dfada19
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Dec 3 13:57:01 2012 +0000
SLING-2691 : Correctly update mapping if a jcr:content node is removed
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/resourceresolver@1416522 13f79535-47bb-0310-9956-ffa450edef68
---
.../sling/resourceresolver/impl/mapping/MapEntries.java | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java b/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
index 1c22135..7a5ff94 100644
--- a/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
+++ b/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
@@ -360,15 +360,21 @@ public class MapEntries implements EventHandler {
// check whether a remove event has an influence on vanity paths
boolean doInit = true;
if (SlingConstants.TOPIC_RESOURCE_REMOVED.equals(event.getTopic()) && !path.startsWith(this.mapRoot)) {
+ final String checkPath;
+ if ( path.endsWith("/jcr:content") ) {
+ checkPath = path.substring(0, path.length() - 12);
+ } else {
+ checkPath = path;
+ }
doInit = false;
for (final String target : this.vanityTargets) {
- if (target.startsWith(path)) {
+ if (target.startsWith(checkPath)) {
doInit = true;
break;
}
}
for (final String target : this.aliasMap.keySet()) {
- if (target.startsWith(path)) {
+ if (target.startsWith(checkPath)) {
doInit = true;
break;
}
@@ -747,7 +753,7 @@ public class MapEntries implements EventHandler {
PROP_REDIRECT_EXTERNAL_REDIRECT_STATUS, PROP_REDIRECT_EXTERNAL,
ResourceResolverImpl.PROP_REDIRECT_INTERNAL, PROP_REDIRECT_EXTERNAL_STATUS,
PROP_REG_EXP, ResourceResolverImpl.PROP_ALIAS };
- final String[] eventProps = { "resourceAddedAttributes", "resourceChangedAttributes", "resourceRemovedAttributes" };
+ final String[] eventProps = { SlingConstants.PROPERTY_ADDED_ATTRIBUTES, SlingConstants.PROPERTY_CHANGED_ATTRIBUTES, SlingConstants.PROPERTY_REMOVED_ATTRIBUTES };
final StringBuilder filter = new StringBuilder();
filter.append("(|");
for (final String eventProp : eventProps) {
@@ -757,7 +763,7 @@ public class MapEntries implements EventHandler {
}
filter.append(")");
}
- filter.append("(" + EventConstants.EVENT_TOPIC + "=" + SlingConstants.TOPIC_RESOURCE_REMOVED + ")");
+ filter.append("(").append(EventConstants.EVENT_TOPIC).append("=").append(SlingConstants.TOPIC_RESOURCE_REMOVED).append(")");
filter.append(")");
return filter.toString();
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-resourceresolver] 03/10: SLING-2665 - allow
the default redirect status code to be configured
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.resourceresolver-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourceresolver.git
commit 62fe67a08fb2950671168526e36d59fcf2ca32a5
Author: Justin Edelson <ju...@apache.org>
AuthorDate: Wed Nov 14 21:42:35 2012 +0000
SLING-2665 - allow the default redirect status code to be configured
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/resourceresolver@1409439 13f79535-47bb-0310-9956-ffa450edef68
---
.../impl/ResourceResolverFactoryActivator.java | 11 ++++
.../impl/ResourceResolverFactoryImpl.java | 4 ++
.../impl/mapping/MapConfigurationProvider.java | 2 +
.../resourceresolver/impl/mapping/MapEntries.java | 8 ++-
.../OSGI-INF/metatype/metatype.properties | 7 ++-
.../impl/mapping/MapEntriesTest.java | 73 ++++++++++++++++++++--
6 files changed, 96 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryActivator.java b/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryActivator.java
index 6581290..cf019a8 100644
--- a/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryActivator.java
+++ b/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryActivator.java
@@ -119,6 +119,9 @@ public class ResourceResolverFactoryActivator {
@Property(value = MapEntries.DEFAULT_MAP_ROOT)
private static final String PROP_MAP_LOCATION = "resource.resolver.map.location";
+ @Property(intValue = MapEntries.DEFAULT_DEFAULT_VANITY_PATH_REDIRECT_STATUS)
+ private static final String PROP_DEFAULT_VANITY_PATH_REDIRECT_STATUS = "resource.resolver.default.vanity.redirect.status";
+
/** Tracker for the resource decorators. */
private final ResourceDecoratorTracker resourceDecoratorTracker = new ResourceDecoratorTracker();
@@ -156,6 +159,8 @@ public class ResourceResolverFactoryActivator {
/** ComponentContext */
private ComponentContext componentContext;
+ private int defaultVanityPathRedirectStatus;
+
private final FactoryPreconditions preconds = new FactoryPreconditions();
/**
@@ -203,6 +208,10 @@ public class ResourceResolverFactoryActivator {
return mapRoot;
}
+ public int getDefaultVanityPathRedirectStatus() {
+ return defaultVanityPathRedirectStatus;
+ }
+
// ---------- SCR Integration ---------------------------------------------
/** Activates this component, called by SCR before registering as a service */
@@ -263,6 +272,8 @@ public class ResourceResolverFactoryActivator {
// the root of the resolver mappings
mapRoot = PropertiesUtil.toString(properties.get(PROP_MAP_LOCATION), MapEntries.DEFAULT_MAP_ROOT);
+ defaultVanityPathRedirectStatus = PropertiesUtil.toInteger(properties.get(PROP_DEFAULT_VANITY_PATH_REDIRECT_STATUS), MapEntries.DEFAULT_DEFAULT_VANITY_PATH_REDIRECT_STATUS);
+
final BundleContext bc = componentContext.getBundleContext();
// check for required property
diff --git a/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryImpl.java b/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryImpl.java
index 5565d72..7d1f2f8 100644
--- a/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryImpl.java
+++ b/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryImpl.java
@@ -161,4 +161,8 @@ public class ResourceResolverFactoryImpl implements ResourceResolverFactory, Map
public RootResourceProviderEntry getRootProviderEntry() {
return this.activator.getRootProviderEntry();
}
+
+ public int getDefaultVanityPathRedirectStatus() {
+ return this.activator.getDefaultVanityPathRedirectStatus();
+ }
}
\ No newline at end of file
diff --git a/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapConfigurationProvider.java b/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapConfigurationProvider.java
index 28767e2..3990bf0 100644
--- a/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapConfigurationProvider.java
+++ b/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapConfigurationProvider.java
@@ -35,4 +35,6 @@ public interface MapConfigurationProvider extends ResourceResolverFactory {
Mapping[] getMappings();
+ int getDefaultVanityPathRedirectStatus();
+
}
diff --git a/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java b/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
index 098a2b5..1c22135 100644
--- a/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
+++ b/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
@@ -77,6 +77,8 @@ public class MapEntries implements EventHandler {
public static final String DEFAULT_MAP_ROOT = "/etc/map";
+ public static final int DEFAULT_DEFAULT_VANITY_PATH_REDIRECT_STATUS = HttpServletResponse.SC_FOUND;
+
private static final String JCR_SYSTEM_PREFIX = "/jcr:system/";
static final String ANY_SCHEME_HOST = "[^/]+/[^/]+";
@@ -569,11 +571,11 @@ public class MapEntries implements EventHandler {
final String redirect = redirectTarget.getPath();
final String redirectName = redirectTarget.getName();
- // whether the target is attained by a 302/FOUND or by an
- // internal redirect is defined by the sling:redirect
+ // whether the target is attained by a external redirect or
+ // by an internal redirect is defined by the sling:redirect
// property
final int status = props.get("sling:redirect", false) ? props.get(
- PROP_REDIRECT_EXTERNAL_REDIRECT_STATUS, HttpServletResponse.SC_FOUND)
+ PROP_REDIRECT_EXTERNAL_REDIRECT_STATUS, factory.getDefaultVanityPathRedirectStatus())
: -1;
final String checkPath = result[1];
diff --git a/src/main/resources/OSGI-INF/metatype/metatype.properties b/src/main/resources/OSGI-INF/metatype/metatype.properties
index 6512548..1b820a5 100644
--- a/src/main/resources/OSGI-INF/metatype/metatype.properties
+++ b/src/main/resources/OSGI-INF/metatype/metatype.properties
@@ -76,4 +76,9 @@ resource.resolver.required.providers.name = Required Providers
resource.resolver.required.providers.description = A resource resolver factory is only \
available (registered) if all resource providers mentioned in this configuration \
are available. Each entry is either a service PID or a filter expression. \
- Invalid filters are ignored.
\ No newline at end of file
+ Invalid filters are ignored.
+
+resource.resolver.default.vanity.redirect.status.name = Default Vanity Path Redirect Status
+resource.resolver.default.vanity.redirect.status.description = The default status code \
+ used when a sling:vanityPath is configured to redirect and does not have a specific \
+ status code associated with it (via a sling:redirectStatus property)
\ No newline at end of file
diff --git a/src/test/java/org/apache/sling/resourceresolver/impl/mapping/MapEntriesTest.java b/src/test/java/org/apache/sling/resourceresolver/impl/mapping/MapEntriesTest.java
index a3677ef..8f9540a 100644
--- a/src/test/java/org/apache/sling/resourceresolver/impl/mapping/MapEntriesTest.java
+++ b/src/test/java/org/apache/sling/resourceresolver/impl/mapping/MapEntriesTest.java
@@ -20,9 +20,12 @@ import static org.junit.Assert.*;
import static org.mockito.Matchers.*;
import static org.mockito.Mockito.*;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
+import java.util.HashMap;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import org.apache.sling.api.resource.Resource;
@@ -75,7 +78,7 @@ public class MapEntriesTest {
when(result.getParent()).thenReturn(parent);
when(result.getPath()).thenReturn("/parent/child");
when(result.getName()).thenReturn("child");
- when(result.adaptTo(ValueMap.class)).thenReturn(singletonValueMap("sling:alias", "alias"));
+ when(result.adaptTo(ValueMap.class)).thenReturn(buildValueMap("sling:alias", "alias"));
when(resourceResolver.findResources(anyString(), eq("sql"))).thenAnswer(new Answer<Iterator<Resource>>() {
@@ -105,13 +108,13 @@ public class MapEntriesTest {
when(result.getParent()).thenReturn(parent);
when(result.getPath()).thenReturn("/parent/child");
when(result.getName()).thenReturn("child");
- when(result.adaptTo(ValueMap.class)).thenReturn(singletonValueMap("sling:alias", "alias"));
+ when(result.adaptTo(ValueMap.class)).thenReturn(buildValueMap("sling:alias", "alias"));
final Resource secondResult = mock(Resource.class);
when(secondResult.getParent()).thenReturn(parent);
when(secondResult.getPath()).thenReturn("/parent/child2");
when(secondResult.getName()).thenReturn("child2");
- when(secondResult.adaptTo(ValueMap.class)).thenReturn(singletonValueMap("sling:alias", "alias"));
+ when(secondResult.adaptTo(ValueMap.class)).thenReturn(buildValueMap("sling:alias", "alias"));
when(resourceResolver.findResources(anyString(), eq("sql"))).thenAnswer(new Answer<Iterator<Resource>>() {
@@ -132,8 +135,68 @@ public class MapEntriesTest {
assertEquals("child", aliasMap.get("alias"));
}
- private ValueMap singletonValueMap(String key, String value) {
- return new ValueMapDecorator(Collections.<String, Object> singletonMap(key, value));
+ @Test
+ public void test_vanity_path_registration() {
+ // specifically making this a weird value because we want to verify that
+ // the configuration value is being used
+ int DEFAULT_VANITY_STATUS = 333333;
+
+ when(resourceResolverFactory.getDefaultVanityPathRedirectStatus()).thenReturn(DEFAULT_VANITY_STATUS);
+
+ final List<Resource> resources = new ArrayList<Resource>();
+
+ Resource justVanityPath = mock(Resource.class);
+ when(justVanityPath.getPath()).thenReturn("/justVanityPath");
+ when(justVanityPath.getName()).thenReturn("justVanityPath");
+ when(justVanityPath.adaptTo(ValueMap.class)).thenReturn(buildValueMap("sling:vanityPath", "/target/justVanityPath"));
+ resources.add(justVanityPath);
+
+ Resource redirectingVanityPath = mock(Resource.class);
+ when(redirectingVanityPath.getPath()).thenReturn("/redirectingVanityPath");
+ when(redirectingVanityPath.getName()).thenReturn("redirectingVanityPath");
+ when(redirectingVanityPath.adaptTo(ValueMap.class)).thenReturn(buildValueMap("sling:vanityPath", "/target/redirectingVanityPath", "sling:redirect", true));
+ resources.add(redirectingVanityPath);
+
+ Resource redirectingVanityPath301 = mock(Resource.class);
+ when(redirectingVanityPath301.getPath()).thenReturn("/redirectingVanityPath301");
+ when(redirectingVanityPath301.getName()).thenReturn("redirectingVanityPath301");
+ when(redirectingVanityPath301.adaptTo(ValueMap.class)).thenReturn(buildValueMap("sling:vanityPath", "/target/redirectingVanityPath301", "sling:redirect", true, "sling:redirectStatus", 301));
+ resources.add(redirectingVanityPath301);
+
+ when(resourceResolver.findResources(anyString(), eq("sql"))).thenAnswer(new Answer<Iterator<Resource>>() {
+
+ public Iterator<Resource> answer(InvocationOnMock invocation) throws Throwable {
+ if (invocation.getArguments()[0].toString().contains("sling:vanityPath")) {
+ return resources.iterator();
+ } else {
+ return Collections.<Resource> emptySet().iterator();
+ }
+ }
+ });
+
+ mapEntries.doInit();
+
+ List<MapEntry> entries = mapEntries.getResolveMaps();
+ assertEquals(6, entries.size());
+ for (MapEntry entry : entries) {
+ if (entry.getPattern().contains("/target/redirectingVanityPath301")) {
+ assertEquals(301, entry.getStatus());
+ assertFalse(entry.isInternal());
+ } else if (entry.getPattern().contains("/target/redirectingVanityPath")) {
+ assertEquals(DEFAULT_VANITY_STATUS, entry.getStatus());
+ assertFalse(entry.isInternal());
+ } else if (entry.getPattern().contains("/target/justVanityPath")) {
+ assertTrue(entry.isInternal());
+ }
+ }
+ }
+
+ private ValueMap buildValueMap(Object... string) {
+ final Map<String, Object> data = new HashMap<String, Object>();
+ for (int i = 0; i < string.length; i = i + 2) {
+ data.put((String) string[i], string[i+1]);
+ }
+ return new ValueMapDecorator(data);
}
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-resourceresolver] 07/10: SLING-2644 - Make
the jackrabbit/accessmanager and jackrabbit/usermanager to work with newer
servlets/post bundle
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.resourceresolver-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourceresolver.git
commit b53aaff9c0469fa0d4fdc46deedc999378368633
Author: Mike Müller <my...@apache.org>
AuthorDate: Tue Dec 11 14:57:03 2012 +0000
SLING-2644 - Make the jackrabbit/accessmanager and jackrabbit/usermanager to work with newer servlets/post bundle
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/resourceresolver@1420206 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index cec2716..974adbf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,7 +124,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.osgi</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-resourceresolver] 04/10: Update to released
bundles
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.resourceresolver-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourceresolver.git
commit 9fe2e023083d3e26b37896ec2f311d2f39306389
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Nov 16 07:08:53 2012 +0000
Update to released bundles
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/resourceresolver@1410214 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 8e8db95..cec2716 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,7 +114,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.0</version>
<scope>provided</scope>
</dependency>
<dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-resourceresolver] 06/10: SLING-2691 :
Correctly update mapping if a jcr:content node is removed
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.resourceresolver-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourceresolver.git
commit b7a268c13b232398465a80ddf22c118a45676b25
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Dec 3 14:06:10 2012 +0000
SLING-2691 : Correctly update mapping if a jcr:content node is removed
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/resourceresolver@1416527 13f79535-47bb-0310-9956-ffa450edef68
---
.../sling/resourceresolver/impl/ResourceResolverFactoryActivator.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryActivator.java b/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryActivator.java
index cf019a8..a5b2863 100644
--- a/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryActivator.java
+++ b/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryActivator.java
@@ -292,7 +292,9 @@ public class ResourceResolverFactoryActivator {
this.rootProviderEntry.setEventAdmin(null);
this.resourceDecoratorTracker.close();
- this.unregisterFactory();
+ synchronized ( this ) {
+ this.unregisterFactory();
+ }
}
private void unregisterFactory() {
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-resourceresolver] 09/10:
[maven-release-plugin] prepare release
org.apache.sling.resourceresolver-1.0.2
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.resourceresolver-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourceresolver.git
commit ccb5f15903fd8eb3e91eaff4d77cb810428b5495
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Sat Dec 15 14:53:25 2012 +0000
[maven-release-plugin] prepare release org.apache.sling.resourceresolver-1.0.2
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/resourceresolver@1422257 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index cec2716..8ba5690 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>org.apache.sling.resourceresolver</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2</version>
<packaging>bundle</packaging>
<name>Apache Sling Resource Resolver</name>
@@ -37,13 +37,13 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/resourceresolver
+ scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.resourceresolver-1.0.2
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/resourceresolver
+ scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.resourceresolver-1.0.2
</developerConnection>
<url>
- http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver
+ http://svn.apache.org/viewvc/sling/tags/org.apache.sling.resourceresolver-1.0.2
</url>
</scm>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-resourceresolver] 02/10: Set dependencies
to latest snapshots after release
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.resourceresolver-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourceresolver.git
commit d4bf2a11f741f526ce859e5ac17587cf638925ec
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Nov 12 10:18:08 2012 +0000
Set dependencies to latest snapshots after release
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/resourceresolver@1408241 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index cec2716..8e8db95 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,7 +114,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.3.0</version>
+ <version>2.3.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-resourceresolver] 01/10:
[maven-release-plugin] prepare for next development iteration
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.resourceresolver-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourceresolver.git
commit ea248db6d866041abd8ba0f72cf98dff3b875064
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Nov 12 09:28:34 2012 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/resourceresolver@1408218 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 121df37..cec2716 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>org.apache.sling.resourceresolver</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Sling Resource Resolver</name>
@@ -37,13 +37,13 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.resourceresolver-1.0.0
+ scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/resourceresolver
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.resourceresolver-1.0.0
+ scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/resourceresolver
</developerConnection>
<url>
- http://svn.apache.org/viewvc/sling/tags/org.apache.sling.resourceresolver-1.0.0
+ http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver
</url>
</scm>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.