svn commit: r530935 - in /maven/maven-1/plugins/trunk/modello: project.xml src/plugin-test/maven.xml

[aheritier]

Author: aheritier
Date: Fri Apr 20 15:07:23 2007
New Revision: 530935

URL: http://svn.apache.org/viewvc?view=rev&rev=530935
Log:
Use plugin properties in tests

Modified:
    maven/maven-1/plugins/trunk/modello/project.xml
    maven/maven-1/plugins/trunk/modello/src/plugin-test/maven.xml

Modified: maven/maven-1/plugins/trunk/modello/project.xml
URL: 
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/modello/project.xml?view=diff&rev=530935&r1=530934&r2=530935
==============================================================================
--- maven/maven-1/plugins/trunk/modello/project.xml (original)
+++ maven/maven-1/plugins/trunk/modello/project.xml Fri Apr 20 15:07:23 2007
@@ -24,7 +24,7 @@
   <name>Maven Modello Plugin</name>
   <description>Modello is a Data Model toolkit. This plugin permits to 
integrate modello services in your build to automatically (or manually) 
generate the code and the documentation from the DataModel.</description>
   <shortDescription>Wrapper for Modello, a Data Model 
toolkit.</shortDescription>
-  <currentVersion>1.0</currentVersion>
+  <currentVersion>1.0.1-SNAPSHOT</currentVersion>
   <inceptionYear>2004</inceptionYear>
   <developers>
     <developer>

Modified: maven/maven-1/plugins/trunk/modello/src/plugin-test/maven.xml
URL: 
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/modello/src/plugin-test/maven.xml?view=diff&rev=530935&r1=530934&r2=530935
==============================================================================
--- maven/maven-1/plugins/trunk/modello/src/plugin-test/maven.xml (original)
+++ maven/maven-1/plugins/trunk/modello/src/plugin-test/maven.xml Fri Apr 20 
15:07:23 2007
@@ -46,10 +46,10 @@
   </goal>
 
   <goal name="testSite"  prereqs="site">
-    <assert:assertFileExists 
file="${maven.gen.docs}/${maven_modello_model_id}.xml"/>
-    <assert:assertFileExists 
file="${maven.gen.docs}/${maven_modello_model_id}-${maven.modello.version}.xsd"/>
-    <assert:assertFileContains 
file="${maven.gen.docs}/${maven_modello_model_id}-${maven.modello.version}.xsd" 
match="xmlns=&quot;http://maven.apache.org/POM/3.0.0&quot;"; msg="xmlns invalid 
in schema"/>
-    <assert:assertFileContains 
file="${maven.gen.docs}/${maven_modello_model_id}-${maven.modello.version}.xsd" 
match="targetNamespace=&quot;http://maven.apache.org/POM/3.0.0&quot;"; 
msg="targetNamespace invalid in schema"/>
+    <assert:assertFileExists 
file="${maven.modello.xdoc.targetDirectory}/${maven_modello_model_id}.xml"/>
+    <assert:assertFileExists 
file="${maven.modello.xsd.targetDirectory}/${maven_modello_model_id}-${maven.modello.version}.xsd"/>
+    <assert:assertFileContains 
file="${maven.modello.xsd.targetDirectory}/${maven_modello_model_id}-${maven.modello.version}.xsd"
 match="xmlns=&quot;http://maven.apache.org/POM/3.0.0&quot;"; msg="xmlns invalid 
in schema"/>
+    <assert:assertFileContains 
file="${maven.modello.xsd.targetDirectory}/${maven_modello_model_id}-${maven.modello.version}.xsd"
 match="targetNamespace=&quot;http://maven.apache.org/POM/3.0.0&quot;"; 
msg="targetNamespace invalid in schema"/>
     <assert:assertFileExists 
file="${maven.docs.dest}/${maven_modello_model_id}.html"/>
     <assert:assertFileExists 
file="${maven.docs.dest}/${maven_modello_model_id}-${maven.modello.version}.xsd"/>
   </goal>