svn commit: r1661870 - in /sling/trunk/bundles: jcr/it-resource-versioning/ jcr/it-resource-versioning/src/test/java/org/apache/sling/jcr/resource/it/ jcr/it-resource-versioning/src/test/java/org/apac
Author: tomekr
Date: Tue Feb 24 09:33:51 2015
New Revision: 1661870
URL: http://svn.apache.org/r1661870
Log:
SLING-848; Updated API version to 2.9.0. Use MockJcrResourceResolverFactory
implementation from the Sling Mock in versioning IT
Added:
sling/trunk/bundles/jcr/it-resource-versioning/src/test/java/org/apache/sling/testing/mock/sling/MockResolverProvider.java
Removed:
sling/trunk/bundles/jcr/it-resource-versioning/src/test/java/org/apache/sling/testing/mock/sling/MockJcrResourceResolverFactory.java
Modified:
sling/trunk/bundles/jcr/it-resource-versioning/pom.xml
sling/trunk/bundles/jcr/it-resource-versioning/src/test/java/org/apache/sling/jcr/resource/it/ResourceVersioningTest.java
sling/trunk/bundles/jcr/resource/pom.xml
sling/trunk/bundles/resourceresolver/pom.xml
Modified: sling/trunk/bundles/jcr/it-resource-versioning/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/it-resource-versioning/pom.xml?rev=1661870r1=1661869r2=1661870view=diff
==
--- sling/trunk/bundles/jcr/it-resource-versioning/pom.xml (original)
+++ sling/trunk/bundles/jcr/it-resource-versioning/pom.xml Tue Feb 24 09:33:51
2015
@@ -72,7 +72,7 @@
dependency
groupIdorg.apache.sling/groupId
artifactIdorg.apache.sling.api/artifactId
-version2.8.1-SNAPSHOT/version
+version2.9.0/version
scopetest/scope
/dependency
/dependencies
Modified:
sling/trunk/bundles/jcr/it-resource-versioning/src/test/java/org/apache/sling/jcr/resource/it/ResourceVersioningTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/it-resource-versioning/src/test/java/org/apache/sling/jcr/resource/it/ResourceVersioningTest.java?rev=1661870r1=1661869r2=1661870view=diff
==
---
sling/trunk/bundles/jcr/it-resource-versioning/src/test/java/org/apache/sling/jcr/resource/it/ResourceVersioningTest.java
(original)
+++
sling/trunk/bundles/jcr/it-resource-versioning/src/test/java/org/apache/sling/jcr/resource/it/ResourceVersioningTest.java
Tue Feb 24 09:33:51 2015
@@ -35,9 +35,7 @@ import org.apache.jackrabbit.JcrConstant
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ValueMap;
-import org.apache.sling.commons.testing.jcr.RepositoryProvider;
-import org.apache.sling.jcr.api.SlingRepository;
-import org.apache.sling.testing.mock.sling.MockJcrResourceResolverFactory;
+import org.apache.sling.testing.mock.sling.MockResolverProvider;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -54,8 +52,7 @@ public class ResourceVersioningTest {
@Before
public void setUp() throws Exception {
-SlingRepository repository =
RepositoryProvider.instance().getRepository();
-resolver = new
MockJcrResourceResolverFactory(repository).getAdministrativeResourceResolver(null);
+resolver = MockResolverProvider.getResourceResolver();
session = resolver.adaptTo(Session.class);
versionManager = session.getWorkspace().getVersionManager();
registerNamespace(sling, http://sling.apache.org/jcr/sling/1.0;);
Added:
sling/trunk/bundles/jcr/it-resource-versioning/src/test/java/org/apache/sling/testing/mock/sling/MockResolverProvider.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/it-resource-versioning/src/test/java/org/apache/sling/testing/mock/sling/MockResolverProvider.java?rev=1661870view=auto
==
---
sling/trunk/bundles/jcr/it-resource-versioning/src/test/java/org/apache/sling/testing/mock/sling/MockResolverProvider.java
(added)
+++
sling/trunk/bundles/jcr/it-resource-versioning/src/test/java/org/apache/sling/testing/mock/sling/MockResolverProvider.java
Tue Feb 24 09:33:51 2015
@@ -0,0 +1,23 @@
+package org.apache.sling.testing.mock.sling;
+
+import javax.jcr.RepositoryException;
+
+import org.apache.sling.api.resource.LoginException;
+import org.apache.sling.api.resource.ResourceResolver;
+import org.apache.sling.commons.testing.jcr.RepositoryProvider;
+import org.apache.sling.jcr.api.SlingRepository;
+import org.apache.sling.jcr.resource.internal.helper.jcr.PathMapper;
+import org.apache.sling.testing.mock.osgi.MockOsgi;
+import org.osgi.framework.BundleContext;
+
+public class MockResolverProvider {
+private MockResolverProvider() {
+}
+
+public static ResourceResolver getResourceResolver() throws
RepositoryException, LoginException {
+final SlingRepository repository =
RepositoryProvider.instance().getRepository();
+final BundleContext bundleContext = MockOsgi.newBundleContext();
+bundleContext.registerService(PathMapper.class.getName(), new
PathMapper(), null);
+return new
Nexus: Promotion Completed
Message from: https://repository.apache.orgDeployer properties:"userAgent" = "Apache-Maven/3.2.3 (Java 1.7.0_45; Mac OS X 10.10.2), Apache-Maven/3.2.3 (Java 1.7.0_45; Mac OS X 10.10.2)""userId" = "tomekr""ip" = "77.65.82.35"Details:The following artifacts have been promoted to the "Releases" [id=releases] repository/org/apache/sling/org.apache.sling.api/2.9.0/org.apache.sling.api-2.9.0-javadoc.jar.asc(SHA1: 51b83464421ea9c99e19847e966167a747190cef)/org/apache/sling/org.apache.sling.api/2.9.0/org.apache.sling.api-2.9.0.jar.asc(SHA1: 3e361ca29d1fe6588c82099044a8a716e317ca83)/org/apache/sling/org.apache.sling.api/2.9.0/org.apache.sling.api-2.9.0-sources.jar.asc(SHA1: 33ead09e3122161b5c8387d34849edb74c771c45)/org/apache/sling/org.apache.sling.api/2.9.0/org.apache.sling.api-2.9.0-source-release.zip(SHA1: 2b5dc099ddf21f93207267a1786ec3ba819b02c8)/org/apache/sling/org.apache.sling.api/2.9.0/org.apache.sling.api-2.9.0-javadoc.jar(SHA1: c216f6e431e7e069108e2d087c22d56c4875f423)/org/apache/sling/org.apache.sling.api/2.9.0/org.apache.sling.api-2.9.0.pom.asc(SHA1: 6251e733445130791c82a436d4cfbce6e40eba7d)/org/apache/sling/org.apache.sling.api/2.9.0/org.apache.sling.api-2.9.0.pom(SHA1: de99d6a3c6834baf7236af1ea4d9c640271de4c7)/org/apache/sling/org.apache.sling.api/2.9.0/org.apache.sling.api-2.9.0-sources.jar(SHA1: c2842068a8d624f3841fe5490e88bcb9f9495f97)/org/apache/sling/org.apache.sling.api/2.9.0/org.apache.sling.api-2.9.0.jar(SHA1: a45fee6b35ee7774621be796b18fa43167b99d87)/org/apache/sling/org.apache.sling.api/2.9.0/org.apache.sling.api-2.9.0-source-release.zip.asc(SHA1: eb531c7c682a9f9cc3a1097f04d909347a16572f)Action performed by Tomasz Rekawek (tomekr)
svn commit: r1661947 - in /sling/trunk/contrib/extensions/validation: api/src/main/java/org/apache/sling/validation/api/ core/src/main/java/org/apache/sling/validation/impl/validators/
Author: kwin
Date: Tue Feb 24 13:42:39 2015
New Revision: 1661947
URL: http://svn.apache.org/r1661947
Log:
clarified that the valuemap given to a validate method is never null
Modified:
sling/trunk/contrib/extensions/validation/api/src/main/java/org/apache/sling/validation/api/ParameterizedValidator.java
sling/trunk/contrib/extensions/validation/api/src/main/java/org/apache/sling/validation/api/Validator.java
sling/trunk/contrib/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/validators/RegexValidator.java
Modified:
sling/trunk/contrib/extensions/validation/api/src/main/java/org/apache/sling/validation/api/ParameterizedValidator.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/validation/api/src/main/java/org/apache/sling/validation/api/ParameterizedValidator.java?rev=1661947r1=1661946r2=1661947view=diff
==
---
sling/trunk/contrib/extensions/validation/api/src/main/java/org/apache/sling/validation/api/ParameterizedValidator.java
(original)
+++
sling/trunk/contrib/extensions/validation/api/src/main/java/org/apache/sling/validation/api/ParameterizedValidator.java
Tue Feb 24 13:42:39 2015
@@ -26,10 +26,22 @@ import org.apache.sling.api.resource.Val
*/
public interface ParameterizedValidator {
+/**
+ *
+ * @return the validator
+ */
public abstract Validator? getValidator();
+/**
+ *
+ * @return the parameterization of the validator (never {@code null}, but
might be empty map)
+ */
public abstract ValueMap getParameters();
+/**
+ *
+ * @return the type of the validator (i.e. the type of the data it can
handle)
+ */
public abstract Class? getType();
}
\ No newline at end of file
Modified:
sling/trunk/contrib/extensions/validation/api/src/main/java/org/apache/sling/validation/api/Validator.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/validation/api/src/main/java/org/apache/sling/validation/api/Validator.java?rev=1661947r1=1661946r2=1661947view=diff
==
---
sling/trunk/contrib/extensions/validation/api/src/main/java/org/apache/sling/validation/api/Validator.java
(original)
+++
sling/trunk/contrib/extensions/validation/api/src/main/java/org/apache/sling/validation/api/Validator.java
Tue Feb 24 13:42:39 2015
@@ -62,7 +62,7 @@ public interface Validator T {
*
* @param data the data to validate (primary property), never {@code null}.
* @param valueMap all properties (only used for validations considering
multiple properties), never {@code null}.
- * @param arguments the parameterization of the validator. Might be {@code
null} in case no arguments were given.
+ * @param arguments the parameterization of the validator. Never {@code
null} but might be the empty map.
* @return validation error message if validation was not successful,
{@code null} otherwise. In case an empty string is returned a generic
validation error message is used.
* @throws
org.apache.sling.validation.api.exceptions.SlingValidationException if some
expected arguments are missing from the arguments map
*/
Modified:
sling/trunk/contrib/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/validators/RegexValidator.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/validators/RegexValidator.java?rev=1661947r1=1661946r2=1661947view=diff
==
---
sling/trunk/contrib/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/validators/RegexValidator.java
(original)
+++
sling/trunk/contrib/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/validators/RegexValidator.java
Tue Feb 24 13:42:39 2015
@@ -40,9 +40,6 @@ public class RegexValidator implements V
@Override
public String validate(String data, ValueMap valueMap, ValueMap arguments)
throws SlingValidationException {
-if (arguments == null) {
-throw new SlingValidationException(Cannot perform data validation
with null parameters);
-}
String regex = arguments.get(REGEX_PARAM, );
if (StringUtils.isEmpty(regex)) {
throw new SlingValidationException(Mandatory + REGEX_PARAM +
is missing from the arguments map.);
svn commit: r1661953 - /sling/trunk/contrib/extensions/urlrewriter/src/main/java/org/apache/sling/urlrewriter/internal/SlingUrlRewriteFilter.java
Author: olli
Date: Tue Feb 24 13:56:51 2015
New Revision: 1661953
URL: http://svn.apache.org/r1661953
Log:
SLING-3518 add a multipurpose filter based on Tuckey's UrlRewriteFilter
* style
Modified:
sling/trunk/contrib/extensions/urlrewriter/src/main/java/org/apache/sling/urlrewriter/internal/SlingUrlRewriteFilter.java
Modified:
sling/trunk/contrib/extensions/urlrewriter/src/main/java/org/apache/sling/urlrewriter/internal/SlingUrlRewriteFilter.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/urlrewriter/src/main/java/org/apache/sling/urlrewriter/internal/SlingUrlRewriteFilter.java?rev=1661953r1=1661952r2=1661953view=diff
==
---
sling/trunk/contrib/extensions/urlrewriter/src/main/java/org/apache/sling/urlrewriter/internal/SlingUrlRewriteFilter.java
(original)
+++
sling/trunk/contrib/extensions/urlrewriter/src/main/java/org/apache/sling/urlrewriter/internal/SlingUrlRewriteFilter.java
Tue Feb 24 13:56:51 2015
@@ -65,10 +65,26 @@ import org.xml.sax.helpers.DefaultHandle
)
@Service
@Properties({
-@Property(name = Constants.SERVICE_VENDOR, value = The Apache Software
Foundation),
-@Property(name = Constants.SERVICE_DESCRIPTION, value = multi-purpose
service for altering HTTP requests/responses based on Tuckey's
UrlRewriteFilter),
-@Property(name = Constants.SERVICE_RANKING, intValue = 0, propertyPrivate
= false),
-@Property(name = EngineConstants.SLING_FILTER_SCOPE, value =
{EngineConstants.FILTER_SCOPE_REQUEST, EngineConstants.FILTER_SCOPE_FORWARD})
+@Property(
+name = Constants.SERVICE_VENDOR,
+value = The Apache Software Foundation
+),
+@Property(
+name = Constants.SERVICE_DESCRIPTION,
+value = multi-purpose service for altering HTTP requests/responses
based on Tuckey's UrlRewriteFilter
+),
+@Property(
+name = Constants.SERVICE_RANKING,
+intValue = 0,
+propertyPrivate = false
+),
+@Property(
+name = EngineConstants.SLING_FILTER_SCOPE,
+value = {
+EngineConstants.FILTER_SCOPE_REQUEST,
+EngineConstants.FILTER_SCOPE_FORWARD
+}
+)
})
public final class SlingUrlRewriteFilter implements Filter {
svn commit: r1661963 - /sling/trunk/contrib/extensions/urlrewriter/pom.xml
Author: olli Date: Tue Feb 24 14:23:52 2015 New Revision: 1661963 URL: http://svn.apache.org/r1661963 Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/contrib/extensions/urlrewriter/pom.xml Modified: sling/trunk/contrib/extensions/urlrewriter/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/urlrewriter/pom.xml?rev=1661963r1=1661962r2=1661963view=diff == --- sling/trunk/contrib/extensions/urlrewriter/pom.xml (original) +++ sling/trunk/contrib/extensions/urlrewriter/pom.xml Tue Feb 24 14:23:52 2015 @@ -29,7 +29,7 @@ /parent artifactIdorg.apache.sling.urlrewriter/artifactId - version0.0.2/version + version0.0.3-SNAPSHOT/version packagingbundle/packaging nameApache Sling URL Rewriter/name @@ -42,9 +42,9 @@ /properties scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.urlrewriter-0.0.2/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.urlrewriter-0.0.2/developerConnection - urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.urlrewriter-0.0.2/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/urlrewriter/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/urlrewriter/developerConnection + urlhttp://svn.apache.org/viewvc/sling/trunk/contrib/extensions/urlrewriter/url /scm dependencies
Nexus: Staging Completed
Message from: https://repository.apache.orgDescription:URL Rewriter 0.0.2Deployer properties:"userAgent" = "Apache-Maven/3.2.5 (Java 1.8.0_31; Mac OS X 10.10.2), Apache-Maven/3.2.5 (Java 1.8.0_31; Mac OS X 10.10.2)""userId" = "olli""ip" = "176.199.84.148"Details:The following artifacts have been staged/org/apache/sling/org.apache.sling.urlrewriter/0.0.2/org.apache.sling.urlrewriter-0.0.2-javadoc.jar.asc(SHA1: c2d21c9cc80f167bd478c94762692fab07d161f9)/org/apache/sling/org.apache.sling.urlrewriter/0.0.2/org.apache.sling.urlrewriter-0.0.2-source-release.zip(SHA1: d77e265f006b19596d19ce655ffbc32da85cb8ae)/org/apache/sling/org.apache.sling.urlrewriter/0.0.2/org.apache.sling.urlrewriter-0.0.2-sources.jar(SHA1: e8ed32e9304ab49625a4258ad8091bb59124eac6)/org/apache/sling/org.apache.sling.urlrewriter/0.0.2/org.apache.sling.urlrewriter-0.0.2.pom(SHA1: 891de0c7464bca7febc589f2df67565f8a1dd4c1)/org/apache/sling/org.apache.sling.urlrewriter/0.0.2/org.apache.sling.urlrewriter-0.0.2.pom.asc(SHA1: fa527b2a41be8e04d74cc1cdcf6a4d9fe0e5883e)/org/apache/sling/org.apache.sling.urlrewriter/0.0.2/org.apache.sling.urlrewriter-0.0.2.jar.asc(SHA1: 5a53f99d75b3572fc80c83f3f75bf1fc652b8a7c)/org/apache/sling/org.apache.sling.urlrewriter/0.0.2/org.apache.sling.urlrewriter-0.0.2.jar(SHA1: 4fd7d8bcbacc69a8dd6ebaa237f67aec3de2a282)/org/apache/sling/org.apache.sling.urlrewriter/0.0.2/org.apache.sling.urlrewriter-0.0.2-sources.jar.asc(SHA1: 8e417898f64832d1216f9cdd2c63cb2ba143e6c5)/org/apache/sling/org.apache.sling.urlrewriter/0.0.2/org.apache.sling.urlrewriter-0.0.2-source-release.zip.asc(SHA1: eb58194abbfc081eaec08e30fed13a3536c9a012)/org/apache/sling/org.apache.sling.urlrewriter/0.0.2/org.apache.sling.urlrewriter-0.0.2-javadoc.jar(SHA1: 69a28a2b7ebe82639a9c9190eed987bad4baf41d)Action performed by Oliver Lietz (olli)
svn commit: r1661955 - /sling/trunk/contrib/extensions/urlrewriter/pom.xml
Author: olli Date: Tue Feb 24 14:15:40 2015 New Revision: 1661955 URL: http://svn.apache.org/r1661955 Log: SLING-3518 add a multipurpose filter based on Tuckey's UrlRewriteFilter * update to current parent Modified: sling/trunk/contrib/extensions/urlrewriter/pom.xml Modified: sling/trunk/contrib/extensions/urlrewriter/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/urlrewriter/pom.xml?rev=1661955r1=1661954r2=1661955view=diff == --- sling/trunk/contrib/extensions/urlrewriter/pom.xml (original) +++ sling/trunk/contrib/extensions/urlrewriter/pom.xml Tue Feb 24 14:15:40 2015 @@ -24,7 +24,7 @@ parent groupIdorg.apache.sling/groupId artifactIdsling/artifactId -version20/version +version22/version relativePath../../../parent/pom.xml/relativePath /parent
svn commit: r1661961 - /sling/trunk/contrib/extensions/urlrewriter/pom.xml
Author: olli Date: Tue Feb 24 14:23:21 2015 New Revision: 1661961 URL: http://svn.apache.org/r1661961 Log: [maven-release-plugin] prepare release org.apache.sling.urlrewriter-0.0.2 Modified: sling/trunk/contrib/extensions/urlrewriter/pom.xml Modified: sling/trunk/contrib/extensions/urlrewriter/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/urlrewriter/pom.xml?rev=1661961r1=1661960r2=1661961view=diff == --- sling/trunk/contrib/extensions/urlrewriter/pom.xml (original) +++ sling/trunk/contrib/extensions/urlrewriter/pom.xml Tue Feb 24 14:23:21 2015 @@ -29,7 +29,7 @@ /parent artifactIdorg.apache.sling.urlrewriter/artifactId - version0.0.1-SNAPSHOT/version + version0.0.2/version packagingbundle/packaging nameApache Sling URL Rewriter/name @@ -42,9 +42,9 @@ /properties scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/urlrewriter/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/urlrewriter/developerConnection - urlhttp://svn.apache.org/viewvc/sling/trunk/contrib/extensions/urlrewriter/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.urlrewriter-0.0.2/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.urlrewriter-0.0.2/developerConnection + urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.urlrewriter-0.0.2/url /scm dependencies @@ -124,7 +124,7 @@ extensionstrue/extensions configuration instructions -Export-Package/ +Export-Package / Embed-Dependency org.apache.sling.commons.osgi;inline=org/apache/sling/commons/osgi/PropertiesUtil.* /Embed-Dependency
svn commit: r8113 - /release/sling/
Author: rombert Date: Tue Feb 24 14:23:35 2015 New Revision: 8113 Log: org.apache.sling.api 2.9.0 Added: release/sling/org.apache.sling.api-2.9.0-javadoc.jar (with props) release/sling/org.apache.sling.api-2.9.0-javadoc.jar.asc (with props) release/sling/org.apache.sling.api-2.9.0-javadoc.jar.md5 release/sling/org.apache.sling.api-2.9.0-javadoc.jar.sha1 release/sling/org.apache.sling.api-2.9.0-source-release.zip (with props) release/sling/org.apache.sling.api-2.9.0-source-release.zip.asc (with props) release/sling/org.apache.sling.api-2.9.0-source-release.zip.md5 release/sling/org.apache.sling.api-2.9.0-source-release.zip.sha1 release/sling/org.apache.sling.api-2.9.0-sources.jar (with props) release/sling/org.apache.sling.api-2.9.0-sources.jar.asc (with props) release/sling/org.apache.sling.api-2.9.0-sources.jar.md5 release/sling/org.apache.sling.api-2.9.0-sources.jar.sha1 release/sling/org.apache.sling.api-2.9.0.jar (with props) release/sling/org.apache.sling.api-2.9.0.jar.asc (with props) release/sling/org.apache.sling.api-2.9.0.jar.md5 release/sling/org.apache.sling.api-2.9.0.jar.sha1 release/sling/org.apache.sling.api-2.9.0.pom (with props) release/sling/org.apache.sling.api-2.9.0.pom.asc (with props) release/sling/org.apache.sling.api-2.9.0.pom.md5 release/sling/org.apache.sling.api-2.9.0.pom.sha1 Removed: release/sling/org.apache.sling.api-2.8.0-javadoc.jar release/sling/org.apache.sling.api-2.8.0-javadoc.jar.asc release/sling/org.apache.sling.api-2.8.0-javadoc.jar.md5 release/sling/org.apache.sling.api-2.8.0-javadoc.jar.sha1 release/sling/org.apache.sling.api-2.8.0-source-release.zip release/sling/org.apache.sling.api-2.8.0-source-release.zip.asc release/sling/org.apache.sling.api-2.8.0-source-release.zip.md5 release/sling/org.apache.sling.api-2.8.0-source-release.zip.sha1 release/sling/org.apache.sling.api-2.8.0-sources.jar release/sling/org.apache.sling.api-2.8.0-sources.jar.asc release/sling/org.apache.sling.api-2.8.0-sources.jar.md5 release/sling/org.apache.sling.api-2.8.0-sources.jar.sha1 release/sling/org.apache.sling.api-2.8.0.jar release/sling/org.apache.sling.api-2.8.0.jar.asc release/sling/org.apache.sling.api-2.8.0.jar.md5 release/sling/org.apache.sling.api-2.8.0.jar.sha1 release/sling/org.apache.sling.api-2.8.0.pom release/sling/org.apache.sling.api-2.8.0.pom.asc release/sling/org.apache.sling.api-2.8.0.pom.md5 release/sling/org.apache.sling.api-2.8.0.pom.sha1 Added: release/sling/org.apache.sling.api-2.9.0-javadoc.jar == Binary file - no diff available. Propchange: release/sling/org.apache.sling.api-2.9.0-javadoc.jar -- svn:mime-type = application/zip Added: release/sling/org.apache.sling.api-2.9.0-javadoc.jar.asc == Binary file - no diff available. Propchange: release/sling/org.apache.sling.api-2.9.0-javadoc.jar.asc -- svn:mime-type = application/pgp-signature Added: release/sling/org.apache.sling.api-2.9.0-javadoc.jar.md5 == --- release/sling/org.apache.sling.api-2.9.0-javadoc.jar.md5 (added) +++ release/sling/org.apache.sling.api-2.9.0-javadoc.jar.md5 Tue Feb 24 14:23:35 2015 @@ -0,0 +1 @@ +1e1991b4466bd7aed06970324e4c679a \ No newline at end of file Added: release/sling/org.apache.sling.api-2.9.0-javadoc.jar.sha1 == --- release/sling/org.apache.sling.api-2.9.0-javadoc.jar.sha1 (added) +++ release/sling/org.apache.sling.api-2.9.0-javadoc.jar.sha1 Tue Feb 24 14:23:35 2015 @@ -0,0 +1 @@ +c216f6e431e7e069108e2d087c22d56c4875f423 \ No newline at end of file Added: release/sling/org.apache.sling.api-2.9.0-source-release.zip == Binary file - no diff available. Propchange: release/sling/org.apache.sling.api-2.9.0-source-release.zip -- svn:mime-type = application/zip Added: release/sling/org.apache.sling.api-2.9.0-source-release.zip.asc == Binary file - no diff available. Propchange: release/sling/org.apache.sling.api-2.9.0-source-release.zip.asc -- svn:mime-type = application/pgp-signature Added: release/sling/org.apache.sling.api-2.9.0-source-release.zip.md5 ==
svn commit: r1661962 - /sling/tags/org.apache.sling.urlrewriter-0.0.2/
Author: olli Date: Tue Feb 24 14:23:48 2015 New Revision: 1661962 URL: http://svn.apache.org/r1661962 Log: [maven-release-plugin] copy for tag org.apache.sling.urlrewriter-0.0.2 Added: sling/tags/org.apache.sling.urlrewriter-0.0.2/ - copied from r1661961, sling/trunk/contrib/extensions/urlrewriter/
svn commit: r1661954 - /sling/trunk/contrib/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/ValidationServiceImplTest.java
Author: kwin
Date: Tue Feb 24 13:58:14 2015
New Revision: 1661954
URL: http://svn.apache.org/r1661954
Log:
add test for arguments parameter of the validate to never be null
Modified:
sling/trunk/contrib/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/ValidationServiceImplTest.java
Modified:
sling/trunk/contrib/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/ValidationServiceImplTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/ValidationServiceImplTest.java?rev=1661954r1=1661953r2=1661954view=diff
==
---
sling/trunk/contrib/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/ValidationServiceImplTest.java
(original)
+++
sling/trunk/contrib/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/ValidationServiceImplTest.java
Tue Feb 24 13:58:14 2015
@@ -44,6 +44,7 @@ import org.apache.sling.jcr.resource.Jcr
import org.apache.sling.validation.api.ValidationModel;
import org.apache.sling.validation.api.ValidationResult;
import org.apache.sling.validation.api.Validator;
+import org.apache.sling.validation.api.exceptions.SlingValidationException;
import org.apache.sling.validation.impl.setup.MockedResourceResolver;
import org.apache.sling.validation.impl.util.examplevalidators.DateValidator;
import org.apache.sling.validation.impl.validators.RegexValidator;
@@ -54,6 +55,7 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import org.powermock.reflect.Whitebox;
@@ -258,6 +260,46 @@ public class ValidationServiceImplTest {
} finally {
if (model1 != null) {
rr.delete(model1);
+}
+}
+}
+
+@Test
+public void testValidateNeverCalledWithNullValues() throws Exception {
+
+ValidatorString myValidator = new ValidatorString() {
+@Override
+public String validate(String data, ValueMap valueMap, ValueMap
arguments)
+throws SlingValidationException {
+Assert.assertNotNull(ValueMap parameter for validate should
never be null, valueMap);
+Assert.assertNotNull(arguments parameter for validate should
never be null, arguments);
+return null;
+}
+
+};
+
+validationService.validators.put(testvalidator,
+myValidator);
+
+TestProperty property = new TestProperty(field1);
+property.addValidator(testvalidator);
+Resource model1 = null;
+try {
+model1 = createValidationModelResource(rr,
libsValidatorsRoot.getPath(), testValidationModel1,
+sling/validation/test, new String[] { /apps/validation
}, property);
+
+ValidationModel vm =
validationService.getValidationModel(sling/validation/test,
+/apps/validation/1/resource);
+HashMapString, Object hashMap = new HashMapString, Object() {
+{
+put(field1, 1);
+}
+};
+ValueMap map = new ValueMapDecorator(hashMap);
+validationService.validate(map, vm);
+} finally {
+if (model1 != null) {
+rr.delete(model1);
}
}
}
