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:24 UTC
[sling-org-apache-sling-testing-resourceresolver-mock] annotated
tag org.apache.sling.testing.resourceresolver-mock-1.0.0 created (now
820223c)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to annotated tag org.apache.sling.testing.resourceresolver-mock-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-resourceresolver-mock.git.
at 820223c (tag)
tagging 16f1110e3306102f8607bbe916ffc6d4d0da748e (commit)
by sseifert
on Fri Oct 17 08:11:21 2014 +0000
- Log -----------------------------------------------------------------
org.apache.sling.testing.resourceresolver-mock-1.0.0
-----------------------------------------------------------------------
This annotated tag includes the following new commits:
new cb4683b Add new testing module for easy mocking of a resource resolver
new 3f7aa2f Prepare release
new 831dff1 [maven-release-plugin] prepare release org.apache.sling.testing.resourceresolver-mock-0.1.0
new 3b6ae6f [maven-release-plugin] prepare for next development iteration
new 23d5aa0 Back to current snapshot
new 2766d00 Use released versions after release.
new 3888b8d Correct reactor pom and update to parent pom 16
new 6121894 Update to latest parent pom
new 865d7f5 Update to parent pom 18
new af4baf2 SLING-3354 : Search paths are returned in wrong order
new 3a63d32 SLING-3355 : Add helper methods for creating resources
new 518a6e2 SLING-3355 : Add helper methods for creating resources
new 812de29 Refactoring and javadoc updates
new e71efcd [maven-release-plugin] prepare release org.apache.sling.testing.resourceresolver-mock-0.2.0
new 8104e98 [maven-release-plugin] prepare for next development iteration
new b03ae42 SLING-3417 : Search paths must end with a slash
new 58cd751 Update to parent pom v19
new bad61a3 Updated to parent version 20
new 7d7fab1 SLING-3847 : MockResourceResolver: resource order is not preserved in listChildren method. Apply patch from Stefan Seifert
new 6eecd9a SLING-3853 : MockResourceResolver does not extend SlingAdaptable. Apply patch from Stefan Seifert
new 0aac1b6 Update to latest Sling API
new b290dc8 Use latest API snapshot during release
new c41abfc Use released SLING API
new 1ad5976 SLING-3889 Make compatible to JCR resource
new acc328c SLING-3889 fix issue where creating a resources fails when deleting it before without committing refactor unit tests and add a new unit test suite for create/delete scenarios
new d27619f SLING-3889 Emulate feature of JCR resource implementation that allows adapting to InputStream for nt:file and nt:resource nodes.
new d0ebcd3 SLING-3889 Add optional support for namespace mangling and unmangling
new 1e5d468 [maven-release-plugin] prepare release org.apache.sling.testing.resourceresolver-mock-0.3.0
new d8005f0 [maven-release-plugin] prepare for next development iteration
new 3caf894 Update to Sling Parent POM 22 with baselining enabled
new 8a58314 SLING-4033 Lower Sling API Dependency to 2.4.0
new 01cc6aa SLING-4033 fix InputStream problem with API versions <= 2.6.0 add maven profiles to run unit tests against different API versions
new 3411021 SLING-4038 Normalize path in getResource(String) method
new bdca3ee SLING-4039 Support ISO8601 date string to Calendar conversion
new f55da06 SLING-4040 Return null for getResource für null path
new e6ea5fc SLING-4042 move all mock projects to mocks/ subdirectory
new d693531 SLING-4042 add README files
new 7241bbe [maven-release-plugin] prepare release org.apache.sling.testing.resourceresolver-mock-1.0.0
new 103ceac [maven-release-plugin] rollback the release of org.apache.sling.testing.resourceresolver-mock-1.0.0
new e5bbb65 add/update SCM urls
new 72c8c58 [maven-release-plugin] prepare release org.apache.sling.testing.resourceresolver-mock-1.0.0
new 16f1110 [maven-release-plugin] copy for tag org.apache.sling.testing.resourceresolver-mock-1.0.0
The 42 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-testing-resourceresolver-mock] 14/14:
[maven-release-plugin] copy for tag
org.apache.sling.testing.resourceresolver-mock-1.0.0
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.testing.resourceresolver-mock-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-resourceresolver-mock.git
commit 16f1110e3306102f8607bbe916ffc6d4d0da748e
Author: sseifert <ss...@unknown>
AuthorDate: Fri Oct 17 08:11:21 2014 +0000
[maven-release-plugin] copy for tag org.apache.sling.testing.resourceresolver-mock-1.0.0
git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.resourceresolver-mock-1.0.0@1632492 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-testing-resourceresolver-mock] 09/14:
SLING-4042 add README files
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.testing.resourceresolver-mock-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-resourceresolver-mock.git
commit d69353172f7c1db56feeb5e93ed9691f58c83d42
Author: sseifert <ss...@unknown>
AuthorDate: Thu Oct 16 19:09:39 2014 +0000
SLING-4042 add README files
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/resourceresolver-mock@1632415 13f79535-47bb-0310-9956-ffa450edef68
---
README.txt | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/README.txt b/README.txt
new file mode 100644
index 0000000..b6e31db
--- /dev/null
+++ b/README.txt
@@ -0,0 +1,6 @@
+Apache Sling Testing Resource Resolver Mock
+
+Mock for the resource resolver / factory for easier testing.
+
+Documentation:
+http://sling.apache.org/documentation/development/resourceresolver-mock.html
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-resourceresolver-mock] 05/14:
SLING-4038 Normalize path in getResource(String) method
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.testing.resourceresolver-mock-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-resourceresolver-mock.git
commit 341102169b2ba1a505703ed94b0fe28af0ab60d3
Author: sseifert <ss...@unknown>
AuthorDate: Mon Oct 13 08:14:18 2014 +0000
SLING-4038 Normalize path in getResource(String) method
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/resourceresolver-mock@1631310 13f79535-47bb-0310-9956-ffa450edef68
---
.../testing/resourceresolver/MockResourceResolver.java | 15 ++++++++-------
.../resourceresolver/SlingCrudResourceResolverTest.java | 9 +++++++++
2 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java b/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java
index 1c009e8..ea01646 100644
--- a/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java
+++ b/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java
@@ -143,25 +143,26 @@ public class MockResourceResolver extends SlingAdaptable implements ResourceReso
}
private Resource getResourceInternal(final String path) {
- if ( path.startsWith("/") ) {
- if ( this.deletedResources.contains(path) ) {
+ String normalizedPath = ResourceUtil.normalize(path);
+ if ( normalizedPath.startsWith("/") ) {
+ if ( this.deletedResources.contains(normalizedPath) ) {
return null;
}
- final Map<String, Object> tempProps = this.temporaryResources.get(path);
+ final Map<String, Object> tempProps = this.temporaryResources.get(normalizedPath);
if ( tempProps != null ) {
- final Resource rsrc = new MockResource(path, tempProps, this);
+ final Resource rsrc = new MockResource(normalizedPath, tempProps, this);
return rsrc;
}
synchronized ( this.resources ) {
- final Map<String, Object> props = this.resources.get(path);
+ final Map<String, Object> props = this.resources.get(normalizedPath);
if ( props != null ) {
- final Resource rsrc = new MockResource(path, props, this);
+ final Resource rsrc = new MockResource(normalizedPath, props, this);
return rsrc;
}
}
} else {
for(final String s : this.getSearchPath() ) {
- final Resource rsrc = this.getResource(s + '/' + path);
+ final Resource rsrc = this.getResource(s + '/' + normalizedPath);
if ( rsrc != null ) {
return rsrc;
}
diff --git a/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java b/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java
index 44e48d4..6893cf5 100644
--- a/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java
+++ b/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java
@@ -168,4 +168,13 @@ public class SlingCrudResourceResolverTest {
assertEquals(NT_UNSTRUCTURED, resource1.getResourceType());
}
+ @Test
+ public void testNormalizePath() throws PersistenceException {
+ Resource resource1 = resourceResolver.getResource(testRoot.getPath() + "/./node1");
+ assertEquals("node1", resource1.getName());
+
+ Resource resource11 = resourceResolver.getResource(testRoot.getPath() + "/node1/../node1/node11");
+ assertEquals("node11", resource11.getName());
+ }
+
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-resourceresolver-mock] 03/14:
SLING-4033 Lower Sling API Dependency to 2.4.0
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.testing.resourceresolver-mock-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-resourceresolver-mock.git
commit 8a583145427dd6b5f47644c13d45bebe24dcddea
Author: sseifert <ss...@unknown>
AuthorDate: Sat Oct 11 09:13:01 2014 +0000
SLING-4033 Lower Sling API Dependency to 2.4.0
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/resourceresolver-mock@1631031 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 7 ++++---
.../sling/testing/resourceresolver/MockResource.java | 7 ++++---
.../testing/resourceresolver/MockResourceResolver.java | 17 ++++++++---------
.../resourceresolver/MockResourceResolverFactory.java | 4 ++--
.../CreateDeleteResourceResolverTest.java | 17 +++++++++--------
.../resourceresolver/SlingCrudResourceResolverTest.java | 13 +++++++------
6 files changed, 34 insertions(+), 31 deletions(-)
diff --git a/pom.xml b/pom.xml
index d41047e..3fbb372 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,16 +59,17 @@
</plugins>
</reporting>
<dependencies>
- <dependency>
+ <dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.8.0</version>
+ <!-- TODO: resarch why unit tests fail on InputStream tests with Sling API < 2.7.0 -->
+ <!--version>2.4.0</version-->
+ <version>2.7.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>4.3.0</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/src/main/java/org/apache/sling/testing/resourceresolver/MockResource.java b/src/main/java/org/apache/sling/testing/resourceresolver/MockResource.java
index 1b10a0d..71dbf8e 100644
--- a/src/main/java/org/apache/sling/testing/resourceresolver/MockResource.java
+++ b/src/main/java/org/apache/sling/testing/resourceresolver/MockResource.java
@@ -26,6 +26,7 @@ import org.apache.sling.api.resource.ModifiableValueMap;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceMetadata;
import org.apache.sling.api.resource.ResourceResolver;
+import org.apache.sling.api.resource.ResourceUtil;
import org.apache.sling.api.resource.ValueMap;
import org.apache.sling.api.wrappers.ModifiableValueMapDecorator;
import org.apache.sling.api.wrappers.ValueMapDecorator;
@@ -96,7 +97,7 @@ public class MockResource extends AbstractResource {
}
else if ( type == InputStream.class ) {
InputStream is = getFileResourceInputStream();
- if (is!=null) {
+ if (is != null) {
return (AdapterType)is;
}
}
@@ -115,13 +116,13 @@ public class MockResource extends AbstractResource {
else if (NT_FILE.equals(resourceType)) {
Resource contentResource = getChild(JCR_CONTENT);
if (contentResource != null) {
- return contentResource.getValueMap().get(JCR_DATA, InputStream.class);
+ return ResourceUtil.getValueMap(contentResource).get(JCR_DATA, InputStream.class);
}
}
return null;
}
- @Override
+ // part of Resource API 2.7.0
public ValueMap getValueMap() {
return this.props;
}
diff --git a/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java b/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java
index 1fee01f..1c009e8 100644
--- a/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java
+++ b/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java
@@ -18,13 +18,12 @@
*/
package org.apache.sling.testing.resourceresolver;
-import java.io.UnsupportedEncodingException;
-import java.net.URI;
-import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.Dictionary;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.Hashtable;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
@@ -133,7 +132,7 @@ public class MockResourceResolver extends SlingAdaptable implements ResourceReso
String parentPath = ResourceUtil.getParent(path);
Resource parentResource = getResourceInternal(parentPath);
if (parentResource!=null) {
- ValueMap props = parentResource.getValueMap();
+ ValueMap props = ResourceUtil.getValueMap(parentResource);
if (props.containsKey(name)) {
return new MockPropertyResource(path, props, this);
}
@@ -217,7 +216,7 @@ public class MockResourceResolver extends SlingAdaptable implements ResourceReso
return children.iterator();
}
- @Override
+ // part of Resource API 2.5.0
public Iterable<Resource> getChildren(final Resource parent) {
return new Iterable<Resource>() {
@@ -312,7 +311,7 @@ public class MockResourceResolver extends SlingAdaptable implements ResourceReso
}
Resource mockResource = new MockResource(path, properties, this);
- this.temporaryResources.put(path, mockResource.getValueMap());
+ this.temporaryResources.put(path, ResourceUtil.getValueMap(mockResource));
return mockResource;
}
@@ -327,7 +326,7 @@ public class MockResourceResolver extends SlingAdaptable implements ResourceReso
synchronized ( this.resources ) {
for(final String path : this.deletedResources ) {
if ( this.resources.remove(path) != null && this.options.getEventAdmin() != null ) {
- final Map<String, Object> props = new HashMap<String, Object>();
+ final Dictionary<String, Object> props = new Hashtable<String, Object>();
props.put(SlingConstants.PROPERTY_PATH, path);
final Event e = new Event(SlingConstants.TOPIC_RESOURCE_REMOVED, props);
this.options.getEventAdmin().sendEvent(e);
@@ -338,7 +337,7 @@ public class MockResourceResolver extends SlingAdaptable implements ResourceReso
final boolean changed = this.resources.containsKey(path);
this.resources.put(path, this.temporaryResources.get(path));
if ( this.options.getEventAdmin() != null ) {
- final Map<String, Object> props = new HashMap<String, Object>();
+ final Dictionary<String, Object> props = new Hashtable<String, Object>();
props.put(SlingConstants.PROPERTY_PATH, path);
if ( this.resources.get(path).get(ResourceResolver.PROPERTY_RESOURCE_TYPE) != null ) {
props.put(SlingConstants.PROPERTY_RESOURCE_TYPE, this.resources.get(path).get(ResourceResolver.PROPERTY_RESOURCE_TYPE));
@@ -380,7 +379,7 @@ public class MockResourceResolver extends SlingAdaptable implements ResourceReso
this.temporaryResources.put(path, props);
}
- @Override
+ // part of Resource API 2.6.0
public boolean hasChildren(Resource resource) {
return this.listChildren(resource).hasNext();
}
diff --git a/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolverFactory.java b/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolverFactory.java
index 39b66a7..cd4b067 100644
--- a/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolverFactory.java
+++ b/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolverFactory.java
@@ -80,7 +80,7 @@ public class MockResourceResolverFactory implements ResourceResolverFactory {
return new MockResourceResolver(options, this, resources);
}
- @Override
+ // part of Resource API 2.5.0
public ResourceResolver getServiceResourceResolver(
Map<String, Object> authenticationInfo) throws LoginException {
return new MockResourceResolver(options, this, resources);
@@ -94,7 +94,7 @@ public class MockResourceResolverFactory implements ResourceResolverFactory {
/**
* @see org.apache.sling.api.resource.ResourceResolverFactory#getThreadResourceResolver()
*/
- @Override
+ // part of Resource API 2.8.0
public ResourceResolver getThreadResourceResolver() {
ResourceResolver result = null;
final Stack<ResourceResolver> resolverStack = resolverStackHolder.get();
diff --git a/src/test/java/org/apache/sling/testing/resourceresolver/CreateDeleteResourceResolverTest.java b/src/test/java/org/apache/sling/testing/resourceresolver/CreateDeleteResourceResolverTest.java
index dba669c..0b511ac 100644
--- a/src/test/java/org/apache/sling/testing/resourceresolver/CreateDeleteResourceResolverTest.java
+++ b/src/test/java/org/apache/sling/testing/resourceresolver/CreateDeleteResourceResolverTest.java
@@ -28,6 +28,7 @@ import org.apache.sling.api.resource.LoginException;
import org.apache.sling.api.resource.PersistenceException;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
+import org.apache.sling.api.resource.ResourceUtil;
import org.apache.sling.api.resource.ValueMap;
import org.junit.Before;
import org.junit.Test;
@@ -58,7 +59,7 @@ public class CreateDeleteResourceResolverTest {
public void testCreateDeleteCreate() throws PersistenceException {
// create new node without commit
Resource resource = resourceResolver.create(testRoot, "node", PROPS1);
- assertEquals(PROPS1, resource.getValueMap());
+ assertEquals(PROPS1, ResourceUtil.getValueMap(resource));
// delete node without commit
resourceResolver.delete(resource);
@@ -66,14 +67,14 @@ public class CreateDeleteResourceResolverTest {
// create node again with different properties without commit
resource = resourceResolver.create(testRoot, "node", PROPS2);
- assertEquals(PROPS2, resource.getValueMap());
+ assertEquals(PROPS2, ResourceUtil.getValueMap(resource));
}
@Test
public void testCreateDeleteCreateCommit() throws PersistenceException {
// create new node without commit
Resource resource = resourceResolver.create(testRoot, "node", PROPS1);
- assertEquals(PROPS1, resource.getValueMap());
+ assertEquals(PROPS1, ResourceUtil.getValueMap(resource));
// delete node without commit
resourceResolver.delete(resource);
@@ -81,7 +82,7 @@ public class CreateDeleteResourceResolverTest {
// create node again with different properties with commit
resource = resourceResolver.create(testRoot, "node", PROPS2);
- assertEquals(PROPS2, resource.getValueMap());
+ assertEquals(PROPS2, ResourceUtil.getValueMap(resource));
resourceResolver.commit();
}
@@ -89,7 +90,7 @@ public class CreateDeleteResourceResolverTest {
public void testCreateCommitDeleteCreateCommit() throws PersistenceException {
// create new node with commit
Resource resource = resourceResolver.create(testRoot, "node", PROPS1);
- assertEquals(PROPS1, resource.getValueMap());
+ assertEquals(PROPS1, ResourceUtil.getValueMap(resource));
resourceResolver.commit();
// delete node without commit
@@ -98,7 +99,7 @@ public class CreateDeleteResourceResolverTest {
// create node again with different properties with commit
resource = resourceResolver.create(testRoot, "node", PROPS2);
- assertEquals(PROPS2, resource.getValueMap());
+ assertEquals(PROPS2, ResourceUtil.getValueMap(resource));
resourceResolver.commit();
}
@@ -106,7 +107,7 @@ public class CreateDeleteResourceResolverTest {
public void testCreateCommitDeleteCommitCreateCommit() throws PersistenceException {
// create new node with commit
Resource resource = resourceResolver.create(testRoot, "node", PROPS1);
- assertEquals(PROPS1, resource.getValueMap());
+ assertEquals(PROPS1, ResourceUtil.getValueMap(resource));
resourceResolver.commit();
// delete node with commit
@@ -116,7 +117,7 @@ public class CreateDeleteResourceResolverTest {
// create node again with different properties with commit
resource = resourceResolver.create(testRoot, "node", PROPS2);
- assertEquals(PROPS2, resource.getValueMap());
+ assertEquals(PROPS2, ResourceUtil.getValueMap(resource));
resourceResolver.commit();
}
diff --git a/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java b/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java
index 33021dd..44e48d4 100644
--- a/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java
+++ b/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java
@@ -34,6 +34,7 @@ import org.apache.sling.api.resource.LoginException;
import org.apache.sling.api.resource.PersistenceException;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
+import org.apache.sling.api.resource.ResourceUtil;
import org.apache.sling.api.resource.ValueMap;
import org.junit.Before;
import org.junit.Test;
@@ -93,7 +94,7 @@ public class SlingCrudResourceResolverTest {
assertNotNull(resource1);
assertEquals("node1", resource1.getName());
- ValueMap props = resource1.getValueMap();
+ ValueMap props = ResourceUtil.getValueMap(resource1);
assertEquals(STRING_VALUE, props.get("stringProp", String.class));
assertArrayEquals(STRING_ARRAY_VALUE, props.get("stringArrayProp", String[].class));
assertEquals((Integer) INTEGER_VALUE, props.get("integerProp", Integer.class));
@@ -104,14 +105,14 @@ public class SlingCrudResourceResolverTest {
@Test
public void testDateProperty() throws IOException {
Resource resource1 = resourceResolver.getResource(testRoot.getPath() + "/node1");
- ValueMap props = resource1.getValueMap();
+ ValueMap props = ResourceUtil.getValueMap(resource1);
assertEquals(DATE_VALUE, props.get("dateProp", Date.class));
}
@Test
public void testDatePropertyToCalendar() throws IOException {
Resource resource1 = resourceResolver.getResource(testRoot.getPath() + "/node1");
- ValueMap props = resource1.getValueMap();
+ ValueMap props = ResourceUtil.getValueMap(resource1);
Calendar calendarValue = props.get("dateProp", Calendar.class);
assertNotNull(calendarValue);
assertEquals(DATE_VALUE, calendarValue.getTime());
@@ -120,14 +121,14 @@ public class SlingCrudResourceResolverTest {
@Test
public void testCalendarProperty() throws IOException {
Resource resource1 = resourceResolver.getResource(testRoot.getPath() + "/node1");
- ValueMap props = resource1.getValueMap();
+ ValueMap props = ResourceUtil.getValueMap(resource1);
assertEquals(CALENDAR_VALUE.getTime(), props.get("calendarProp", Calendar.class).getTime());
}
@Test
public void testCalendarPropertyToDate() throws IOException {
Resource resource1 = resourceResolver.getResource(testRoot.getPath() + "/node1");
- ValueMap props = resource1.getValueMap();
+ ValueMap props = ResourceUtil.getValueMap(resource1);
Date dateValue = props.get("calendarProp", Date.class);
assertNotNull(dateValue);
assertEquals(CALENDAR_VALUE.getTime(), dateValue);
@@ -155,7 +156,7 @@ public class SlingCrudResourceResolverTest {
// read second time to ensure not the original input stream was returned
// and this time using another syntax
- InputStream is2 = resource1.getValueMap().get("binaryProp", InputStream.class);
+ InputStream is2 = ResourceUtil.getValueMap(resource1).get("binaryProp", InputStream.class);
byte[] dataFromResource2 = IOUtils.toByteArray(is2);
is2.close();
assertArrayEquals(BINARY_VALUE, dataFromResource2);
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-resourceresolver-mock] 08/14:
SLING-4042 move all mock projects to mocks/ subdirectory
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.testing.resourceresolver-mock-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-resourceresolver-mock.git
commit e6ea5fc76ff2d37bfc99fa948b4c8ff88d3f9a9e
Author: sseifert <ss...@unknown>
AuthorDate: Mon Oct 13 14:32:45 2014 +0000
SLING-4042 move all mock projects to mocks/ subdirectory
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/resourceresolver-mock@1631416 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index ace2f03..46c9752 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
<version>22</version>
- <relativePath>../../parent/pom.xml</relativePath>
+ <relativePath>../../../parent/pom.xml</relativePath>
</parent>
<artifactId>org.apache.sling.testing.resourceresolver-mock</artifactId>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-resourceresolver-mock] 04/14:
SLING-4033 fix InputStream problem with API versions <= 2.6.0 add maven
profiles to run unit tests against different API versions
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.testing.resourceresolver-mock-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-resourceresolver-mock.git
commit 01cc6aa019b0dcf59976fdab6fc42275c33d4df1
Author: sseifert <ss...@unknown>
AuthorDate: Sat Oct 11 13:49:56 2014 +0000
SLING-4033 fix InputStream problem with API versions <= 2.6.0
add maven profiles to run unit tests against different API versions
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/resourceresolver-mock@1631044 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 52 ++++++++++++++++++++--
.../testing/resourceresolver/MockResource.java | 3 +-
2 files changed, 50 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3fbb372..f70bc14 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,9 +62,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <!-- TODO: resarch why unit tests fail on InputStream tests with Sling API < 2.7.0 -->
- <!--version>2.4.0</version-->
- <version>2.7.0</version>
+ <version>2.4.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -96,4 +94,52 @@
</dependency>
</dependencies>
+ <!-- Profiles to run unit tests against different Sling API versions -->
+ <profiles>
+ <profile>
+ <id>api-2.5</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.api</artifactId>
+ <version>2.5.0</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>api-2.6</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.api</artifactId>
+ <version>2.6.0</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>api-2.7</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.api</artifactId>
+ <version>2.7.0</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>api-2.8</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.api</artifactId>
+ <version>2.8.0</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/src/main/java/org/apache/sling/testing/resourceresolver/MockResource.java b/src/main/java/org/apache/sling/testing/resourceresolver/MockResource.java
index 71dbf8e..687bd57 100644
--- a/src/main/java/org/apache/sling/testing/resourceresolver/MockResource.java
+++ b/src/main/java/org/apache/sling/testing/resourceresolver/MockResource.java
@@ -29,7 +29,6 @@ import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ResourceUtil;
import org.apache.sling.api.resource.ValueMap;
import org.apache.sling.api.wrappers.ModifiableValueMapDecorator;
-import org.apache.sling.api.wrappers.ValueMapDecorator;
public class MockResource extends AbstractResource {
@@ -89,7 +88,7 @@ public class MockResource extends AbstractResource {
@Override
public <AdapterType> AdapterType adaptTo(final Class<AdapterType> type) {
if ( type == ValueMap.class ) {
- return (AdapterType)new ValueMapDecorator(this.props);
+ return (AdapterType)this.props;
}
else if ( type == ModifiableValueMap.class ) {
((MockResourceResolver)this.resolver).addChanged(this.path, this.props);
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-resourceresolver-mock] 06/14:
SLING-4039 Support ISO8601 date string to Calendar conversion
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.testing.resourceresolver-mock-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-resourceresolver-mock.git
commit bdca3ee57cd6801768f7a157a45f1c48a886fd88
Author: sseifert <ss...@unknown>
AuthorDate: Mon Oct 13 09:47:50 2014 +0000
SLING-4039 Support ISO8601 date string to Calendar conversion
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/resourceresolver-mock@1631324 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 7 +++++++
.../sling/testing/resourceresolver/MockValueMap.java | 20 ++++++++++++++++----
.../SlingCrudResourceResolverTest.java | 14 ++++++++++++++
3 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index f70bc14..ace2f03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,6 +73,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@@ -80,6 +81,12 @@
<version>2.4</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-jcr-commons</artifactId>
+ <version>2.5.3</version>
+ <scope>compile</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/src/main/java/org/apache/sling/testing/resourceresolver/MockValueMap.java b/src/main/java/org/apache/sling/testing/resourceresolver/MockValueMap.java
index 4fe009a..cb618a0 100644
--- a/src/main/java/org/apache/sling/testing/resourceresolver/MockValueMap.java
+++ b/src/main/java/org/apache/sling/testing/resourceresolver/MockValueMap.java
@@ -27,6 +27,7 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.commons.io.IOUtils;
+import org.apache.jackrabbit.util.ISO8601;
import org.apache.sling.api.wrappers.ValueMapDecorator;
/**
@@ -50,8 +51,16 @@ public class MockValueMap extends ValueMapDecorator {
@SuppressWarnings("unchecked")
@Override
public <T> T get(String name, Class<T> type) {
- if (type==Date.class) {
- Calendar calendar = super.get(name, Calendar.class);
+ if (type == Calendar.class) {
+ // Support conversion of String to Calendar if value conforms to ISO8601 date format
+ Object value = get(name);
+ if (value instanceof String) {
+ return (T)ISO8601.parse((String)value);
+ }
+ }
+ else if (type == Date.class) {
+ // Support conversion from Calendar to Date
+ Calendar calendar = get(name, Calendar.class);
if (calendar != null) {
return (T)calendar.getTime();
}
@@ -59,8 +68,9 @@ public class MockValueMap extends ValueMapDecorator {
return null;
}
}
- else if (type==InputStream.class) {
- byte[] data = super.get(name, byte[].class);
+ else if (type == InputStream.class) {
+ // Support conversion from byte array to InputStream
+ byte[] data = get(name, byte[].class);
if (data!=null) {
return (T)new ByteArrayInputStream(data);
}
@@ -84,11 +94,13 @@ public class MockValueMap extends ValueMapDecorator {
private static Object convertForWrite(Object value) {
if (value instanceof Date) {
+ // Store Date values as Calendar values
Calendar calendar = Calendar.getInstance();
calendar.setTime((Date)value);
value = calendar;
}
else if (value instanceof InputStream) {
+ // Store InputStream values as byte array
try {
value = IOUtils.toByteArray((InputStream)value);
} catch (IOException ex) {
diff --git a/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java b/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java
index 6893cf5..7c0f9c8 100644
--- a/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java
+++ b/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java
@@ -30,7 +30,9 @@ import java.util.Date;
import java.util.List;
import org.apache.commons.io.IOUtils;
+import org.apache.jackrabbit.util.ISO8601;
import org.apache.sling.api.resource.LoginException;
+import org.apache.sling.api.resource.ModifiableValueMap;
import org.apache.sling.api.resource.PersistenceException;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
@@ -135,6 +137,18 @@ public class SlingCrudResourceResolverTest {
}
@Test
+ public void testStringToCalendarConversion() throws IOException {
+ Resource resource1 = resourceResolver.getResource(testRoot.getPath() + "/node1");
+ ModifiableValueMap modProps = resource1.adaptTo(ModifiableValueMap.class);
+ modProps.put("dateISO8601String", ISO8601.format(CALENDAR_VALUE));
+ resourceResolver.commit();
+
+ resource1 = resourceResolver.getResource(testRoot.getPath() + "/node1");
+ ValueMap props = ResourceUtil.getValueMap(resource1);
+ assertEquals(CALENDAR_VALUE.getTime(), props.get("calendarProp", Calendar.class).getTime());
+ }
+
+ @Test
public void testListChildren() throws IOException {
Resource resource1 = resourceResolver.getResource(testRoot.getPath() + "/node1");
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-resourceresolver-mock] 01/14:
[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.testing.resourceresolver-mock-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-resourceresolver-mock.git
commit d8005f013b4b06a93e2e0eff83c037a2248346a5
Author: sseifert <ss...@unknown>
AuthorDate: Thu Sep 25 08:49:51 2014 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/resourceresolver-mock@1627486 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index ed63e42..2989d48 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>org.apache.sling.testing.resourceresolver-mock</artifactId>
- <version>0.3.0</version>
+ <version>0.3.1-SNAPSHOT</version>
<name>Apache Sling Testing Resource Resolver Mock</name>
<description>
@@ -40,9 +40,9 @@
</properties>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.resourceresolver-mock-0.3.0</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.resourceresolver-mock-0.3.0</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.testing.resourceresolver-mock-0.3.0</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/resourceresolver-mock</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/resourceresolver-mock</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/testing/resourceresolver-mock</url>
</scm>
<reporting>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-resourceresolver-mock] 10/14:
[maven-release-plugin] prepare release
org.apache.sling.testing.resourceresolver-mock-1.0.0
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.testing.resourceresolver-mock-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-resourceresolver-mock.git
commit 7241bbe01be26710f0a7edd3ab0862360cb0e46f
Author: sseifert <ss...@unknown>
AuthorDate: Fri Oct 17 08:05:28 2014 +0000
[maven-release-plugin] prepare release org.apache.sling.testing.resourceresolver-mock-1.0.0
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/resourceresolver-mock@1632488 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 46c9752..eff8014 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>org.apache.sling.testing.resourceresolver-mock</artifactId>
- <version>0.3.1-SNAPSHOT</version>
+ <version>1.0.0</version>
<name>Apache Sling Testing Resource Resolver Mock</name>
<description>
@@ -40,9 +40,9 @@
</properties>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/resourceresolver-mock</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/resourceresolver-mock</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/testing/resourceresolver-mock</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.resourceresolver-mock-1.0.0</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.resourceresolver-mock-1.0.0</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.testing.resourceresolver-mock-1.0.0</url>
</scm>
<reporting>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-resourceresolver-mock] 07/14: SLING-4040 Return null for getResource für null path
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.testing.resourceresolver-mock-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-resourceresolver-mock.git
commit f55da06b9e4de385f84b2141619d71736106ade7
Author: sseifert <ss...@unknown>
AuthorDate: Mon Oct 13 09:58:40 2014 +0000
SLING-4040 Return null for getResource für null path
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/resourceresolver-mock@1631326 13f79535-47bb-0310-9956-ffa450edef68
---
.../sling/testing/resourceresolver/MockResourceResolver.java | 6 +++++-
.../resourceresolver/SlingCrudResourceResolverTest.java | 12 +++++++++---
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java b/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java
index ea01646..9798b2f 100644
--- a/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java
+++ b/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java
@@ -127,7 +127,7 @@ public class MockResourceResolver extends SlingAdaptable implements ResourceReso
Resource resource = getResourceInternal(path);
// if not resource found check if this is a reference to a property
- if (resource == null) {
+ if (resource == null && path != null) {
String name = ResourceUtil.getName(path);
String parentPath = ResourceUtil.getParent(path);
Resource parentResource = getResourceInternal(parentPath);
@@ -143,6 +143,10 @@ public class MockResourceResolver extends SlingAdaptable implements ResourceReso
}
private Resource getResourceInternal(final String path) {
+ if (path == null) {
+ return null;
+ }
+
String normalizedPath = ResourceUtil.normalize(path);
if ( normalizedPath.startsWith("/") ) {
if ( this.deletedResources.contains(normalizedPath) ) {
diff --git a/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java b/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java
index 7c0f9c8..466e67d 100644
--- a/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java
+++ b/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java
@@ -21,6 +21,7 @@ package org.apache.sling.testing.resourceresolver;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -33,7 +34,6 @@ import org.apache.commons.io.IOUtils;
import org.apache.jackrabbit.util.ISO8601;
import org.apache.sling.api.resource.LoginException;
import org.apache.sling.api.resource.ModifiableValueMap;
-import org.apache.sling.api.resource.PersistenceException;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ResourceUtil;
@@ -177,13 +177,13 @@ public class SlingCrudResourceResolverTest {
}
@Test
- public void testPrimaryTypeResourceType() throws PersistenceException {
+ public void testPrimaryTypeResourceType() {
Resource resource1 = resourceResolver.getResource(testRoot.getPath() + "/node1");
assertEquals(NT_UNSTRUCTURED, resource1.getResourceType());
}
@Test
- public void testNormalizePath() throws PersistenceException {
+ public void testNormalizePath() {
Resource resource1 = resourceResolver.getResource(testRoot.getPath() + "/./node1");
assertEquals("node1", resource1.getName());
@@ -191,4 +191,10 @@ public class SlingCrudResourceResolverTest {
assertEquals("node11", resource11.getName());
}
+ @Test
+ public void testGetResourceNullPath() {
+ Resource resource = resourceResolver.getResource((String)null);
+ assertNull(resource);
+ }
+
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-resourceresolver-mock] 12/14:
add/update SCM urls
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.testing.resourceresolver-mock-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-resourceresolver-mock.git
commit e5bbb65b060c2f8ce34ffee34c82cf21cfbd526f
Author: sseifert <ss...@unknown>
AuthorDate: Fri Oct 17 08:10:43 2014 +0000
add/update SCM urls
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/resourceresolver-mock@1632490 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 46c9752..7961c5a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,9 +40,9 @@
</properties>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/resourceresolver-mock</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/resourceresolver-mock</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/testing/resourceresolver-mock</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/mocks/resourceresolver-mock</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/resourceresolver-mock</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/testing/mocks/resourceresolver-mock</url>
</scm>
<reporting>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-resourceresolver-mock] 11/14:
[maven-release-plugin] rollback the release of
org.apache.sling.testing.resourceresolver-mock-1.0.0
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.testing.resourceresolver-mock-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-resourceresolver-mock.git
commit 103ceac9e55e77858dd5a14f480012ceb16e929a
Author: sseifert <ss...@unknown>
AuthorDate: Fri Oct 17 08:06:37 2014 +0000
[maven-release-plugin] rollback the release of org.apache.sling.testing.resourceresolver-mock-1.0.0
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/resourceresolver-mock@1632489 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index eff8014..46c9752 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>org.apache.sling.testing.resourceresolver-mock</artifactId>
- <version>1.0.0</version>
+ <version>0.3.1-SNAPSHOT</version>
<name>Apache Sling Testing Resource Resolver Mock</name>
<description>
@@ -40,9 +40,9 @@
</properties>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.resourceresolver-mock-1.0.0</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.resourceresolver-mock-1.0.0</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.testing.resourceresolver-mock-1.0.0</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/resourceresolver-mock</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/resourceresolver-mock</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/testing/resourceresolver-mock</url>
</scm>
<reporting>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-resourceresolver-mock] 13/14:
[maven-release-plugin] prepare release
org.apache.sling.testing.resourceresolver-mock-1.0.0
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.testing.resourceresolver-mock-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-resourceresolver-mock.git
commit 72c8c587fbd56ea0a38c1102e0aef7438e46b161
Author: sseifert <ss...@unknown>
AuthorDate: Fri Oct 17 08:11:18 2014 +0000
[maven-release-plugin] prepare release org.apache.sling.testing.resourceresolver-mock-1.0.0
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/resourceresolver-mock@1632491 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7961c5a..eff8014 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>org.apache.sling.testing.resourceresolver-mock</artifactId>
- <version>0.3.1-SNAPSHOT</version>
+ <version>1.0.0</version>
<name>Apache Sling Testing Resource Resolver Mock</name>
<description>
@@ -40,9 +40,9 @@
</properties>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/mocks/resourceresolver-mock</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/resourceresolver-mock</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/testing/mocks/resourceresolver-mock</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.resourceresolver-mock-1.0.0</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.resourceresolver-mock-1.0.0</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.testing.resourceresolver-mock-1.0.0</url>
</scm>
<reporting>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-resourceresolver-mock] 02/14:
Update to Sling Parent POM 22 with baselining enabled
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.testing.resourceresolver-mock-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-resourceresolver-mock.git
commit 3caf89466609066c87761241fff7cc7df041ed34
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Oct 1 06:36:14 2014 +0000
Update to Sling Parent POM 22 with baselining enabled
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/resourceresolver-mock@1628610 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 2989d48..d41047e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>20</version>
+ <version>22</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.