Author: oheger Date: Sat Sep 16 15:00:23 2017 New Revision: 1808561 URL: http://svn.apache.org/viewvc?rev=1808561&view=rev Log: Added validate tag lib to multi-module build.
Added: commons/proper/jelly/trunk/jelly-tags/validate/pom.xml - copied, changed from r1808560, commons/proper/jelly/trunk/jelly-tags/validate/project.xml commons/proper/jelly/trunk/jelly-tags/validate/src/main/ commons/proper/jelly/trunk/jelly-tags/validate/src/main/java/ commons/proper/jelly/trunk/jelly-tags/validate/src/main/java/org/ commons/proper/jelly/trunk/jelly-tags/validate/src/main/java/org/apache/ commons/proper/jelly/trunk/jelly-tags/validate/src/main/java/org/apache/commons/ commons/proper/jelly/trunk/jelly-tags/validate/src/main/java/org/apache/commons/jelly/ commons/proper/jelly/trunk/jelly-tags/validate/src/main/java/org/apache/commons/jelly/tags/ commons/proper/jelly/trunk/jelly-tags/validate/src/main/java/org/apache/commons/jelly/tags/validate/ commons/proper/jelly/trunk/jelly-tags/validate/src/main/java/org/apache/commons/jelly/tags/validate/AssertValidTag.java - copied, changed from r1808560, commons/proper/jelly/trunk/jelly-tags/validate/src/java/org/apache/commons/jelly/tags/validate/AssertValidTag.java commons/proper/jelly/trunk/jelly-tags/validate/src/main/java/org/apache/commons/jelly/tags/validate/ValidateTag.java - copied, changed from r1808560, commons/proper/jelly/trunk/jelly-tags/validate/src/java/org/apache/commons/jelly/tags/validate/ValidateTag.java commons/proper/jelly/trunk/jelly-tags/validate/src/main/java/org/apache/commons/jelly/tags/validate/ValidateTagLibrary.java - copied, changed from r1808560, commons/proper/jelly/trunk/jelly-tags/validate/src/java/org/apache/commons/jelly/tags/validate/ValidateTagLibrary.java commons/proper/jelly/trunk/jelly-tags/validate/src/main/java/org/apache/commons/jelly/tags/validate/VerifierTag.java - copied, changed from r1808560, commons/proper/jelly/trunk/jelly-tags/validate/src/java/org/apache/commons/jelly/tags/validate/VerifierTag.java commons/proper/jelly/trunk/jelly-tags/validate/src/main/java/org/apache/commons/jelly/tags/validate/package.html - copied, changed from r1808560, commons/proper/jelly/trunk/jelly-tags/validate/src/java/org/apache/commons/jelly/tags/validate/package.html commons/proper/jelly/trunk/jelly-tags/validate/src/test/java/ commons/proper/jelly/trunk/jelly-tags/validate/src/test/java/org/ commons/proper/jelly/trunk/jelly-tags/validate/src/test/java/org/apache/ commons/proper/jelly/trunk/jelly-tags/validate/src/test/java/org/apache/commons/ commons/proper/jelly/trunk/jelly-tags/validate/src/test/java/org/apache/commons/jelly/ commons/proper/jelly/trunk/jelly-tags/validate/src/test/java/org/apache/commons/jelly/tags/ commons/proper/jelly/trunk/jelly-tags/validate/src/test/java/org/apache/commons/jelly/tags/validate/ commons/proper/jelly/trunk/jelly-tags/validate/src/test/java/org/apache/commons/jelly/tags/validate/TestJelly.java - copied, changed from r1808560, commons/proper/jelly/trunk/jelly-tags/validate/src/test/org/apache/commons/jelly/tags/validate/TestJelly.java commons/proper/jelly/trunk/jelly-tags/validate/src/test/resources/ commons/proper/jelly/trunk/jelly-tags/validate/src/test/resources/org/ commons/proper/jelly/trunk/jelly-tags/validate/src/test/resources/org/apache/ commons/proper/jelly/trunk/jelly-tags/validate/src/test/resources/org/apache/commons/ commons/proper/jelly/trunk/jelly-tags/validate/src/test/resources/org/apache/commons/jelly/ commons/proper/jelly/trunk/jelly-tags/validate/src/test/resources/org/apache/commons/jelly/tags/ commons/proper/jelly/trunk/jelly-tags/validate/src/test/resources/org/apache/commons/jelly/tags/validate/ commons/proper/jelly/trunk/jelly-tags/validate/src/test/resources/org/apache/commons/jelly/tags/validate/address.dtd - copied, changed from r1808560, commons/proper/jelly/trunk/jelly-tags/validate/src/test/org/apache/commons/jelly/tags/validate/address.dtd commons/proper/jelly/trunk/jelly-tags/validate/src/test/resources/org/apache/commons/jelly/tags/validate/address.rng - copied, changed from r1808560, commons/proper/jelly/trunk/jelly-tags/validate/src/test/org/apache/commons/jelly/tags/validate/address.rng commons/proper/jelly/trunk/jelly-tags/validate/src/test/resources/org/apache/commons/jelly/tags/validate/suite.jelly - copied, changed from r1808560, commons/proper/jelly/trunk/jelly-tags/validate/src/test/org/apache/commons/jelly/tags/validate/suite.jelly commons/proper/jelly/trunk/jelly-tags/validate/src/test/resources/org/apache/commons/jelly/tags/validate/validateDTD.jelly - copied, changed from r1808560, commons/proper/jelly/trunk/jelly-tags/validate/src/test/org/apache/commons/jelly/tags/validate/validateDTD.jelly commons/proper/jelly/trunk/jelly-tags/validate/src/test/resources/org/apache/commons/jelly/tags/validate/validateRNG.jelly - copied, changed from r1808560, commons/proper/jelly/trunk/jelly-tags/validate/src/test/org/apache/commons/jelly/tags/validate/validateRNG.jelly Removed: commons/proper/jelly/trunk/jelly-tags/validate/build.xml commons/proper/jelly/trunk/jelly-tags/validate/maven.xml commons/proper/jelly/trunk/jelly-tags/validate/project.properties commons/proper/jelly/trunk/jelly-tags/validate/project.xml commons/proper/jelly/trunk/jelly-tags/validate/src/java/org/apache/commons/jelly/tags/validate/AssertValidTag.java commons/proper/jelly/trunk/jelly-tags/validate/src/java/org/apache/commons/jelly/tags/validate/ValidateTag.java commons/proper/jelly/trunk/jelly-tags/validate/src/java/org/apache/commons/jelly/tags/validate/ValidateTagLibrary.java commons/proper/jelly/trunk/jelly-tags/validate/src/java/org/apache/commons/jelly/tags/validate/VerifierTag.java commons/proper/jelly/trunk/jelly-tags/validate/src/java/org/apache/commons/jelly/tags/validate/package.html commons/proper/jelly/trunk/jelly-tags/validate/src/test/org/apache/commons/jelly/tags/validate/TestJelly.java commons/proper/jelly/trunk/jelly-tags/validate/src/test/org/apache/commons/jelly/tags/validate/address.dtd commons/proper/jelly/trunk/jelly-tags/validate/src/test/org/apache/commons/jelly/tags/validate/address.rng commons/proper/jelly/trunk/jelly-tags/validate/src/test/org/apache/commons/jelly/tags/validate/suite.jelly commons/proper/jelly/trunk/jelly-tags/validate/src/test/org/apache/commons/jelly/tags/validate/validateDTD.jelly commons/proper/jelly/trunk/jelly-tags/validate/src/test/org/apache/commons/jelly/tags/validate/validateRNG.jelly Modified: commons/proper/jelly/trunk/jelly-tags/pom.xml Modified: commons/proper/jelly/trunk/jelly-tags/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/pom.xml?rev=1808561&r1=1808560&r2=1808561&view=diff ============================================================================== --- commons/proper/jelly/trunk/jelly-tags/pom.xml (original) +++ commons/proper/jelly/trunk/jelly-tags/pom.xml Sat Sep 16 15:00:23 2017 @@ -46,6 +46,7 @@ <module>swt</module> <module>threads</module> <module>util</module> + <module>validate</module> <module>xml</module> <module>xmlunit</module> </modules> Copied: commons/proper/jelly/trunk/jelly-tags/validate/pom.xml (from r1808560, commons/proper/jelly/trunk/jelly-tags/validate/project.xml) URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/validate/pom.xml?p2=commons/proper/jelly/trunk/jelly-tags/validate/pom.xml&p1=commons/proper/jelly/trunk/jelly-tags/validate/project.xml&r1=1808560&r2=1808561&rev=1808561&view=diff ============================================================================== --- commons/proper/jelly/trunk/jelly-tags/validate/project.xml (original) +++ commons/proper/jelly/trunk/jelly-tags/validate/pom.xml Sat Sep 16 15:00:23 2017 @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> - <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -7,31 +6,28 @@ The ASF licenses this file to You under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - + + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>commons-jelly</groupId> + <artifactId>commons-jelly-tags</artifactId> + <version>1.1-SNAPSHOT</version> + </parent> -<project> - <extend>${basedir}/../tag-project.xml</extend> <artifactId>commons-jelly-tags-validate</artifactId> + <packaging>jar</packaging> <name>commons-jelly-tags-validate</name> - <currentVersion>1.0.1-SNAPSHOT</currentVersion> - <package>org.apache.commons.jelly.tags.validate</package> <description>This is a Jelly interface for XML validation.</description> - <shortDescription>Commons Jelly Validate Tag Library</shortDescription> - <versions> - <version> - <id>1.0</id> - <name>1.0</name> - <tag>COMMONS-JELLY-VALIDATE-1_0</tag> - </version> - </versions> <dependencies> <!-- START for compilation --> @@ -39,9 +35,6 @@ <groupId>msv</groupId> <artifactId>isorelax</artifactId> <version>20030807</version> - <properties> - <gump.project>iso-relax</gump.project> - </properties> </dependency> <dependency> <groupId>junit</groupId> @@ -53,9 +46,15 @@ <artifactId>msv</artifactId> <version>20030807</version> </dependency> + <dependency> + <groupId>commons-jelly</groupId> + <artifactId>commons-jelly-tags-junit</artifactId> + <version>${project.version}</version> + </dependency> + <!-- END for compilation --> - <!-- runtime dependencies --> + <!-- START for runtime --> <dependency> <groupId>msv</groupId> <artifactId>xsdlib</artifactId> @@ -65,31 +64,19 @@ <groupId>msv</groupId> <artifactId>relaxngDatatype</artifactId> <version>20030807</version> - <properties> - <gump.project>relaxng</gump.project> - </properties> </dependency> - <!-- END runtime --> - <!-- START for test --> - <dependency> - <groupId>commons-jelly</groupId> - <artifactId>commons-jelly-tags-junit</artifactId> - <version>1.0</version> - <url>http://commons.apache.org/jelly/libs/junit/</url> - <properties> - <scope>test</scope> - </properties> - </dependency> - <!-- END for test --> - <!-- START for running demos --> + <!-- END for runtime --> + + <!-- Start for running demos --> <dependency> - <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> + <groupId>commons-cli</groupId> <version>1.0</version> + <scope>provided</scope> </dependency> - <!-- END for running demos --> + <!-- END for running demos --> </dependencies> </project> Copied: commons/proper/jelly/trunk/jelly-tags/validate/src/main/java/org/apache/commons/jelly/tags/validate/AssertValidTag.java (from r1808560, commons/proper/jelly/trunk/jelly-tags/validate/src/java/org/apache/commons/jelly/tags/validate/AssertValidTag.java) URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/validate/src/main/java/org/apache/commons/jelly/tags/validate/AssertValidTag.java?p2=commons/proper/jelly/trunk/jelly-tags/validate/src/main/java/org/apache/commons/jelly/tags/validate/AssertValidTag.java&p1=commons/proper/jelly/trunk/jelly-tags/validate/src/java/org/apache/commons/jelly/tags/validate/AssertValidTag.java&r1=1808560&r2=1808561&rev=1808561&view=diff ============================================================================== (empty) Copied: commons/proper/jelly/trunk/jelly-tags/validate/src/main/java/org/apache/commons/jelly/tags/validate/ValidateTag.java (from r1808560, commons/proper/jelly/trunk/jelly-tags/validate/src/java/org/apache/commons/jelly/tags/validate/ValidateTag.java) URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/validate/src/main/java/org/apache/commons/jelly/tags/validate/ValidateTag.java?p2=commons/proper/jelly/trunk/jelly-tags/validate/src/main/java/org/apache/commons/jelly/tags/validate/ValidateTag.java&p1=commons/proper/jelly/trunk/jelly-tags/validate/src/java/org/apache/commons/jelly/tags/validate/ValidateTag.java&r1=1808560&r2=1808561&rev=1808561&view=diff ============================================================================== (empty) Copied: commons/proper/jelly/trunk/jelly-tags/validate/src/main/java/org/apache/commons/jelly/tags/validate/ValidateTagLibrary.java (from r1808560, commons/proper/jelly/trunk/jelly-tags/validate/src/java/org/apache/commons/jelly/tags/validate/ValidateTagLibrary.java) URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/validate/src/main/java/org/apache/commons/jelly/tags/validate/ValidateTagLibrary.java?p2=commons/proper/jelly/trunk/jelly-tags/validate/src/main/java/org/apache/commons/jelly/tags/validate/ValidateTagLibrary.java&p1=commons/proper/jelly/trunk/jelly-tags/validate/src/java/org/apache/commons/jelly/tags/validate/ValidateTagLibrary.java&r1=1808560&r2=1808561&rev=1808561&view=diff ============================================================================== (empty) Copied: commons/proper/jelly/trunk/jelly-tags/validate/src/main/java/org/apache/commons/jelly/tags/validate/VerifierTag.java (from r1808560, commons/proper/jelly/trunk/jelly-tags/validate/src/java/org/apache/commons/jelly/tags/validate/VerifierTag.java) URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/validate/src/main/java/org/apache/commons/jelly/tags/validate/VerifierTag.java?p2=commons/proper/jelly/trunk/jelly-tags/validate/src/main/java/org/apache/commons/jelly/tags/validate/VerifierTag.java&p1=commons/proper/jelly/trunk/jelly-tags/validate/src/java/org/apache/commons/jelly/tags/validate/VerifierTag.java&r1=1808560&r2=1808561&rev=1808561&view=diff ============================================================================== (empty) Copied: commons/proper/jelly/trunk/jelly-tags/validate/src/main/java/org/apache/commons/jelly/tags/validate/package.html (from r1808560, commons/proper/jelly/trunk/jelly-tags/validate/src/java/org/apache/commons/jelly/tags/validate/package.html) URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/validate/src/main/java/org/apache/commons/jelly/tags/validate/package.html?p2=commons/proper/jelly/trunk/jelly-tags/validate/src/main/java/org/apache/commons/jelly/tags/validate/package.html&p1=commons/proper/jelly/trunk/jelly-tags/validate/src/java/org/apache/commons/jelly/tags/validate/package.html&r1=1808560&r2=1808561&rev=1808561&view=diff ============================================================================== (empty) Copied: commons/proper/jelly/trunk/jelly-tags/validate/src/test/java/org/apache/commons/jelly/tags/validate/TestJelly.java (from r1808560, commons/proper/jelly/trunk/jelly-tags/validate/src/test/org/apache/commons/jelly/tags/validate/TestJelly.java) URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/validate/src/test/java/org/apache/commons/jelly/tags/validate/TestJelly.java?p2=commons/proper/jelly/trunk/jelly-tags/validate/src/test/java/org/apache/commons/jelly/tags/validate/TestJelly.java&p1=commons/proper/jelly/trunk/jelly-tags/validate/src/test/org/apache/commons/jelly/tags/validate/TestJelly.java&r1=1808560&r2=1808561&rev=1808561&view=diff ============================================================================== (empty) Copied: commons/proper/jelly/trunk/jelly-tags/validate/src/test/resources/org/apache/commons/jelly/tags/validate/address.dtd (from r1808560, commons/proper/jelly/trunk/jelly-tags/validate/src/test/org/apache/commons/jelly/tags/validate/address.dtd) URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/validate/src/test/resources/org/apache/commons/jelly/tags/validate/address.dtd?p2=commons/proper/jelly/trunk/jelly-tags/validate/src/test/resources/org/apache/commons/jelly/tags/validate/address.dtd&p1=commons/proper/jelly/trunk/jelly-tags/validate/src/test/org/apache/commons/jelly/tags/validate/address.dtd&r1=1808560&r2=1808561&rev=1808561&view=diff ============================================================================== Binary files - no diff available. Copied: commons/proper/jelly/trunk/jelly-tags/validate/src/test/resources/org/apache/commons/jelly/tags/validate/address.rng (from r1808560, commons/proper/jelly/trunk/jelly-tags/validate/src/test/org/apache/commons/jelly/tags/validate/address.rng) URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/validate/src/test/resources/org/apache/commons/jelly/tags/validate/address.rng?p2=commons/proper/jelly/trunk/jelly-tags/validate/src/test/resources/org/apache/commons/jelly/tags/validate/address.rng&p1=commons/proper/jelly/trunk/jelly-tags/validate/src/test/org/apache/commons/jelly/tags/validate/address.rng&r1=1808560&r2=1808561&rev=1808561&view=diff ============================================================================== Binary files - no diff available. Copied: commons/proper/jelly/trunk/jelly-tags/validate/src/test/resources/org/apache/commons/jelly/tags/validate/suite.jelly (from r1808560, commons/proper/jelly/trunk/jelly-tags/validate/src/test/org/apache/commons/jelly/tags/validate/suite.jelly) URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/validate/src/test/resources/org/apache/commons/jelly/tags/validate/suite.jelly?p2=commons/proper/jelly/trunk/jelly-tags/validate/src/test/resources/org/apache/commons/jelly/tags/validate/suite.jelly&p1=commons/proper/jelly/trunk/jelly-tags/validate/src/test/org/apache/commons/jelly/tags/validate/suite.jelly&r1=1808560&r2=1808561&rev=1808561&view=diff ============================================================================== (empty) Copied: commons/proper/jelly/trunk/jelly-tags/validate/src/test/resources/org/apache/commons/jelly/tags/validate/validateDTD.jelly (from r1808560, commons/proper/jelly/trunk/jelly-tags/validate/src/test/org/apache/commons/jelly/tags/validate/validateDTD.jelly) URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/validate/src/test/resources/org/apache/commons/jelly/tags/validate/validateDTD.jelly?p2=commons/proper/jelly/trunk/jelly-tags/validate/src/test/resources/org/apache/commons/jelly/tags/validate/validateDTD.jelly&p1=commons/proper/jelly/trunk/jelly-tags/validate/src/test/org/apache/commons/jelly/tags/validate/validateDTD.jelly&r1=1808560&r2=1808561&rev=1808561&view=diff ============================================================================== (empty) Copied: commons/proper/jelly/trunk/jelly-tags/validate/src/test/resources/org/apache/commons/jelly/tags/validate/validateRNG.jelly (from r1808560, commons/proper/jelly/trunk/jelly-tags/validate/src/test/org/apache/commons/jelly/tags/validate/validateRNG.jelly) URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/validate/src/test/resources/org/apache/commons/jelly/tags/validate/validateRNG.jelly?p2=commons/proper/jelly/trunk/jelly-tags/validate/src/test/resources/org/apache/commons/jelly/tags/validate/validateRNG.jelly&p1=commons/proper/jelly/trunk/jelly-tags/validate/src/test/org/apache/commons/jelly/tags/validate/validateRNG.jelly&r1=1808560&r2=1808561&rev=1808561&view=diff ============================================================================== (empty)