svn commit: r1644041 - in /sling/trunk/testing/mocks/resourceresolver-mock/src: main/java/org/apache/sling/testing/resourceresolver/ test/java/org/apache/sling/testing/resourceresolver/
Author: sseifert
Date: Tue Dec 9 12:57:46 2014
New Revision: 1644041
URL: http://svn.apache.org/r1644041
Log:
SLING-4229 resourceresolver-mock: Provide child resource access in ValueMap
Modified:
sling/trunk/testing/mocks/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResource.java
sling/trunk/testing/mocks/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockValueMap.java
sling/trunk/testing/mocks/resourceresolver-mock/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java
Modified:
sling/trunk/testing/mocks/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResource.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResource.java?rev=1644041r1=1644040r2=1644041view=diff
==
---
sling/trunk/testing/mocks/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResource.java
(original)
+++
sling/trunk/testing/mocks/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResource.java
Tue Dec 9 12:57:46 2014
@@ -50,7 +50,7 @@ public class MockResource extends Abstra
final MapString, Object props,
final ResourceResolver resolver) {
this.path = path;
-this.props = (props instanceof MockValueMap) ? (MockValueMap)props :
new MockValueMap(props);
+this.props = (props instanceof MockValueMap) ? (MockValueMap)props :
new MockValueMap(this, props);
this.resolver = resolver;
}
Modified:
sling/trunk/testing/mocks/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockValueMap.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockValueMap.java?rev=1644041r1=1644040r2=1644041view=diff
==
---
sling/trunk/testing/mocks/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockValueMap.java
(original)
+++
sling/trunk/testing/mocks/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockValueMap.java
Tue Dec 9 12:57:46 2014
@@ -28,6 +28,8 @@ import java.util.Map;
import org.apache.commons.io.IOUtils;
import org.apache.jackrabbit.util.ISO8601;
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.api.resource.ResourceUtil;
import org.apache.sling.api.wrappers.ValueMapDecorator;
/**
@@ -40,17 +42,32 @@ import org.apache.sling.api.wrappers.Val
*/
public class MockValueMap extends ValueMapDecorator {
-public MockValueMap() {
-this(new HashMapString, Object());
+private final Resource resource;
+
+public MockValueMap(Resource resource) {
+this(resource, new HashMapString, Object());
}
-public MockValueMap(MapString,Object map) {
+public MockValueMap(Resource resource, MapString,Object map) {
super(convertForWrite(map));
+this.resource = resource;
}
@SuppressWarnings(unchecked)
@Override
public T T get(String name, ClassT type) {
+
+// check for deep path access
+int slashPos = name.lastIndexOf('/');
+if (slashPos = 0) {
+String resourcePath = ./ + name.substring(0, slashPos);
+String propertyName = name.substring(slashPos + 1);
+Resource childResource = resource.getChild(resourcePath);
+if (childResource!=null) {
+return
ResourceUtil.getValueMap(childResource).get(propertyName, type);
+}
+}
+
if (type == Calendar.class) {
// Support conversion of String to Calendar if value conforms to
ISO8601 date format
Object value = get(name);
@@ -80,7 +97,7 @@ public class MockValueMap extends ValueM
}
return super.get(name, type);
}
-
+
@Override
public Object put(String key, Object value) {
return super.put(key, convertForWrite(value));
Modified:
sling/trunk/testing/mocks/resourceresolver-mock/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/resourceresolver-mock/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java?rev=1644041r1=1644040r2=1644041view=diff
==
---
sling/trunk/testing/mocks/resourceresolver-mock/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java
(original)
+++
svn commit: r1644042 - in /sling/trunk/testing/mocks/sling-mock: pom.xml src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractSlingCrudResourceResolverTest.java
Author: sseifert
Date: Tue Dec 9 13:09:54 2014
New Revision: 1644042
URL: http://svn.apache.org/r1644042
Log:
SLING-4229 add test cases for deep path access support in sling-mock as well
Modified:
sling/trunk/testing/mocks/sling-mock/pom.xml
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractSlingCrudResourceResolverTest.java
Modified: sling/trunk/testing/mocks/sling-mock/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/pom.xml?rev=1644042r1=1644041r2=1644042view=diff
==
--- sling/trunk/testing/mocks/sling-mock/pom.xml (original)
+++ sling/trunk/testing/mocks/sling-mock/pom.xml Tue Dec 9 13:09:54 2014
@@ -61,7 +61,7 @@
dependency
groupIdorg.apache.sling/groupId
artifactIdorg.apache.sling.testing.resourceresolver-mock/artifactId
-version1.0.0/version
+version1.0.1-SNAPSHOT/version
scopecompile/scope
/dependency
Modified:
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractSlingCrudResourceResolverTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractSlingCrudResourceResolverTest.java?rev=1644042r1=1644041r2=1644042view=diff
==
---
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractSlingCrudResourceResolverTest.java
(original)
+++
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractSlingCrudResourceResolverTest.java
Tue Dec 9 13:09:54 2014
@@ -45,6 +45,7 @@ import org.junit.Before;
import org.junit.Test;
import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
/**
* Implements simple write and read resource and values test. Sling CRUD API is
@@ -90,7 +91,9 @@ public abstract class AbstractSlingCrudR
props.put(binaryProp, new ByteArrayInputStream(BINARY_VALUE));
Resource node1 = this.resourceResolver.create(rootNode, node1,
props);
-this.resourceResolver.create(node1, node11, ValueMap.EMPTY);
+resourceResolver.create(node1, node11, ImmutableMap.String,
Objectbuilder()
+.put(stringProp11, STRING_VALUE)
+.build());
this.resourceResolver.create(node1, node12, ValueMap.EMPTY);
this.resourceResolver.commit();
@@ -136,6 +139,21 @@ public abstract class AbstractSlingCrudR
}
@Test
+public void testSimpleProperties_DeepPathAccess() throws IOException {
+Resource resource1 = resourceResolver.getResource(testRoot.getPath());
+assertNotNull(resource1);
+assertEquals(testRoot.getName(), resource1.getName());
+
+ValueMap props = ResourceUtil.getValueMap(resource1);
+assertEquals(STRING_VALUE, props.get(node1/stringProp,
String.class));
+assertArrayEquals(STRING_ARRAY_VALUE,
props.get(node1/stringArrayProp, String[].class));
+assertEquals((Integer) INTEGER_VALUE, props.get(node1/integerProp,
Integer.class));
+assertEquals(DOUBLE_VALUE, props.get(node1/doubleProp,
Double.class), 0.0001);
+assertEquals(BOOLEAN_VALUE, props.get(node1/booleanProp,
Boolean.class));
+assertEquals(STRING_VALUE, props.get(node1/node11/stringProp11,
String.class));
+}
+
+@Test
public void testDateProperty() throws IOException {
Resource resource1 =
this.resourceResolver.getResource(getTestRootResource().getPath() + /node1);
ValueMap props = ResourceUtil.getValueMap(resource1);
svn commit: r1644043 - in /sling/trunk/testing/mocks: sling-mock-jackrabbit/pom.xml sling-mock/src/main/java/org/apache/sling/testing/mock/sling/MockSling.java
Author: sseifert
Date: Tue Dec 9 13:14:58 2014
New Revision: 1644043
URL: http://svn.apache.org/r1644043
Log:
SLING-4108 default to getAdministrativeResourceResolver in sling-mock to
support jackrabbit resource resolver adapter as well
Modified:
sling/trunk/testing/mocks/sling-mock-jackrabbit/pom.xml
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/MockSling.java
Modified: sling/trunk/testing/mocks/sling-mock-jackrabbit/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock-jackrabbit/pom.xml?rev=1644043r1=1644042r2=1644043view=diff
==
--- sling/trunk/testing/mocks/sling-mock-jackrabbit/pom.xml (original)
+++ sling/trunk/testing/mocks/sling-mock-jackrabbit/pom.xml Tue Dec 9 13:14:58
2014
@@ -49,14 +49,14 @@
dependency
groupIdorg.apache.sling/groupId
artifactIdorg.apache.sling.testing.sling-mock/artifactId
-version1.0.0/version
+version1.0.1-SNAPSHOT/version
scopecompile/scope
/dependency
dependency
groupIdorg.apache.sling/groupId
artifactIdorg.apache.sling.testing.sling-mock/artifactId
-version1.0.0/version
+version1.0.1-SNAPSHOT/version
classifiertests/classifier
scopetest/scope
/dependency
Modified:
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/MockSling.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/MockSling.java?rev=1644043r1=1644042r2=1644043view=diff
==
---
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/MockSling.java
(original)
+++
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/MockSling.java
Tue Dec 9 13:14:58 2014
@@ -109,7 +109,7 @@ public final class MockSling {
public static ResourceResolver newResourceResolver(final
ResourceResolverType type) {
ResourceResolverFactory factory = newResourceResolverFactory(type);
try {
-return factory.getResourceResolver(null);
+return factory.getAdministrativeResourceResolver(null);
} catch (LoginException ex) {
throw new RuntimeException(Mock resource resolver factory
implementation seems to require login., ex);
}
svn commit: r1644049 - in /sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/queue: DistributionQueueProcessor.java DistributionQueueProvider.java
Author: tommaso
Date: Tue Dec 9 14:00:40 2014
New Revision: 1644049
URL: http://svn.apache.org/r1644049
Log:
SLING-4146 - queueprovider/processor should be providertypes
Modified:
sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/queue/DistributionQueueProcessor.java
sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/queue/DistributionQueueProvider.java
Modified:
sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/queue/DistributionQueueProcessor.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/queue/DistributionQueueProcessor.java?rev=1644049r1=1644048r2=1644049view=diff
==
---
sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/queue/DistributionQueueProcessor.java
(original)
+++
sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/queue/DistributionQueueProcessor.java
Tue Dec 9 14:00:40 2014
@@ -20,12 +20,12 @@ package org.apache.sling.distribution.qu
import javax.annotation.Nonnull;
-import aQute.bnd.annotation.ConsumerType;
+import aQute.bnd.annotation.ProviderType;
/**
* Processor of {@link DistributionQueueItem}s
*/
-@ConsumerType
+@ProviderType
public interface DistributionQueueProcessor {
/**
Modified:
sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/queue/DistributionQueueProvider.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/queue/DistributionQueueProvider.java?rev=1644049r1=1644048r2=1644049view=diff
==
---
sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/queue/DistributionQueueProvider.java
(original)
+++
sling/trunk/contrib/extensions/distribution/api/src/main/java/org/apache/sling/distribution/queue/DistributionQueueProvider.java
Tue Dec 9 14:00:40 2014
@@ -20,12 +20,12 @@ package org.apache.sling.distribution.qu
import javax.annotation.Nonnull;
-import aQute.bnd.annotation.ConsumerType;
+import aQute.bnd.annotation.ProviderType;
/**
* A provider for {@link DistributionQueue}s
*/
-@ConsumerType
+@ProviderType
public interface DistributionQueueProvider {
/**
svn commit: r1644056 - /sling/trunk/bundles/extensions/models/integration-tests/pom.xml
Author: kwin Date: Tue Dec 9 14:21:14 2014 New Revision: 1644056 URL: http://svn.apache.org/r1644056 Log: SLING-4226 - use latest release of the launchpad (which does not include Sling Models itself) and use latest testing tools (to prevent IMSE in case of keepJarRunning) Modified: sling/trunk/bundles/extensions/models/integration-tests/pom.xml Modified: sling/trunk/bundles/extensions/models/integration-tests/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/integration-tests/pom.xml?rev=1644056r1=1644055r2=1644056view=diff == --- sling/trunk/bundles/extensions/models/integration-tests/pom.xml (original) +++ sling/trunk/bundles/extensions/models/integration-tests/pom.xml Tue Dec 9 14:21:14 2014 @@ -249,10 +249,11 @@ version1.0.8/version scopeprovided/scope /dependency +!-- use 1.0.9-SNAPSHOT due to https://issues.apache.org/jira/browse/SLING-3819 -- dependency groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.testing.tools/artifactId -version1.0.8/version +version1.0.9-SNAPSHOT/version scopeprovided/scope /dependency dependency @@ -315,11 +316,12 @@ artifactIdorg.apache.sling.commons.json/artifactId version2.0.6/version /dependency +!-- use latest release version which does no itself include Sling Model due to issues with redeployment (see https://issues.apache.org/jira/browse/SLING-4226) -- dependency groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.launchpad/artifactId classifierstandalone/classifier -version8-SNAPSHOT/version +version7/version /dependency dependency groupIdorg.slf4j/groupId
svn commit: r1644069 - in /sling/trunk/bundles/extensions/models: api/ api/src/main/java/org/apache/sling/models/annotations/ api/src/main/java/org/apache/sling/models/factory/ impl/ impl/src/main/jav
Author: kwin
Date: Tue Dec 9 14:46:28 2014
New Revision: 1644069
URL: http://svn.apache.org/r1644069
Log:
SLING-4161 support Sling Validation by a new field on the Model annotation
The dependency to Sling Validation is optional (i.e. Sling Models still work
even if Sling Validation is not deployed)
Added:
sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/annotations/ValidationStrategy.java
sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/factory/InvalidResourceException.java
sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/factory/InvalidValidationModelException.java
sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/factory/ModelClassException.java
sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/validation/
sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/validation/ModelValidation.java
sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/validation/ModelValidationImpl.java
Removed:
sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/factory/InvalidModelException.java
Modified:
sling/trunk/bundles/extensions/models/api/pom.xml
sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/annotations/Model.java
sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/annotations/package-info.java
sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/factory/ModelFactory.java
sling/trunk/bundles/extensions/models/impl/pom.xml
sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/ModelAdapterFactory.java
sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/Result.java
sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/AdapterFactoryTest.java
sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/ConstructorTest.java
sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/InvalidAdaptationsTest.java
sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/PostConstructTest.java
Modified: sling/trunk/bundles/extensions/models/api/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/api/pom.xml?rev=1644069r1=1644068r2=1644069view=diff
==
--- sling/trunk/bundles/extensions/models/api/pom.xml (original)
+++ sling/trunk/bundles/extensions/models/api/pom.xml Tue Dec 9 14:46:28 2014
@@ -49,6 +49,7 @@
configuration
instructions
Export-Packageorg.apache.sling.models.*,javax.inject;version=0/Export-Package
+
DynamicImport-Packageorg.apache.sling.validation.api.*/DynamicImport-Package
/instructions
/configuration
/plugin
@@ -61,5 +62,18 @@
version1/version
scopeprovided/scope
/dependency
+dependency
+groupIdorg.apache.sling/groupId
+artifactIdorg.apache.sling.validation.api/artifactId
+version1.0.0-SNAPSHOT/version
+scopeprovided/scope
+optionaltrue/optional
+/dependency
+dependency
+groupIdcommons-lang/groupId
+artifactIdcommons-lang/artifactId
+version2.5/version
+scopeprovided/scope
+/dependency
/dependencies
/project
Modified:
sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/annotations/Model.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/annotations/Model.java?rev=1644069r1=1644068r2=1644069view=diff
==
---
sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/annotations/Model.java
(original)
+++
sling/trunk/bundles/extensions/models/api/src/main/java/org/apache/sling/models/annotations/Model.java
Tue Dec 9 14:46:28 2014
@@ -50,5 +50,14 @@ public @interface Model {
* @return Condition that is displayed in the felix console adapter plugin
*/
public String condition() default ;
+
+/**
+ *
+ * @return {@link ValidationStrategy.DISABLED} in case the model should
not be validated through Sling Validation (default),
+ * {@link ValidationStrategy.REQUIRED} in case the model should be
validated and if no appropriate Sling Validation Model exists it is considered
invalid or
+ * {@link ValidationStrategy.OPTIONAL} in case the model should be
svn commit: r1644089 - in /sling/trunk/testing/mocks/jcr-mock/src: main/java/org/apache/sling/testing/mock/jcr/ test/java/org/apache/sling/testing/mock/jcr/
Author: sseifert
Date: Tue Dec 9 15:32:02 2014
New Revision: 1644089
URL: http://svn.apache.org/r1644089
Log:
SLING-4230 Add support for mocking queries and query results
Added:
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockQuery.java
(with props)
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockQueryManager.java
(with props)
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockQueryResult.java
(with props)
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockQueryResultHandler.java
(with props)
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockRow.java
(with props)
sling/trunk/testing/mocks/jcr-mock/src/test/java/org/apache/sling/testing/mock/jcr/MockQueryManagerTest.java
(with props)
Modified:
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockJcr.java
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockWorkspace.java
Modified:
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockJcr.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockJcr.java?rev=1644089r1=1644088r2=1644089view=diff
==
---
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockJcr.java
(original)
+++
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockJcr.java
Tue Dec 9 15:32:02 2014
@@ -18,16 +18,23 @@
*/
package org.apache.sling.testing.mock.jcr;
+import java.util.List;
+
+import javax.jcr.Node;
import javax.jcr.Repository;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.SimpleCredentials;
+import javax.jcr.query.QueryManager;
import org.apache.commons.lang3.StringUtils;
+import aQute.bnd.annotation.ConsumerType;
+
/**
* Factory for mock JCR objects.
*/
+@ConsumerType
public final class MockJcr {
/**
@@ -81,5 +88,48 @@ public final class MockJcr {
throw new RuntimeException(Creating mocked JCR session failed.,
ex);
}
}
+
+/**
+ * Sets the expected result list for all queries executed with the given
query manager.
+ * @param queryManager Mocked query manager
+ * @param resultList Result list
+ */
+public static void setQueryResult(final QueryManager queryManager, final
ListNode resultList) {
+addQueryResultHandler(queryManager, new MockQueryResultHandler() {
+@Override
+public MockQueryResult executeQuery(MockQuery query) {
+return new MockQueryResult(resultList);
+}
+});
+}
+
+/**
+ * Sets the expected result list for all queries with the given statement
executed with the given query manager.
+ * @param queryManager Mocked query manager
+ * @param statement Query statement
+ * @param resultList Result list
+ */
+public static void setQueryResult(final QueryManager queryManager, final
String statement, final ListNode resultList) {
+addQueryResultHandler(queryManager, new MockQueryResultHandler() {
+@Override
+public MockQueryResult executeQuery(MockQuery query) {
+if (StringUtils.equals(query.getStatement(), statement)) {
+return new MockQueryResult(resultList);
+}
+else {
+return null;
+}
+}
+});
+}
+
+/**
+ * Adds a query result handler for the given query manager which may
return query results for certain queries that are executed.
+ * @param queryManager Mocked query manager
+ * @param resultHandler Mock query result handler
+ */
+public static void addQueryResultHandler(final QueryManager queryManager,
final MockQueryResultHandler resultHandler) {
+((MockQueryManager)queryManager).addResultHandler(resultHandler);
+}
}
Added:
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockQuery.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockQuery.java?rev=1644089view=auto
==
---
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockQuery.java
(added)
+++
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockQuery.java
Tue Dec 9 15:32:02 2014
@@ -0,0 +1,115 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed
svn commit: r1644092 - in /sling/trunk/testing/mocks/jcr-mock/src: main/java/org/apache/sling/testing/mock/jcr/MockJcr.java test/java/org/apache/sling/testing/mock/jcr/MockQueryManagerTest.java
Author: sseifert
Date: Tue Dec 9 15:48:31 2014
New Revision: 1644092
URL: http://svn.apache.org/r1644092
Log:
SLING-4230 Add support for mocking queries and query results
Modified:
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockJcr.java
sling/trunk/testing/mocks/jcr-mock/src/test/java/org/apache/sling/testing/mock/jcr/MockQueryManagerTest.java
Modified:
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockJcr.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockJcr.java?rev=1644092r1=1644091r2=1644092view=diff
==
---
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockJcr.java
(original)
+++
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockJcr.java
Tue Dec 9 15:48:31 2014
@@ -91,6 +91,15 @@ public final class MockJcr {
/**
* Sets the expected result list for all queries executed with the given
query manager.
+ * @param session JCR session
+ * @param resultList Result list
+ */
+public static void setQueryResult(final Session session, final ListNode
resultList) {
+setQueryResult(getQueryManager(session), resultList);
+}
+
+/**
+ * Sets the expected result list for all queries executed with the given
query manager.
* @param queryManager Mocked query manager
* @param resultList Result list
*/
@@ -105,6 +114,16 @@ public final class MockJcr {
/**
* Sets the expected result list for all queries with the given statement
executed with the given query manager.
+ * @param session JCR session
+ * @param statement Query statement
+ * @param resultList Result list
+ */
+public static void setQueryResult(final Session session, final String
statement, final ListNode resultList) {
+setQueryResult(getQueryManager(session), statement, resultList);
+}
+
+/**
+ * Sets the expected result list for all queries with the given statement
executed with the given query manager.
* @param queryManager Mocked query manager
* @param statement Query statement
* @param resultList Result list
@@ -125,11 +144,29 @@ public final class MockJcr {
/**
* Adds a query result handler for the given query manager which may
return query results for certain queries that are executed.
+ * @param session JCR session
+ * @param resultHandler Mock query result handler
+ */
+public static void addQueryResultHandler(final Session session, final
MockQueryResultHandler resultHandler) {
+addQueryResultHandler(getQueryManager(session), resultHandler);
+}
+
+/**
+ * Adds a query result handler for the given query manager which may
return query results for certain queries that are executed.
* @param queryManager Mocked query manager
* @param resultHandler Mock query result handler
*/
public static void addQueryResultHandler(final QueryManager queryManager,
final MockQueryResultHandler resultHandler) {
((MockQueryManager)queryManager).addResultHandler(resultHandler);
}
+
+private static QueryManager getQueryManager(Session session) {
+try {
+return session.getWorkspace().getQueryManager();
+}
+catch (RepositoryException ex) {
+throw new RuntimeException(Unable to access query manager., ex);
+}
+}
}
Modified:
sling/trunk/testing/mocks/jcr-mock/src/test/java/org/apache/sling/testing/mock/jcr/MockQueryManagerTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/jcr-mock/src/test/java/org/apache/sling/testing/mock/jcr/MockQueryManagerTest.java?rev=1644092r1=1644091r2=1644092view=diff
==
---
sling/trunk/testing/mocks/jcr-mock/src/test/java/org/apache/sling/testing/mock/jcr/MockQueryManagerTest.java
(original)
+++
sling/trunk/testing/mocks/jcr-mock/src/test/java/org/apache/sling/testing/mock/jcr/MockQueryManagerTest.java
Tue Dec 9 15:48:31 2014
@@ -132,7 +132,7 @@ public class MockQueryManagerTest {
@Test
public void testQueryResults_MultipleResultHandlers() throws
RepositoryException {
final ListNode sampleNodes2 = ImmutableList.of(sampleNodes.get(0));
-MockJcr.addQueryResultHandler(queryManager, new
MockQueryResultHandler() {
+MockJcr.addQueryResultHandler(session, new MockQueryResultHandler() {
@Override
public MockQueryResult executeQuery(MockQuery query) {
if (StringUtils.equals(query.getStatement(), query2)) {
@@ -142,7 +142,7 @@ public class MockQueryManagerTest {
}
});
-MockJcr.addQueryResultHandler(queryManager, new
svn commit: r1644096 - in /sling/trunk/testing/mocks/jcr-mock/src: main/java/org/apache/sling/testing/mock/jcr/MockJcr.java test/java/org/apache/sling/testing/mock/jcr/MockQueryManagerTest.java
Author: sseifert
Date: Tue Dec 9 15:59:35 2014
New Revision: 1644096
URL: http://svn.apache.org/r1644096
Log:
SLING-4230 Add support for mocking queries and query results
Modified:
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockJcr.java
sling/trunk/testing/mocks/jcr-mock/src/test/java/org/apache/sling/testing/mock/jcr/MockQueryManagerTest.java
Modified:
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockJcr.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockJcr.java?rev=1644096r1=1644095r2=1644096view=diff
==
---
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockJcr.java
(original)
+++
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockJcr.java
Tue Dec 9 15:59:35 2014
@@ -116,23 +116,26 @@ public final class MockJcr {
* Sets the expected result list for all queries with the given statement
executed with the given query manager.
* @param session JCR session
* @param statement Query statement
+ * @param language Query language
* @param resultList Result list
*/
-public static void setQueryResult(final Session session, final String
statement, final ListNode resultList) {
-setQueryResult(getQueryManager(session), statement, resultList);
+public static void setQueryResult(final Session session, final String
statement, final String language, final ListNode resultList) {
+setQueryResult(getQueryManager(session), statement, language,
resultList);
}
/**
* Sets the expected result list for all queries with the given statement
executed with the given query manager.
* @param queryManager Mocked query manager
* @param statement Query statement
+ * @param language Query language
* @param resultList Result list
*/
-public static void setQueryResult(final QueryManager queryManager, final
String statement, final ListNode resultList) {
+public static void setQueryResult(final QueryManager queryManager, final
String statement, final String language, final ListNode resultList) {
addQueryResultHandler(queryManager, new MockQueryResultHandler() {
@Override
public MockQueryResult executeQuery(MockQuery query) {
-if (StringUtils.equals(query.getStatement(), statement)) {
+if (StringUtils.equals(query.getStatement(), statement)
+ StringUtils.equals(query.getLanguage(), language)) {
return new MockQueryResult(resultList);
}
else {
Modified:
sling/trunk/testing/mocks/jcr-mock/src/test/java/org/apache/sling/testing/mock/jcr/MockQueryManagerTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/jcr-mock/src/test/java/org/apache/sling/testing/mock/jcr/MockQueryManagerTest.java?rev=1644096r1=1644095r2=1644096view=diff
==
---
sling/trunk/testing/mocks/jcr-mock/src/test/java/org/apache/sling/testing/mock/jcr/MockQueryManagerTest.java
(original)
+++
sling/trunk/testing/mocks/jcr-mock/src/test/java/org/apache/sling/testing/mock/jcr/MockQueryManagerTest.java
Tue Dec 9 15:59:35 2014
@@ -95,7 +95,7 @@ public class MockQueryManagerTest {
@SuppressWarnings(unchecked)
@Test
public void testQueryResults_SpecificQuery() throws RepositoryException {
-MockJcr.setQueryResult(queryManager, query1, sampleNodes);
+MockJcr.setQueryResult(queryManager, query1, Query.JCR_SQL2,
sampleNodes);
Query query = queryManager.createQuery(query1, Query.JCR_SQL2);
QueryResult result = query.execute();
svn commit: r1644098 - /sling/site/trunk/content/documentation/development/jcr-mock.mdtext
Author: sseifert Date: Tue Dec 9 16:01:26 2014 New Revision: 1644098 URL: http://svn.apache.org/r1644098 Log: SLING-4230 Add support for mocking queries and query results Modified: sling/site/trunk/content/documentation/development/jcr-mock.mdtext Modified: sling/site/trunk/content/documentation/development/jcr-mock.mdtext URL: http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/development/jcr-mock.mdtext?rev=1644098r1=1644097r2=1644098view=diff == --- sling/site/trunk/content/documentation/development/jcr-mock.mdtext (original) +++ sling/site/trunk/content/documentation/development/jcr-mock.mdtext Tue Dec 9 16:01:26 2014 @@ -23,12 +23,12 @@ The mock implementation supports: * Reading and writing all data (primitive values, arrays, binary data) via the JCR API * Creating any number of nodes and properties (stored in-memory in a hash map) * Register namespaces +* Queries are supported by setting expected results for a given query The following features are *not supported*: * Node types are supported in the API, but their definitions and constraints are not applied * Versioning not supported -* Search not supported * Transactions not supported * Observation events can be registered but are ignored * Access control always grants access @@ -51,4 +51,23 @@ Example: // get repository Repository repository = MockJcr.newRepository(); -The repository is empty and contains only the root node. You can use the JCR API to fill it with content. +The repository is empty and contains only the root node. You can use the JCR API to read or write content. + + +### Mocking queries + +If you want to test code that contains a JCR query you can simulate a query execution and set the result to return during setting up your unit test. + +Example: + +#!java +// prepare mocked search result +ListNode resultNodes = ImmutableList.of(node1, node2, node3); + +// return this result for all queries +MockJcr.setQueryResult(session, resultNodes); + +// return this result for a specific query +MockJcr.setQueryResult(session, your query statement, Query.JCR_SQL2, resultNodes); + +Alternatively you can use the `MockJcr.addQueryResultHandler` method to pass a callback object that allows you to return a query result after inspecting the given query object.
svn commit: r931993 - in /websites/staging/sling/trunk/content: ./ documentation/development/jcr-mock.html
Author: buildbot Date: Tue Dec 9 16:01:40 2014 New Revision: 931993 Log: Staging update by buildbot for sling Modified: websites/staging/sling/trunk/content/ (props changed) websites/staging/sling/trunk/content/documentation/development/jcr-mock.html Propchange: websites/staging/sling/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Tue Dec 9 16:01:40 2014 @@ -1 +1 @@ -1642835 +1644098 Modified: websites/staging/sling/trunk/content/documentation/development/jcr-mock.html == --- websites/staging/sling/trunk/content/documentation/development/jcr-mock.html (original) +++ websites/staging/sling/trunk/content/documentation/development/jcr-mock.html Tue Dec 9 16:01:40 2014 @@ -97,6 +97,7 @@ lia href=#implemented-mock-featuresImplemented mock features/a/li lia href=#usageUsage/aul lia href=#getting-jcr-mock-objectsGetting JCR mock objects/a/li +lia href=#mocking-queriesMocking queries/a/li /ul /li /ul @@ -119,12 +120,12 @@ liReading and writing all data (primitive values, arrays, binary data) via the JCR API/li liCreating any number of nodes and properties (stored in-memory in a hash map)/li liRegister namespaces/li +liQueries are supported by setting expected results for a given query/li /ul pThe following features are emnot supported/em:/p ul liNode types are supported in the API, but their definitions and constraints are not applied/li liVersioning not supported/li -liSearch not supported/li liTransactions not supported/li liObservation events can be registered but are ignored/li liAccess control always grants access/li @@ -147,9 +148,31 @@ /pre/div /td/tr/table -pThe repository is empty and contains only the root node. You can use the JCR API to fill it with content./p +pThe repository is empty and contains only the root node. You can use the JCR API to read or write content./p +h3 id=mocking-queriesMocking queries/h3 +pIf you want to test code that contains a JCR query you can simulate a query execution and set the result to return during setting up your unit test./p +pExample:/p +table class=codehilitetabletrtd class=linenosdiv class=linenodivpre1 +2 +3 +4 +5 +6 +7 +8/pre/div/tdtd class=codediv class=codehiliteprespan class=c1// prepare mocked search result/span +span class=nList/spanspan class=olt;/spanspan class=nNode/spanspan class=ogt;/span span class=nresultNodes/span span class=o=/span span class=nImmutableList/spanspan class=o./spanspan class=naof/spanspan class=o(/spanspan class=nnode1/spanspan class=o,/span span class=nnode2/spanspan class=o,/span span class=nnode3/spanspan class=o);/span + +span class=c1// return this result for all queries/span +span class=nMockJcr/spanspan class=o./spanspan class=nasetQueryResult/spanspan class=o(/spanspan class=nsession/spanspan class=o,/span span class=nresultNodes/spanspan class=o);/span + +span class=c1// return this result for a specific query/span +span class=nMockJcr/spanspan class=o./spanspan class=nasetQueryResult/spanspan class=o(/spanspan class=nsession/spanspan class=o,/span span class=squot;your query statementquot;/spanspan class=o,/span span class=nQuery/spanspan class=o./spanspan class=naJCR_SQL2/spanspan class=o,/span span class=nresultNodes/spanspan class=o);/span +/pre/div +/td/tr/table + +pAlternatively you can use the codeMockJcr.addQueryResultHandler/code method to pass a callback object that allows you to return a query result after inspecting the given query object./p div class=timestamp style=margin-top: 30px; font-size: 80%; text-align: right; -Rev. 1631433 by sseifert on Mon, 13 Oct 2014 15:01:38 + +Rev. 1644098 by sseifert on Tue, 9 Dec 2014 16:01:26 + /div div class=trademarkFooter Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project
svn commit: r931995 - /websites/production/sling/content/
Author: sseifert Date: Tue Dec 9 16:03:44 2014 New Revision: 931995 Log: Publishing svnmucc operation to sling site by sseifert Added: websites/production/sling/content/ - copied from r931993, websites/staging/sling/trunk/content/
svn commit: r1644110 - in /sling/trunk/bundles/extensions/adapter: ./ src/main/java/org/apache/sling/adapter/ src/main/java/org/apache/sling/adapter/internal/ src/test/java/org/apache/sling/adapter/in
Author: rombert
Date: Tue Dec 9 16:29:06 2014
New Revision: 1644110
URL: http://svn.apache.org/r1644110
Log:
SLING-4217 - Register OSGi services corresponding to available adapter
factories
Extend the AdapterManagerImpl to register OSGi services for the adapter
factories that it manages. These services are unregistered when the
adapter factories themselves are unregistered.
Added:
sling/trunk/bundles/extensions/adapter/src/main/java/org/apache/sling/adapter/Adaption.java
sling/trunk/bundles/extensions/adapter/src/main/java/org/apache/sling/adapter/internal/AdaptionImpl.java
Modified:
sling/trunk/bundles/extensions/adapter/pom.xml
sling/trunk/bundles/extensions/adapter/src/main/java/org/apache/sling/adapter/internal/AdapterFactoryDescriptor.java
sling/trunk/bundles/extensions/adapter/src/main/java/org/apache/sling/adapter/internal/AdapterManagerImpl.java
sling/trunk/bundles/extensions/adapter/src/test/java/org/apache/sling/adapter/internal/AdapterManagerTest.java
Modified: sling/trunk/bundles/extensions/adapter/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/adapter/pom.xml?rev=1644110r1=1644109r2=1644110view=diff
==
--- sling/trunk/bundles/extensions/adapter/pom.xml (original)
+++ sling/trunk/bundles/extensions/adapter/pom.xml Tue Dec 9 16:29:06 2014
@@ -62,7 +62,7 @@
configuration
instructions
Export-Package
-org.apache.sling.adapter;version=2.0.6
+org.apache.sling.adapter;version=2.1.0
/Export-Package
Private-Package
org.apache.sling.adapter.internal
Added:
sling/trunk/bundles/extensions/adapter/src/main/java/org/apache/sling/adapter/Adaption.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/adapter/src/main/java/org/apache/sling/adapter/Adaption.java?rev=1644110view=auto
==
---
sling/trunk/bundles/extensions/adapter/src/main/java/org/apache/sling/adapter/Adaption.java
(added)
+++
sling/trunk/bundles/extensions/adapter/src/main/java/org/apache/sling/adapter/Adaption.java
Tue Dec 9 16:29:06 2014
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.adapter;
+
+/**
+ * The ttAdaption/tt is a marker interface which is registered as a
service by the ttAdapterManager/tt once a
+ * certain ttAdapterFactory/tt is available
+ *
+ * p
+ * Its intended use is to make it simple for declarative service components to
wait for a certain
+ * ttAdapterFactory/tt to be available
+ *
+ * p
+ * A usage sample is
+ *
+ *
code@Reference(referenceInterface=Adaptation.class,target=((adaptable=com.myco.MyClass)(adaptable=org.apache.sling.api.Resource),
name = ignore, strategy = ReferenceStrategy.LOOKUP))/code
+ *
+ */
+public interface Adaption {
+
+}
Modified:
sling/trunk/bundles/extensions/adapter/src/main/java/org/apache/sling/adapter/internal/AdapterFactoryDescriptor.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/adapter/src/main/java/org/apache/sling/adapter/internal/AdapterFactoryDescriptor.java?rev=1644110r1=1644109r2=1644110view=diff
==
---
sling/trunk/bundles/extensions/adapter/src/main/java/org/apache/sling/adapter/internal/AdapterFactoryDescriptor.java
(original)
+++
sling/trunk/bundles/extensions/adapter/src/main/java/org/apache/sling/adapter/internal/AdapterFactoryDescriptor.java
Tue Dec 9 16:29:06 2014
@@ -20,6 +20,7 @@ package org.apache.sling.adapter.interna
import org.apache.sling.api.adapter.AdapterFactory;
import org.osgi.framework.ServiceReference;
+import org.osgi.framework.ServiceRegistration;
import org.osgi.service.component.ComponentContext;
/**
@@ -37,6 +38,8 @@ public class AdapterFactoryDescriptor {
private final ComponentContext context;
+private ServiceRegistration adaption;
+
public AdapterFactoryDescriptor(
final
svn commit: r1644112 - /sling/trunk/bundles/extensions/adapter/pom.xml
Author: rombert Date: Tue Dec 9 16:33:44 2014 New Revision: 1644112 URL: http://svn.apache.org/r1644112 Log: [maven-release-plugin] prepare release org.apache.sling.adapter-2.1.4 Modified: sling/trunk/bundles/extensions/adapter/pom.xml Modified: sling/trunk/bundles/extensions/adapter/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/adapter/pom.xml?rev=1644112r1=1644111r2=1644112view=diff == --- sling/trunk/bundles/extensions/adapter/pom.xml (original) +++ sling/trunk/bundles/extensions/adapter/pom.xml Tue Dec 9 16:33:44 2014 @@ -29,7 +29,7 @@ artifactIdorg.apache.sling.adapter/artifactId packagingbundle/packaging -version2.1.3-SNAPSHOT/version +version2.1.4/version nameApache Sling Adapter Manager Implementation/name description @@ -39,9 +39,9 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/adapter/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/adapter/developerConnection - urlhttp://svn.apache.org/viewvc/sling/trunk/bundles/extensions/adapter/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.adapter-2.1.4/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.adapter-2.1.4/developerConnection + urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.adapter-2.1.4/url /scm properties
svn commit: r1644114 - /sling/trunk/bundles/extensions/adapter/pom.xml
Author: rombert Date: Tue Dec 9 16:34:36 2014 New Revision: 1644114 URL: http://svn.apache.org/r1644114 Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/bundles/extensions/adapter/pom.xml Modified: sling/trunk/bundles/extensions/adapter/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/adapter/pom.xml?rev=1644114r1=1644113r2=1644114view=diff == --- sling/trunk/bundles/extensions/adapter/pom.xml (original) +++ sling/trunk/bundles/extensions/adapter/pom.xml Tue Dec 9 16:34:36 2014 @@ -29,7 +29,7 @@ artifactIdorg.apache.sling.adapter/artifactId packagingbundle/packaging -version2.1.4/version +version2.1.5-SNAPSHOT/version nameApache Sling Adapter Manager Implementation/name description @@ -39,9 +39,9 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.adapter-2.1.4/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.adapter-2.1.4/developerConnection - urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.adapter-2.1.4/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/adapter/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/adapter/developerConnection + urlhttp://svn.apache.org/viewvc/sling/trunk/bundles/extensions/adapter/url /scm properties
svn commit: r1644113 - /sling/tags/org.apache.sling.adapter-2.1.4/
Author: rombert Date: Tue Dec 9 16:34:32 2014 New Revision: 1644113 URL: http://svn.apache.org/r1644113 Log: [maven-release-plugin] copy for tag org.apache.sling.adapter-2.1.4 Added: sling/tags/org.apache.sling.adapter-2.1.4/ - copied from r1644112, sling/trunk/bundles/extensions/adapter/
Nexus: Staging Completed
Message from: https://repository.apache.orgDescription:org.apache.sling.adapter 2.1.4Deployer properties:"userAgent" = "Apache-Maven/3.2.3 (Java 1.8.0_40; Linux 3.16.6-2-desktop), Apache-Maven/3.2.3 (Java 1.8.0_40; Linux 3.16.6-2-desktop)""userId" = "rombert""ip" = "193.105.140.131"Details:The following artifacts have been staged/org/apache/sling/org.apache.sling.adapter/2.1.4/org.apache.sling.adapter-2.1.4.jar.asc(SHA1: d2afbfa8ad0a93a8ec96fbea0bf8ef7060c8f33d)/org/apache/sling/org.apache.sling.adapter/2.1.4/org.apache.sling.adapter-2.1.4-source-release.zip(SHA1: 292937b3e7400528d716df751ec669ac382221a0)/org/apache/sling/org.apache.sling.adapter/2.1.4/org.apache.sling.adapter-2.1.4-sources.jar(SHA1: 7159b8e37cc0860c3400b2b15a6363fe24454e26)/org/apache/sling/org.apache.sling.adapter/2.1.4/org.apache.sling.adapter-2.1.4-source-release.zip.asc(SHA1: b51c717caae5e4f238ca70a0afd9da338df43e6d)/org/apache/sling/org.apache.sling.adapter/2.1.4/org.apache.sling.adapter-2.1.4.pom(SHA1: 5dd6f9f72d73c997bbe24bafe3452e612151f992)/org/apache/sling/org.apache.sling.adapter/2.1.4/org.apache.sling.adapter-2.1.4.pom.asc(SHA1: 35ba094d38e90f58c424e773bc4c21b32a26e625)/org/apache/sling/org.apache.sling.adapter/2.1.4/org.apache.sling.adapter-2.1.4-sources.jar.asc(SHA1: 2f55b570753fd8cbfc663316ae5fe56d63dc145d)/org/apache/sling/org.apache.sling.adapter/2.1.4/org.apache.sling.adapter-2.1.4.jar(SHA1: a8cf72f0ad2e688e248e969bd8a6bfd15aba3ee3)/org/apache/sling/org.apache.sling.adapter/2.1.4/org.apache.sling.adapter-2.1.4-javadoc.jar.asc(SHA1: a956cf6d4279c7b0203457eca59d887e27bb2ec5)/org/apache/sling/org.apache.sling.adapter/2.1.4/org.apache.sling.adapter-2.1.4-javadoc.jar(SHA1: dac2fa7f869b351315fecb80112a29f40ffa480c)Action performed by Robert Munteanu (rombert)
svn commit: r1644212 - /sling/trunk/testing/mocks/jcr-mock/pom.xml
Author: sseifert Date: Tue Dec 9 22:51:13 2014 New Revision: 1644212 URL: http://svn.apache.org/r1644212 Log: [maven-release-plugin] prepare release org.apache.sling.testing.jcr-mock-1.1.0 Modified: sling/trunk/testing/mocks/jcr-mock/pom.xml Modified: sling/trunk/testing/mocks/jcr-mock/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/jcr-mock/pom.xml?rev=1644212r1=1644211r2=1644212view=diff == --- sling/trunk/testing/mocks/jcr-mock/pom.xml (original) +++ sling/trunk/testing/mocks/jcr-mock/pom.xml Tue Dec 9 22:51:13 2014 @@ -28,7 +28,7 @@ /parent artifactIdorg.apache.sling.testing.jcr-mock/artifactId -version1.0.1-SNAPSHOT/version +version1.1.0/version packagingbundle/packaging nameApache Sling Testing JCR Mock/name @@ -39,9 +39,9 @@ /properties scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/mocks/jcr-mock/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/jcr-mock/developerConnection - urlhttp://svn.apache.org/viewvc/sling/trunk/testing/mocks/jcr-mock/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.jcr-mock-1.1.0/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.jcr-mock-1.1.0/developerConnection + urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.testing.jcr-mock-1.1.0/url /scm dependencies
svn commit: r1644213 - /sling/tags/org.apache.sling.testing.jcr-mock-1.1.0/
Author: sseifert Date: Tue Dec 9 22:51:26 2014 New Revision: 1644213 URL: http://svn.apache.org/r1644213 Log: [maven-release-plugin] copy for tag org.apache.sling.testing.jcr-mock-1.1.0 Added: sling/tags/org.apache.sling.testing.jcr-mock-1.1.0/ - copied from r1644212, sling/trunk/testing/mocks/jcr-mock/
svn commit: r1644214 - /sling/trunk/testing/mocks/jcr-mock/pom.xml
Author: sseifert Date: Tue Dec 9 22:51:30 2014 New Revision: 1644214 URL: http://svn.apache.org/r1644214 Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/testing/mocks/jcr-mock/pom.xml Modified: sling/trunk/testing/mocks/jcr-mock/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/jcr-mock/pom.xml?rev=1644214r1=1644213r2=1644214view=diff == --- sling/trunk/testing/mocks/jcr-mock/pom.xml (original) +++ sling/trunk/testing/mocks/jcr-mock/pom.xml Tue Dec 9 22:51:30 2014 @@ -28,7 +28,7 @@ /parent artifactIdorg.apache.sling.testing.jcr-mock/artifactId -version1.1.0/version +version1.1.1-SNAPSHOT/version packagingbundle/packaging nameApache Sling Testing JCR Mock/name @@ -39,9 +39,9 @@ /properties scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.jcr-mock-1.1.0/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.jcr-mock-1.1.0/developerConnection - urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.testing.jcr-mock-1.1.0/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/mocks/jcr-mock/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/jcr-mock/developerConnection + urlhttp://svn.apache.org/viewvc/sling/trunk/testing/mocks/jcr-mock/url /scm dependencies
svn commit: r1644220 - in /sling/trunk/testing/mocks: osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/junit/ resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/ s
Author: sseifert
Date: Tue Dec 9 23:01:37 2014
New Revision: 1644220
URL: http://svn.apache.org/r1644220
Log:
fix some javadoc errors/warnings
Modified:
sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/junit/OsgiContext.java
sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/junit/OsgiContextCallback.java
sling/trunk/testing/mocks/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockHelper.java
sling/trunk/testing/mocks/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolverFactory.java
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/junit/SlingContextCallback.java
Modified:
sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/junit/OsgiContext.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/junit/OsgiContext.java?rev=1644220r1=1644219r2=1644220view=diff
==
---
sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/junit/OsgiContext.java
(original)
+++
sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/junit/OsgiContext.java
Tue Dec 9 23:01:37 2014
@@ -58,7 +58,6 @@ public final class OsgiContext extends O
* @param tearDownCallback Allows the application to register an own
*callback function that is called before the built-in teardown
*rules are executed.
- * @param resourceResolverType Resource resolver type.
*/
public OsgiContext(final OsgiContextCallback setUpCallback, final
OsgiContextCallback tearDownCallback) {
Modified:
sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/junit/OsgiContextCallback.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/junit/OsgiContextCallback.java?rev=1644220r1=1644219r2=1644220view=diff
==
---
sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/junit/OsgiContextCallback.java
(original)
+++
sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/junit/OsgiContextCallback.java
Tue Dec 9 23:01:37 2014
@@ -29,8 +29,7 @@ public interface OsgiContextCallback {
/**
* Execute callback action
* @param context OSGi context
- * @throws IOException
- * @throws PersistenceException
+ * @throws IOException I/O exception
*/
void execute(OsgiContext context) throws IOException;
Modified:
sling/trunk/testing/mocks/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockHelper.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockHelper.java?rev=1644220r1=1644219r2=1644220view=diff
==
---
sling/trunk/testing/mocks/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockHelper.java
(original)
+++
sling/trunk/testing/mocks/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockHelper.java
Tue Dec 9 23:01:37 2014
@@ -49,16 +49,19 @@ public class MockHelper {
/**
* Create a new helper
+ * @param resolver Resource resolver
+ * @return this
*/
public static MockHelper create(final ResourceResolver resolver) {
return new MockHelper(resolver);
}
/**
- * Add a new resource
+ * Add a new resource.
* If the path is relative, this resource is added as a child to the
previous resource.
- * If the path is relative and starts with a dot, this resource is added
as a peer to
- * the previous resource.
+ * If the path is relative and starts with a dot, this resource is added
as a peer to the previous resource.
+ * @param path Resource path
+ * @return this
*/
public MockHelper resource(final String path) {
final String fullPath;
@@ -80,6 +83,9 @@ public class MockHelper {
/**
* Add a property to the current resource
+ * @param name Property name
+ * @param value Property value
+ * @return this
*/
public MockHelper p(final String name, final Object value) {
final Description d = this.stack.peek();
@@ -90,6 +96,7 @@ public class MockHelper {
/**
* Finish building and add all resources to the resource tree.
+ * @throws PersistenceException Persistence exception
*/
public void add() throws PersistenceException {
for(int i=0; ithis.stack.size(); i++) {
@@ -100,9
svn commit: r1644222 - /sling/tags/org.apache.sling.testing.osgi-mock-1.1.0/
Author: sseifert Date: Tue Dec 9 23:02:14 2014 New Revision: 1644222 URL: http://svn.apache.org/r1644222 Log: [maven-release-plugin] copy for tag org.apache.sling.testing.osgi-mock-1.1.0 Added: sling/tags/org.apache.sling.testing.osgi-mock-1.1.0/ - copied from r1644221, sling/trunk/testing/mocks/osgi-mock/
svn commit: r1644223 - /sling/trunk/testing/mocks/osgi-mock/pom.xml
Author: sseifert Date: Tue Dec 9 23:02:17 2014 New Revision: 1644223 URL: http://svn.apache.org/r1644223 Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/testing/mocks/osgi-mock/pom.xml Modified: sling/trunk/testing/mocks/osgi-mock/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/osgi-mock/pom.xml?rev=1644223r1=1644222r2=1644223view=diff == --- sling/trunk/testing/mocks/osgi-mock/pom.xml (original) +++ sling/trunk/testing/mocks/osgi-mock/pom.xml Tue Dec 9 23:02:17 2014 @@ -28,7 +28,7 @@ /parent artifactIdorg.apache.sling.testing.osgi-mock/artifactId -version1.1.0/version +version1.1.1-SNAPSHOT/version packagingbundle/packaging nameApache Sling Testing OSGi Mock/name @@ -39,9 +39,9 @@ /properties scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.osgi-mock-1.1.0/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.osgi-mock-1.1.0/developerConnection - urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.testing.osgi-mock-1.1.0/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/mocks/osgi-mock/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/osgi-mock/developerConnection + urlhttp://svn.apache.org/viewvc/sling/trunk/testing/mocks/osgi-mock/url /scm dependencies
svn commit: r1644221 - /sling/trunk/testing/mocks/osgi-mock/pom.xml
Author: sseifert Date: Tue Dec 9 23:02:06 2014 New Revision: 1644221 URL: http://svn.apache.org/r1644221 Log: [maven-release-plugin] prepare release org.apache.sling.testing.osgi-mock-1.1.0 Modified: sling/trunk/testing/mocks/osgi-mock/pom.xml Modified: sling/trunk/testing/mocks/osgi-mock/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/osgi-mock/pom.xml?rev=1644221r1=1644220r2=1644221view=diff == --- sling/trunk/testing/mocks/osgi-mock/pom.xml (original) +++ sling/trunk/testing/mocks/osgi-mock/pom.xml Tue Dec 9 23:02:06 2014 @@ -28,7 +28,7 @@ /parent artifactIdorg.apache.sling.testing.osgi-mock/artifactId -version1.0.1-SNAPSHOT/version +version1.1.0/version packagingbundle/packaging nameApache Sling Testing OSGi Mock/name @@ -39,9 +39,9 @@ /properties scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/mocks/osgi-mock/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/osgi-mock/developerConnection - urlhttp://svn.apache.org/viewvc/sling/trunk/testing/mocks/osgi-mock/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.osgi-mock-1.1.0/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.osgi-mock-1.1.0/developerConnection + urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.testing.osgi-mock-1.1.0/url /scm dependencies
svn commit: r1644227 - /sling/trunk/testing/mocks/resourceresolver-mock/pom.xml
Author: sseifert Date: Tue Dec 9 23:04:00 2014 New Revision: 1644227 URL: http://svn.apache.org/r1644227 Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/testing/mocks/resourceresolver-mock/pom.xml Modified: sling/trunk/testing/mocks/resourceresolver-mock/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/resourceresolver-mock/pom.xml?rev=1644227r1=1644226r2=1644227view=diff == --- sling/trunk/testing/mocks/resourceresolver-mock/pom.xml (original) +++ sling/trunk/testing/mocks/resourceresolver-mock/pom.xml Tue Dec 9 23:04:00 2014 @@ -28,7 +28,7 @@ /parent artifactIdorg.apache.sling.testing.resourceresolver-mock/artifactId -version1.1.0/version +version1.1.1-SNAPSHOT/version nameApache Sling Testing Resource Resolver Mock/name description @@ -40,9 +40,9 @@ /properties scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.resourceresolver-mock-1.1.0/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.resourceresolver-mock-1.1.0/developerConnection - urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.testing.resourceresolver-mock-1.1.0/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/mocks/resourceresolver-mock/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/resourceresolver-mock/developerConnection + urlhttp://svn.apache.org/viewvc/sling/trunk/testing/mocks/resourceresolver-mock/url /scm reporting
svn commit: r1644226 - /sling/tags/org.apache.sling.testing.resourceresolver-mock-1.1.0/
Author: sseifert Date: Tue Dec 9 23:03:57 2014 New Revision: 1644226 URL: http://svn.apache.org/r1644226 Log: [maven-release-plugin] copy for tag org.apache.sling.testing.resourceresolver-mock-1.1.0 Added: sling/tags/org.apache.sling.testing.resourceresolver-mock-1.1.0/ - copied from r1644225, sling/trunk/testing/mocks/resourceresolver-mock/
svn commit: r1644225 - /sling/trunk/testing/mocks/resourceresolver-mock/pom.xml
Author: sseifert Date: Tue Dec 9 23:03:47 2014 New Revision: 1644225 URL: http://svn.apache.org/r1644225 Log: [maven-release-plugin] prepare release org.apache.sling.testing.resourceresolver-mock-1.1.0 Modified: sling/trunk/testing/mocks/resourceresolver-mock/pom.xml Modified: sling/trunk/testing/mocks/resourceresolver-mock/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/resourceresolver-mock/pom.xml?rev=1644225r1=1644224r2=1644225view=diff == --- sling/trunk/testing/mocks/resourceresolver-mock/pom.xml (original) +++ sling/trunk/testing/mocks/resourceresolver-mock/pom.xml Tue Dec 9 23:03:47 2014 @@ -28,7 +28,7 @@ /parent artifactIdorg.apache.sling.testing.resourceresolver-mock/artifactId -version1.0.1-SNAPSHOT/version +version1.1.0/version nameApache Sling Testing Resource Resolver Mock/name description @@ -40,9 +40,9 @@ /properties scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/mocks/resourceresolver-mock/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/resourceresolver-mock/developerConnection - urlhttp://svn.apache.org/viewvc/sling/trunk/testing/mocks/resourceresolver-mock/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.resourceresolver-mock-1.1.0/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.resourceresolver-mock-1.1.0/developerConnection + urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.testing.resourceresolver-mock-1.1.0/url /scm reporting
svn commit: r1644228 - /sling/trunk/testing/mocks/sling-mock/pom.xml
Author: sseifert Date: Tue Dec 9 23:05:49 2014 New Revision: 1644228 URL: http://svn.apache.org/r1644228 Log: update to released versions Modified: sling/trunk/testing/mocks/sling-mock/pom.xml Modified: sling/trunk/testing/mocks/sling-mock/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/pom.xml?rev=1644228r1=1644227r2=1644228view=diff == --- sling/trunk/testing/mocks/sling-mock/pom.xml (original) +++ sling/trunk/testing/mocks/sling-mock/pom.xml Tue Dec 9 23:05:49 2014 @@ -49,19 +49,19 @@ dependency groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.testing.osgi-mock/artifactId -version1.0.1-SNAPSHOT/version +version1.1.0/version scopecompile/scope /dependency dependency groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.testing.jcr-mock/artifactId -version1.0.0/version +version1.1.0/version scopecompile/scope /dependency dependency groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.testing.resourceresolver-mock/artifactId -version1.0.1-SNAPSHOT/version +version1.1.0/version scopecompile/scope /dependency
svn commit: r1644230 - /sling/tags/org.apache.sling.testing.sling-mock-1.1.0/
Author: sseifert Date: Tue Dec 9 23:06:43 2014 New Revision: 1644230 URL: http://svn.apache.org/r1644230 Log: [maven-release-plugin] copy for tag org.apache.sling.testing.sling-mock-1.1.0 Added: sling/tags/org.apache.sling.testing.sling-mock-1.1.0/ - copied from r1644229, sling/trunk/testing/mocks/sling-mock/
svn commit: r1644231 - /sling/trunk/testing/mocks/sling-mock/pom.xml
Author: sseifert Date: Tue Dec 9 23:06:46 2014 New Revision: 1644231 URL: http://svn.apache.org/r1644231 Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/testing/mocks/sling-mock/pom.xml Modified: sling/trunk/testing/mocks/sling-mock/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/pom.xml?rev=1644231r1=1644230r2=1644231view=diff == --- sling/trunk/testing/mocks/sling-mock/pom.xml (original) +++ sling/trunk/testing/mocks/sling-mock/pom.xml Tue Dec 9 23:06:46 2014 @@ -28,7 +28,7 @@ /parent artifactIdorg.apache.sling.testing.sling-mock/artifactId -version1.1.0/version +version1.1.1-SNAPSHOT/version packagingbundle/packaging nameApache Sling Testing Sling Mock/name @@ -39,9 +39,9 @@ /properties scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.sling-mock-1.1.0/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.sling-mock-1.1.0/developerConnection - urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.testing.sling-mock-1.1.0/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock/developerConnection + urlhttp://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/url /scm dependencies
svn commit: r1644229 - /sling/trunk/testing/mocks/sling-mock/pom.xml
Author: sseifert Date: Tue Dec 9 23:06:34 2014 New Revision: 1644229 URL: http://svn.apache.org/r1644229 Log: [maven-release-plugin] prepare release org.apache.sling.testing.sling-mock-1.1.0 Modified: sling/trunk/testing/mocks/sling-mock/pom.xml Modified: sling/trunk/testing/mocks/sling-mock/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/pom.xml?rev=1644229r1=1644228r2=1644229view=diff == --- sling/trunk/testing/mocks/sling-mock/pom.xml (original) +++ sling/trunk/testing/mocks/sling-mock/pom.xml Tue Dec 9 23:06:34 2014 @@ -28,7 +28,7 @@ /parent artifactIdorg.apache.sling.testing.sling-mock/artifactId -version1.0.1-SNAPSHOT/version +version1.1.0/version packagingbundle/packaging nameApache Sling Testing Sling Mock/name @@ -39,9 +39,9 @@ /properties scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock/developerConnection - urlhttp://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.sling-mock-1.1.0/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.sling-mock-1.1.0/developerConnection + urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.testing.sling-mock-1.1.0/url /scm dependencies
svn commit: r1644232 - /sling/trunk/testing/mocks/sling-mock/pom.xml
Author: sseifert Date: Tue Dec 9 23:09:25 2014 New Revision: 1644232 URL: http://svn.apache.org/r1644232 Log: update to next snapshot version until releases available in maven central Modified: sling/trunk/testing/mocks/sling-mock/pom.xml Modified: sling/trunk/testing/mocks/sling-mock/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/pom.xml?rev=1644232r1=1644231r2=1644232view=diff == --- sling/trunk/testing/mocks/sling-mock/pom.xml (original) +++ sling/trunk/testing/mocks/sling-mock/pom.xml Tue Dec 9 23:09:25 2014 @@ -49,19 +49,19 @@ dependency groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.testing.osgi-mock/artifactId -version1.1.0/version +version1.1.1-SNAPSHOT/version scopecompile/scope /dependency dependency groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.testing.jcr-mock/artifactId -version1.1.0/version +version1.1.1-SNAPSHOT/version scopecompile/scope /dependency dependency groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.testing.resourceresolver-mock/artifactId -version1.1.0/version +version1.1.1-SNAPSHOT/version scopecompile/scope /dependency
Nexus: Staging Completed
Message from: https://repository.apache.orgDescription:Resource Resolver Mock 1.1.0, JCR Mock 1.1.0, OSGi Mock 1.1.0, Sling Mock 1.1.0Deployer properties:"userAgent" = "Apache-Maven/3.2.3 (Java 1.8.0_25; Windows 7 6.1), Apache-Maven/3.2.3 (Java 1.8.0_25; Windows 7 6.1)""userId" = "sseifert""ip" = "91.64.33.29"Details:The following artifacts have been staged/org/apache/sling/org.apache.sling.testing.osgi-mock/1.1.0/org.apache.sling.testing.osgi-mock-1.1.0.jar(SHA1: 177547c84f676dc7df21e0207293cec77fe91cb5)/org/apache/sling/org.apache.sling.testing.osgi-mock/1.1.0/org.apache.sling.testing.osgi-mock-1.1.0-javadoc.jar.asc(SHA1: ae9b188556896b28a1b2931ae9683cd96ed4fccc)/org/apache/sling/org.apache.sling.testing.osgi-mock/1.1.0/org.apache.sling.testing.osgi-mock-1.1.0.pom(SHA1: 4d4211f08e1993883f04033d59337429a6f4d412)/org/apache/sling/org.apache.sling.testing.osgi-mock/1.1.0/org.apache.sling.testing.osgi-mock-1.1.0.jar.asc(SHA1: 63084f7115254031aa61f0385850a506c6fdb037)/org/apache/sling/org.apache.sling.testing.osgi-mock/1.1.0/org.apache.sling.testing.osgi-mock-1.1.0-sources.jar.asc(SHA1: 6f433e3724f6310c659eda8d2585040c8858d333)/org/apache/sling/org.apache.sling.testing.osgi-mock/1.1.0/org.apache.sling.testing.osgi-mock-1.1.0-source-release.zip(SHA1: e58e71d01fd0668d2573e0100fe86c488e1a860e)/org/apache/sling/org.apache.sling.testing.osgi-mock/1.1.0/org.apache.sling.testing.osgi-mock-1.1.0-javadoc.jar(SHA1: 446383ae83bfd755b076d46738786f553ce69f4f)/org/apache/sling/org.apache.sling.testing.osgi-mock/1.1.0/org.apache.sling.testing.osgi-mock-1.1.0-sources.jar(SHA1: 87d9d1934b240fbe3285d4b372061d1c74e64a7c)/org/apache/sling/org.apache.sling.testing.osgi-mock/1.1.0/org.apache.sling.testing.osgi-mock-1.1.0-source-release.zip.asc(SHA1: 479d3ec3449bf6b23d12183b59f60bd541e07fbf)/org/apache/sling/org.apache.sling.testing.osgi-mock/1.1.0/org.apache.sling.testing.osgi-mock-1.1.0.pom.asc(SHA1: 4066e011538ac149c73d0c3930545a3bc56743d6)/org/apache/sling/org.apache.sling.testing.jcr-mock/1.1.0/org.apache.sling.testing.jcr-mock-1.1.0-javadoc.jar.asc(SHA1: ea6fe0f1f1408d835542ca5acf178ea0c2520bbd)/org/apache/sling/org.apache.sling.testing.jcr-mock/1.1.0/org.apache.sling.testing.jcr-mock-1.1.0.jar.asc(SHA1: 82648c691adadb25a2eb5010336a13f5073ae328)/org/apache/sling/org.apache.sling.testing.jcr-mock/1.1.0/org.apache.sling.testing.jcr-mock-1.1.0-javadoc.jar(SHA1: ae498a6ccb8ef336199b0abb9d99cd8db5c424f3)/org/apache/sling/org.apache.sling.testing.jcr-mock/1.1.0/org.apache.sling.testing.jcr-mock-1.1.0-sources.jar(SHA1: 35e0a7feddc8a7a0a1e423d95d24ad01ce88176d)/org/apache/sling/org.apache.sling.testing.jcr-mock/1.1.0/org.apache.sling.testing.jcr-mock-1.1.0.jar(SHA1: a718e99593077164250068029a9330b65067c6e1)/org/apache/sling/org.apache.sling.testing.jcr-mock/1.1.0/org.apache.sling.testing.jcr-mock-1.1.0-source-release.zip(SHA1: 0d0e2886691f836fc770679cbeee54cdff08cfe3)/org/apache/sling/org.apache.sling.testing.jcr-mock/1.1.0/org.apache.sling.testing.jcr-mock-1.1.0-source-release.zip.asc(SHA1: fe4bcd0639aa1d6f5635e323c329cebdad71b263)/org/apache/sling/org.apache.sling.testing.jcr-mock/1.1.0/org.apache.sling.testing.jcr-mock-1.1.0.pom(SHA1: f361b72b7f83254f90a6ebf1328c1b4391316d4e)/org/apache/sling/org.apache.sling.testing.jcr-mock/1.1.0/org.apache.sling.testing.jcr-mock-1.1.0.pom.asc(SHA1: 527dfdd4741077d32a4f8a309f993c06de36b1df)/org/apache/sling/org.apache.sling.testing.jcr-mock/1.1.0/org.apache.sling.testing.jcr-mock-1.1.0-sources.jar.asc(SHA1: 69823b23d33342d6ee53158bb0f9033a3873ea01)/org/apache/sling/org.apache.sling.testing.sling-mock/1.1.0/org.apache.sling.testing.sling-mock-1.1.0.jar(SHA1: e92719bb1a44f7e14cbbacab6d1bb5aa7d5cd5e4)/org/apache/sling/org.apache.sling.testing.sling-mock/1.1.0/org.apache.sling.testing.sling-mock-1.1.0-source-release.zip(SHA1: caedfbbb38c5c45ceab34d77c0a8720f254a)/org/apache/sling/org.apache.sling.testing.sling-mock/1.1.0/org.apache.sling.testing.sling-mock-1.1.0.jar.asc(SHA1: 3a86294fb6fb5830e1f47f60f81b5afdc2e81543)/org/apache/sling/org.apache.sling.testing.sling-mock/1.1.0/org.apache.sling.testing.sling-mock-1.1.0-javadoc.jar.asc(SHA1: e0b0ae304fbbe81bc5575c9f0a3bc4768f9f0c52)/org/apache/sling/org.apache.sling.testing.sling-mock/1.1.0/org.apache.sling.testing.sling-mock-1.1.0-source-release.zip.asc(SHA1: d9683489206e9a86673a339fe1dedd74871f1206)/org/apache/sling/org.apache.sling.testing.sling-mock/1.1.0/org.apache.sling.testing.sling-mock-1.1.0-sources.jar.asc(SHA1: a9f34c8fe106890ed1e4e8c1bc9f7e89e788109f)/org/apache/sling/org.apache.sling.testing.sling-mock/1.1.0/org.apache.sling.testing.sling-mock-1.1.0-tests.jar(SHA1: 0e8cb1efdb9427b5a22efa3adebae6da2082d5be)/org/apache/sling/org.apache.sling.testing.sling-mock/1.1.0/org.apache.sling.testing.sling-mock-1.1.0-sources.jar(SHA1: f80d7693d0b14b5628df6b1a9f3199780e98570e)/org/apache/sling/org.apache.sling.testing.sling-mock/1.1.0/org.apache.sling.testing.sling-mock-1.1.0-javadoc.jar(SHA1:
