Author: olli
Date: Thu Apr 13 06:52:10 2017
New Revision: 1791215
URL: http://svn.apache.org/viewvc?rev=1791215&view=rev
Log:
use Validation release
Modified:
sling/trunk/samples/fling/README.md
sling/trunk/samples/fling/pom.xml
sling/trunk/samples/fling/src/main/java/org/apache/sling/samples/fling/validation/CommentValidator.java
Modified: sling/trunk/samples/fling/README.md
URL:
http://svn.apache.org/viewvc/sling/trunk/samples/fling/README.md?rev=1791215&r1=1791214&r2=1791215&view=diff
==============================================================================
--- sling/trunk/samples/fling/README.md (original)
+++ sling/trunk/samples/fling/README.md Thu Apr 13 06:52:10 2017
@@ -1,7 +1,7 @@
Sling Fling Sample
==================
-This is a sample using _Sling Models_, _Sling Query_, _Sling Scripting
Thymeleaf_, _Sling Validation_ (latest snapshot), _Sling Commons Messaging_
(latest snapshot) and _Sling Commons Messaging Mail_ (latest snapshot).
+This is a sample using _Sling Models_, _Sling Query_, _Sling Scripting
Thymeleaf_, _Sling Validation_, _Sling Commons Messaging_ (latest snapshot) and
_Sling Commons Messaging Mail_ (latest snapshot).
**As it is using some snapshots it might be unstable from time to time, feel
free to ask on our mailing list if unsure!**
Modified: sling/trunk/samples/fling/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/samples/fling/pom.xml?rev=1791215&r1=1791214&r2=1791215&view=diff
==============================================================================
--- sling/trunk/samples/fling/pom.xml (original)
+++ sling/trunk/samples/fling/pom.xml Thu Apr 13 06:52:10 2017
@@ -119,7 +119,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.validation.api</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<scope>provided</scope>
</dependency>
<!-- Apache Jackrabbit -->
Modified:
sling/trunk/samples/fling/src/main/java/org/apache/sling/samples/fling/validation/CommentValidator.java
URL:
http://svn.apache.org/viewvc/sling/trunk/samples/fling/src/main/java/org/apache/sling/samples/fling/validation/CommentValidator.java?rev=1791215&r1=1791214&r2=1791215&view=diff
==============================================================================
---
sling/trunk/samples/fling/src/main/java/org/apache/sling/samples/fling/validation/CommentValidator.java
(original)
+++
sling/trunk/samples/fling/src/main/java/org/apache/sling/samples/fling/validation/CommentValidator.java
Thu Apr 13 06:52:10 2017
@@ -26,7 +26,7 @@ import org.apache.sling.validation.Valid
import org.apache.sling.validation.ValidationResult;
import org.apache.sling.validation.spi.support.DefaultValidationFailure;
import org.apache.sling.validation.spi.support.DefaultValidationResult;
-import org.apache.sling.validation.spi.ValidationContext;
+import org.apache.sling.validation.spi.ValidatorContext;
import org.apache.sling.validation.spi.Validator;
import org.osgi.framework.Constants;
import org.osgi.service.component.annotations.Component;
@@ -48,16 +48,15 @@ public class CommentValidator implements
@Override
@Nonnull
- public ValidationResult validate(@Nonnull String data, @Nonnull
ValidationContext validationContext, @Nonnull ValueMap arguments) throws
SlingValidationException {
+ public ValidationResult validate(@Nonnull String data, @Nonnull
ValidatorContext validatorContext, @Nonnull ValueMap arguments) throws
SlingValidationException {
final String comment = arguments.get(COMMENT_PARAMETER, String.class);
if (comment == null) {
throw new SlingValidationException("Valid comment is missing.");
}
if (comment.equals(data)) {
return DefaultValidationResult.VALID;
-
} else {
- final ValidationFailure failure = new
DefaultValidationFailure(validationContext.getLocation(), 0,
validationContext.getDefaultResourceBundle(), I18N_MESSAGE_KEY, comment);
+ final ValidationFailure failure = new
DefaultValidationFailure(validatorContext.getLocation(), 0,
validatorContext.getDefaultResourceBundle(), I18N_MESSAGE_KEY, comment);
return new DefaultValidationResult(failure);
}
}
