You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2014/11/12 18:25:18 UTC
svn commit: r1638874 - in /sling/trunk/contrib/validation/core/src/main/java/org/apache/sling/validation/impl: Constants.java ValidationServiceImpl.java

Author: kwin
Date: Wed Nov 12 17:25:18 2014
New Revision: 1638874

URL: http://svn.apache.org/r1638874
Log:
SLING-4157, detect validation models in arbitrary locations

(only below the resource resolver search paths and below a node named "validation")

Modified:
    sling/trunk/contrib/validation/core/src/main/java/org/apache/sling/validation/impl/Constants.java
    sling/trunk/contrib/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationServiceImpl.java

Modified: sling/trunk/contrib/validation/core/src/main/java/org/apache/sling/validation/impl/Constants.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/validation/core/src/main/java/org/apache/sling/validation/impl/Constants.java?rev=1638874&r1=1638873&r2=1638874&view=diff
==============================================================================
--- sling/trunk/contrib/validation/core/src/main/java/org/apache/sling/validation/impl/Constants.java (original)
+++ sling/trunk/contrib/validation/core/src/main/java/org/apache/sling/validation/impl/Constants.java Wed Nov 12 17:25:18 2014
@@ -25,7 +25,7 @@ public final class Constants {
 
     public static final String VALIDATED_RESOURCE_TYPE = "validatedResourceType";
     public static final String APPLICABLE_PATHS = "applicablePaths";
-    public static final String MODELS_HOME = "sling/validation/models/";
+    public static final String MODELS_HOME = "validation/";
     public static final String VALIDATION_MODEL_RESOURCE_TYPE = "sling/validation/model";
     public static final String PROPERTIES = "properties";
     public static final String PROPERTY_TYPE = "propertyType";

Modified: sling/trunk/contrib/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationServiceImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationServiceImpl.java?rev=1638874&r1=1638873&r2=1638874&view=diff
==============================================================================
--- sling/trunk/contrib/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationServiceImpl.java (original)
+++ sling/trunk/contrib/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationServiceImpl.java Wed Nov 12 17:25:18 2014
@@ -64,7 +64,7 @@ public class ValidationServiceImpl imple
 
     private static final Logger LOG = LoggerFactory.getLogger(ValidationServiceImpl.class);
 
-    static final String MODEL_XPATH_QUERY = "/jcr:root/%s/" + Constants.MODELS_HOME + "*[@sling:resourceType=\"%s\" and @%s=\"%s\"]";
+    static final String MODEL_XPATH_QUERY = "/jcr:root%s//" + Constants.MODELS_HOME + "/*[@sling:resourceType=\"%s\" and @%s=\"%s\"]";
     static final String[] TOPICS = {SlingConstants.TOPIC_RESOURCE_REMOVED, SlingConstants.TOPIC_RESOURCE_CHANGED,
             SlingConstants.TOPIC_RESOURCE_ADDED};
 
@@ -196,7 +196,7 @@ public class ValidationServiceImpl imple
                 if (searchPath.endsWith("/")) {
                     searchPath = searchPath.substring(0, searchPath.length() - 1);
                 }
-                String path = searchPath + "/" + Constants.MODELS_HOME;
+                String path = searchPath + "/*" + Constants.MODELS_HOME;
                 sb.append("(path=").append(path).append("*)");
             }
             sb.append(")");