Author: kwin Date: Sat Apr 11 17:54:36 2015 New Revision: 1672911 URL: http://svn.apache.org/r1672911 Log: use newest parent, get rid of JCR dependency, clean up POMs
Modified: sling/trunk/bundles/extensions/validation/core/pom.xml sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationServiceImpl.java sling/trunk/bundles/extensions/validation/examples/pom.xml sling/trunk/bundles/extensions/validation/it-http/pom.xml sling/trunk/bundles/extensions/validation/pom.xml sling/trunk/bundles/extensions/validation/test-services/pom.xml sling/trunk/bundles/extensions/validation/test-services/src/main/java/org/apache/sling/validation/testservices/ValidationPostOperation.java Modified: sling/trunk/bundles/extensions/validation/core/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/core/pom.xml?rev=1672911&r1=1672910&r2=1672911&view=diff ============================================================================== --- sling/trunk/bundles/extensions/validation/core/pom.xml (original) +++ sling/trunk/bundles/extensions/validation/core/pom.xml Sat Apr 11 17:54:36 2015 @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.sling</groupId> <artifactId>sling</artifactId> - <version>15</version> + <version>22</version> <relativePath /> </parent> @@ -31,10 +31,9 @@ <version>1.0.0-SNAPSHOT</version> <scm> - <connection>scm:git:https://github.com/raducotescu/org.apache.sling.validation.git</connection> - <developerConnection>scm:git:g...@github.com:raducotescu/org.apache.sling.validation.git</developerConnection> - <tag>HEAD</tag> - <url>https://github.com/raducotescu/org.apache.sling.validation</url> + <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/validation/core</connection> + <developerConnection> scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/validation/core</developerConnection> + <url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/core</url> </scm> <name>Apache Sling Validation Framework Core Implementation</name> @@ -49,15 +48,6 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-scr-plugin</artifactId> - <version>1.11.0</version> - <executions> - <execution> - <id>generate-scr-descriptor</id> - <goals> - <goal>scr</goal> - </goals> - </execution> - </executions> </plugin> <plugin> <groupId>org.apache.felix</groupId> @@ -65,9 +55,6 @@ <extensions>true</extensions> <configuration> <instructions> - <Private-Package> - org.apache.sling.validation.impl* - </Private-Package> <Embed-Dependency>commons-lang3</Embed-Dependency> </instructions> </configuration> @@ -96,12 +83,7 @@ <artifactId>org.osgi.core</artifactId> <scope>provided</scope> </dependency> - <dependency> - <groupId>javax.jcr</groupId> - <artifactId>jcr</artifactId> - <version>2.0</version> - <scope>provided</scope> - </dependency> + <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.api</artifactId> @@ -116,7 +98,6 @@ <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.scr.annotations</artifactId> - <version>1.9.0</version> <scope>provided</scope> </dependency> <dependency> @@ -185,32 +166,11 @@ <version>1.3</version> <scope>test</scope> </dependency> + <dependency> + <groupId>javax.jcr</groupId> + <artifactId>jcr</artifactId> + <version>2.0</version> + <scope>test</scope> + </dependency> </dependencies> - <profiles> - <profile> - <id>autoInstallBundle</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.sling</groupId> - <artifactId>maven-sling-plugin</artifactId> - <version>2.0.4-incubator</version> - <executions> - <execution> - <id>install-bundle</id> - <goals> - <goal>install</goal> - </goals> - <configuration> - <slingUrl>http://localhost:8888/system/console</slingUrl> - <user>admin</user> - <password>admin</password> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> Modified: sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationServiceImpl.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationServiceImpl.java?rev=1672911&r1=1672910&r2=1672911&view=diff ============================================================================== --- sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationServiceImpl.java (original) +++ sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationServiceImpl.java Sat Apr 11 17:54:36 2015 @@ -28,8 +28,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.regex.Matcher; -import javax.jcr.query.Query; - import org.apache.commons.lang3.StringUtils; import org.apache.felix.scr.annotations.Component; import org.apache.felix.scr.annotations.Reference; @@ -378,7 +376,7 @@ public class ValidationServiceImpl imple for (String searchPath : searchPaths) { final String queryString = String.format(MODEL_XPATH_QUERY, searchPath, Constants.VALIDATION_MODEL_RESOURCE_TYPE, Constants.VALIDATED_RESOURCE_TYPE, validatedResourceType); - Iterator<Resource> models = rr.findResources(queryString, Query.XPATH); + Iterator<Resource> models = rr.findResources(queryString, "xpath"); while (models.hasNext()) { Resource model = models.next(); LOG.info("Found validation model resource {}.", model.getPath()); Modified: sling/trunk/bundles/extensions/validation/examples/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/examples/pom.xml?rev=1672911&r1=1672910&r2=1672911&view=diff ============================================================================== --- sling/trunk/bundles/extensions/validation/examples/pom.xml (original) +++ sling/trunk/bundles/extensions/validation/examples/pom.xml Sat Apr 11 17:54:36 2015 @@ -20,13 +20,13 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.sling</groupId> <artifactId>sling</artifactId> - <version>15</version> + <version>22</version> <relativePath/> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>org.apache.sling.validation.examples</artifactId> <version>1.0.0-SNAPSHOT</version> @@ -38,21 +38,18 @@ <properties> <sling.java.version>6</sling.java.version> </properties> + + <scm> + <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/validation/examples</connection> + <developerConnection> scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/validation/examples</developerConnection> + <url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/examples</url> + </scm> <build> <plugins> <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-scr-plugin</artifactId> - <version>1.11.0</version> - <executions> - <execution> - <id>generate-scr-descriptor</id> - <goals> - <goal>scr</goal> - </goals> - </execution> - </executions> </plugin> <plugin> <groupId>org.apache.felix</groupId> @@ -96,12 +93,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>javax.jcr</groupId> - <artifactId>jcr</artifactId> - <version>2.0</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.api</artifactId> <version>2.4.2</version> @@ -115,7 +106,6 @@ <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.scr.annotations</artifactId> - <version>1.9.0</version> <scope>provided</scope> </dependency> <dependency> @@ -137,5 +127,4 @@ <scope>provided</scope> </dependency> </dependencies> - </project> Modified: sling/trunk/bundles/extensions/validation/it-http/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/it-http/pom.xml?rev=1672911&r1=1672910&r2=1672911&view=diff ============================================================================== --- sling/trunk/bundles/extensions/validation/it-http/pom.xml (original) +++ sling/trunk/bundles/extensions/validation/it-http/pom.xml Sat Apr 11 17:54:36 2015 @@ -20,13 +20,12 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.sling</groupId> <artifactId>sling</artifactId> - <version>15</version> - <relativePath /> + <version>22</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>org.apache.sling.validation.it-http</artifactId> <version>1.0.0-SNAPSHOT</version> @@ -83,11 +82,17 @@ <!-- Change this to run selected tests only --> <tests.to.run>**/**Test.java</tests.to.run> </properties> + + <scm> + <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/validation/it-http</connection> + <developerConnection> scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/validation/it-http</developerConnection> + <url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/core</url> + </scm> + <build> <plugins> <plugin> <artifactId>maven-clean-plugin</artifactId> - <version>2.2</version> <configuration> <filesets> <fileset> @@ -159,7 +164,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.5</version> <configuration> <!-- We run all tests in the integration-tests phase --> <excludes> @@ -170,7 +174,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <version>2.7.2</version> <executions> <execution> <id>integration-test</id> @@ -261,7 +264,7 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.testing.tools</artifactId> - <version>1.0.6</version> + <version>1.0.8</version> </dependency> <dependency> <groupId>org.apache.sling</groupId> Modified: sling/trunk/bundles/extensions/validation/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/pom.xml?rev=1672911&r1=1672910&r2=1672911&view=diff ============================================================================== --- sling/trunk/bundles/extensions/validation/pom.xml (original) +++ sling/trunk/bundles/extensions/validation/pom.xml Sat Apr 11 17:54:36 2015 @@ -19,7 +19,6 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.validation.reactor</artifactId> <packaging>pom</packaging> <version>1.0.0-SNAPSHOT</version> Modified: sling/trunk/bundles/extensions/validation/test-services/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/test-services/pom.xml?rev=1672911&r1=1672910&r2=1672911&view=diff ============================================================================== --- sling/trunk/bundles/extensions/validation/test-services/pom.xml (original) +++ sling/trunk/bundles/extensions/validation/test-services/pom.xml Sat Apr 11 17:54:36 2015 @@ -20,13 +20,12 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.sling</groupId> <artifactId>sling</artifactId> - <version>15</version> - <relativePath /> + <version>22</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>org.apache.sling.validation.test-services</artifactId> <version>1.0.0-SNAPSHOT</version> @@ -37,21 +36,18 @@ <properties> <sling.java.version>6</sling.java.version> </properties> + + <scm> + <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/validation/test-services</connection> + <developerConnection> scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/validation/test-services</developerConnection> + <url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/core</url> + </scm> <build> <plugins> <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-scr-plugin</artifactId> - <version>1.11.0</version> - <executions> - <execution> - <id>generate-scr-descriptor</id> - <goals> - <goal>scr</goal> - </goals> - </execution> - </executions> </plugin> <plugin> <groupId>org.apache.felix</groupId> @@ -91,7 +87,6 @@ <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.scr.annotations</artifactId> - <version>1.9.0</version> <scope>provided</scope> </dependency> <dependency> @@ -106,6 +101,12 @@ <version>2.2.0</version> <scope>provided</scope> </dependency> + <!-- transitive dependency of org.apache.sling.servlets.post, used in AbstractPostOperation --> + <dependency> + <groupId>javax.jcr</groupId> + <artifactId>jcr</artifactId> + <version>2.0</version> + </dependency> <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.validation.api</artifactId> @@ -127,7 +128,7 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.commons.testing</artifactId> - <version>2.0.14</version> + <version>2.0.16</version> <scope>test</scope> </dependency> </dependencies> Modified: sling/trunk/bundles/extensions/validation/test-services/src/main/java/org/apache/sling/validation/testservices/ValidationPostOperation.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/test-services/src/main/java/org/apache/sling/validation/testservices/ValidationPostOperation.java?rev=1672911&r1=1672910&r2=1672911&view=diff ============================================================================== --- sling/trunk/bundles/extensions/validation/test-services/src/main/java/org/apache/sling/validation/testservices/ValidationPostOperation.java (original) +++ sling/trunk/bundles/extensions/validation/test-services/src/main/java/org/apache/sling/validation/testservices/ValidationPostOperation.java Sat Apr 11 17:54:36 2015 @@ -18,6 +18,8 @@ */ package org.apache.sling.validation.testservices; +import java.util.List; + import org.apache.felix.scr.annotations.Component; import org.apache.felix.scr.annotations.Properties; import org.apache.felix.scr.annotations.Property; @@ -25,7 +27,6 @@ import org.apache.felix.scr.annotations. import org.apache.felix.scr.annotations.Service; import org.apache.sling.api.SlingHttpServletRequest; import org.apache.sling.api.resource.ValueMap; -import org.apache.sling.commons.json.JSONObject; import org.apache.sling.servlets.post.AbstractPostOperation; import org.apache.sling.servlets.post.Modification; import org.apache.sling.servlets.post.PostOperation; @@ -36,16 +37,12 @@ import org.apache.sling.validation.api.V import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.jcr.RepositoryException; -import java.util.List; - @Component() @Service(PostOperation.class) @Properties({ @Property( name = PostOperation.PROP_OPERATION_NAME, - value = "validation", - propertyPrivate = true + value = "validation" ) }) public class ValidationPostOperation extends AbstractPostOperation { @@ -56,7 +53,7 @@ public class ValidationPostOperation ext private ValidationService validationService; @Override - protected void doRun(SlingHttpServletRequest request, PostResponse response, List<Modification> changes) throws RepositoryException { + protected void doRun(SlingHttpServletRequest request, PostResponse response, List<Modification> changes) { if (response instanceof ValidationPostResponse) { ValidationPostResponse vpr = (ValidationPostResponse) response; ValueMap requestParameters = request.adaptTo(ValueMap.class);