Author: dennisl Date: Mon Jan 18 17:55:17 2010 New Revision: 900478 URL: http://svn.apache.org/viewvc?rev=900478&view=rev Log: o Generate the xml schema as part of the site, to make it easy to copy to its final destination. o Document how to use the xml schema, and use it in the example.
Added: maven/plugins/trunk/maven-verifier-plugin/src/site/apt/using-xsd.apt (with props) Modified: maven/plugins/trunk/maven-verifier-plugin/pom.xml maven/plugins/trunk/maven-verifier-plugin/src/main/mdo/verifications.mdo maven/plugins/trunk/maven-verifier-plugin/src/site/apt/examples/sample-verifications.apt maven/plugins/trunk/maven-verifier-plugin/src/site/site.xml Modified: maven/plugins/trunk/maven-verifier-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-verifier-plugin/pom.xml?rev=900478&r1=900477&r2=900478&view=diff ============================================================================== --- maven/plugins/trunk/maven-verifier-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-verifier-plugin/pom.xml Mon Jan 18 17:55:17 2010 @@ -75,10 +75,21 @@ <artifactId>modello-maven-plugin</artifactId> <executions> <execution> + <id>generate-xsd-site</id> + <phase>pre-site</phase> <goals> + <goal>xsd</goal> + </goals> + <configuration> + <outputDirectory>${project.reporting.outputDirectory}/xsd</outputDirectory> + </configuration> + </execution> + <execution> + <id>standard</id> + <goals> + <goal>java</goal> <goal>xpp3-reader</goal> <goal>xpp3-writer</goal> - <goal>java</goal> </goals> </execution> <execution> @@ -86,7 +97,6 @@ <phase>pre-site</phase> <goals> <goal>xdoc</goal> - <goal>xsd</goal> </goals> </execution> </executions> Modified: maven/plugins/trunk/maven-verifier-plugin/src/main/mdo/verifications.mdo URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-verifier-plugin/src/main/mdo/verifications.mdo?rev=900478&r1=900477&r2=900478&view=diff ============================================================================== --- maven/plugins/trunk/maven-verifier-plugin/src/main/mdo/verifications.mdo (original) +++ maven/plugins/trunk/maven-verifier-plugin/src/main/mdo/verifications.mdo Mon Jan 18 17:55:17 2010 @@ -17,7 +17,11 @@ under the License. --> -<model> +<model xmlns="http://modello.codehaus.org/MODELLO/1.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.0.0 http://modello.codehaus.org/xsd/modello-1.0.0.xsd" + xsd.namespace="http://maven.apache.org/verifications/1.0.0" + xsd.targetNamespace="http://maven.apache.org/verifications/1.0.0"> <id>verifications</id> <name>Verifications</name> <description><![CDATA[ Modified: maven/plugins/trunk/maven-verifier-plugin/src/site/apt/examples/sample-verifications.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-verifier-plugin/src/site/apt/examples/sample-verifications.apt?rev=900478&r1=900477&r2=900478&view=diff ============================================================================== --- maven/plugins/trunk/maven-verifier-plugin/src/site/apt/examples/sample-verifications.apt (original) +++ maven/plugins/trunk/maven-verifier-plugin/src/site/apt/examples/sample-verifications.apt Mon Jan 18 17:55:17 2010 @@ -3,7 +3,7 @@ ------ Denis Cabasson ------ - 20 july 2006 + 2010-01-18 ------ Sample Verifications @@ -11,7 +11,9 @@ Here is an example of what a <<<verifications.xml>>> file can look like: +-------- -<verifications> +<verifications xmlns="http://maven.apache.org/verifications/1.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/verifications/1.0.0 http://maven.apache.org/xsd/verifications-1.0.0.xsd"> <files> <file> <location>src/main/resources/file1.txt</location> @@ -32,6 +34,6 @@ * checks that the file <<<src/main/resources/file1.txt>>> is present. - * checks that the file <<<src/main/resources/file2.txt>>> is present and match the regexp <aaaabbbb>. + * checks that the file <<<src/main/resources/file2.txt>>> is present and matches the regular expression <aaaabbbb>. * checks that the file <<<src/main/resources/file3.txt>>> is <<not>> present. Added: maven/plugins/trunk/maven-verifier-plugin/src/site/apt/using-xsd.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-verifier-plugin/src/site/apt/using-xsd.apt?rev=900478&view=auto ============================================================================== --- maven/plugins/trunk/maven-verifier-plugin/src/site/apt/using-xsd.apt (added) +++ maven/plugins/trunk/maven-verifier-plugin/src/site/apt/using-xsd.apt Mon Jan 18 17:55:17 2010 @@ -0,0 +1,43 @@ + ----- + Using the XML Schema Verifications 1.0.0 + ----- + Dennis Lundberg + ------ + 2010-01-18 + ------ + +~~ Licensed to the Apache Software Foundation (ASF) under one +~~ or more contributor license agreements. See the NOTICE file +~~ distributed with this work for additional information +~~ regarding copyright ownership. 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 +~~ +~~ 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. + +~~ NOTE: For help with the syntax of this file, see: +~~ http://maven.apache.org/doxia/references/apt-format.html + +Using the XML Schema Verifications 1.0.0 + + The Verifications XSD is located {{{http://maven.apache.org/xsd/verifications-1.0.0.xsd}here}}. + + Your favorite IDE probably supports validation and/or syntax highlighting for + XML files by using XSD schemas. For this to work you need to specify the + schema in your <<<verifications.xml>>> file: + ++-----+ +<verifications xmlns="http://maven.apache.org/verifications/1.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/verifications/1.0.0 http://maven.apache.org/xsd/verifications-1.0.0.xsd"> +... +</verifications> ++-----+ Propchange: maven/plugins/trunk/maven-verifier-plugin/src/site/apt/using-xsd.apt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/plugins/trunk/maven-verifier-plugin/src/site/apt/using-xsd.apt ------------------------------------------------------------------------------ svn:keywords = Date Revision Author Id Modified: maven/plugins/trunk/maven-verifier-plugin/src/site/site.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-verifier-plugin/src/site/site.xml?rev=900478&r1=900477&r2=900478&view=diff ============================================================================== --- maven/plugins/trunk/maven-verifier-plugin/src/site/site.xml (original) +++ maven/plugins/trunk/maven-verifier-plugin/src/site/site.xml Mon Jan 18 17:55:17 2010 @@ -28,6 +28,7 @@ <item name="Goals" href="plugin-info.html"/> <item name="Usage" href="usage.html"/> <item name="FAQ" href="faq.html"/> + <item name="Using the XML Schema" href="using-xsd.html"/> </menu> <menu name="Examples"> <item name="Sample Verifications" href="examples/sample-verifications.html"/>