You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2017/03/03 15:46:27 UTC
svn commit: r1785325 - in /sling/trunk/karaf/org.apache.sling.karaf-configs: ./ src/main/resources/

Author: olli
Date: Fri Mar  3 15:46:27 2017
New Revision: 1785325

URL: http://svn.apache.org/viewvc?rev=1785325&view=rev
Log:
adjust configs for validation (service user)

Added:
    sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-validation.config
Removed:
    sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling_validation.config
Modified:
    sling/trunk/karaf/org.apache.sling.karaf-configs/pom.xml
    sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.sling.jcr.repoinit.impl.RepositoryInitializer.config

Modified: sling/trunk/karaf/org.apache.sling.karaf-configs/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-configs/pom.xml?rev=1785325&r1=1785324&r2=1785325&view=diff
==============================================================================
--- sling/trunk/karaf/org.apache.sling.karaf-configs/pom.xml (original)
+++ sling/trunk/karaf/org.apache.sling.karaf-configs/pom.xml Fri Mar  3 15:46:27 2017
@@ -123,11 +123,6 @@
                   <type>config</type>
                 </artifact>
                 <artifact>
-                  <classifier>org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling_validation</classifier>
-                  <file>src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling_validation.config</file>
-                  <type>config</type>
-                </artifact>
-                <artifact>
                   <classifier>org.apache.sling.jcr.repoinit.impl.RepositoryInitializer</classifier>
                   <file>src/main/resources/org.apache.sling.jcr.repoinit.impl.RepositoryInitializer.config</file>
                   <type>config</type>
@@ -198,6 +193,11 @@
                   <type>config</type>
                 </artifact>
                 <artifact>
+                  <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-validation</classifier>
+                  <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-validation.config</file>
+                  <type>config</type>
+                </artifact>
+                <artifact>
                   <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-xss</classifier>
                   <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-xss.config</file>
                   <type>config</type>

Modified: sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.sling.jcr.repoinit.impl.RepositoryInitializer.config
URL: http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.sling.jcr.repoinit.impl.RepositoryInitializer.config?rev=1785325&r1=1785324&r2=1785325&view=diff
==============================================================================
--- sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.sling.jcr.repoinit.impl.RepositoryInitializer.config (original)
+++ sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.sling.jcr.repoinit.impl.RepositoryInitializer.config Fri Mar  3 15:46:27 2017
@@ -5,5 +5,6 @@ references=[\
   "raw:classpath://org.apache.sling.karaf-repoinit/sling-i18n.txt",\
   "raw:classpath://org.apache.sling.karaf-repoinit/sling-installer-jcr.txt",\
   "raw:classpath://org.apache.sling.karaf-repoinit/sling-scripting.txt",\
+  "raw:classpath://org.apache.sling.karaf-repoinit/sling-validation.txt",\
   "raw:classpath://org.apache.sling.karaf-repoinit/sling-xss.txt"\
 ]

Added: sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-validation.config
URL: http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-validation.config?rev=1785325&view=auto
==============================================================================
--- sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-validation.config (added)
+++ sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-validation.config Fri Mar  3 15:46:27 2017
@@ -0,0 +1,3 @@
+user.mapping=[\
+  "org.apache.sling.validation.core\=sling-validation"\
+]