[jboss-cvs] jboss-seam ...
Peter Muir
peter at bleepbleep.org.uk
Mon Jun 25 09:16:23 EDT 2007
User: pmuir
Date: 07/06/25 09:16:23
Modified: jboss-seam build.properties.sample build.xml validate.xml
Log:
better xsds, example xml which validates, better validation in ant
Revision Changes Path
1.4 +2 -0 jboss-seam/build.properties.sample
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.properties.sample
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/build.properties.sample,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- build.properties.sample 13 Jun 2007 20:40:23 -0000 1.3
+++ build.properties.sample 25 Jun 2007 13:16:23 -0000 1.4
@@ -2,3 +2,5 @@
jboss.home = /Applications/jboss-4.2.0.GA
#tomcat.home = C:\\Tomcat-5.5
#jboss.home = C:\\jboss-4.2.0.GA
+version = 1.3
+patchlevel = 0.BETA1
\ No newline at end of file
1.208 +8 -3 jboss-seam/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/build.xml,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -b -r1.207 -r1.208
--- build.xml 25 Jun 2007 01:02:30 -0000 1.207
+++ build.xml 25 Jun 2007 13:16:23 -0000 1.208
@@ -32,8 +32,8 @@
<!-- Name of project and version, used to create filenames -->
<property name="Name" value="JBoss Seam" />
<property name="name" value="jboss-seam" />
- <property name="version" value="1.3" />
- <property name="patchlevel" value="0.BETA1" />
+
+ <property name="schema.version" value="${version}" />
<!-- set global properties for this build -->
<property name="build.dir" value="build" />
@@ -120,6 +120,7 @@
<property name="example.webinf.dir" value="${example.resources.dir}/WEB-INF" />
<property name="example.webinf.lib.dir" value="${example.resources.dir}/WEB-INF/lib" />
<property name="example.ds" value="${example.name}-ds.xml" />
+ <property name="validate.resources.dir" value="${example.resources.dir}" />
<path id="example.path" />
<fileset id="example.local.jar" dir=".">
@@ -750,7 +751,7 @@
<echo>Report available at ${basedir}/report/index.html</echo>
</target>
- <target name="testexample" depends="compile" description="Run the example tests">
+ <target name="testexample" depends="validateConfiguration, compile" description="Run the example tests">
<taskdef resource="testngtasks" classpath="${testng.jar}" />
@@ -1356,4 +1357,8 @@
<delete dir="${tomcat.home}/webapps/${example.name}" />
</target>
+ <target name="initValidateConfiguration" >
+
+ </target>
+
</project>
1.2 +37 -36 jboss-seam/validate.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: validate.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/validate.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- validate.xml 25 Jun 2007 01:02:30 -0000 1.1
+++ validate.xml 25 Jun 2007 13:16:23 -0000 1.2
@@ -1,44 +1,45 @@
<property name="seam.schemaLocations" value="
- http://jboss.com/products/seam/async ${src.schema.dir}/async-${version}.xsd
- http://jboss.com/products/seam/bpm ${src.schema.dir}/bpm-${version}.xsd
- http://jboss.com/products/seam/components ${src.schema.dir}/components-${version}.xsd
- http://jboss.com/products/seam/core ${src.schema.dir}/core-${version}.xsd
- http://jboss.com/products/seam/drools ${src.schema.dir}/drools-${version}.xsd
- http://jboss.com/products/seam/framework ${src.schema.dir}/framework-${version}.xsd
- http://jboss.com/products/seam/international ${src.schema.dir}/international-${version}.xsd
- http://jboss.com/products/seam/jms ${src.schema.dir}/jms-${version}.xsd
- http://jboss.com/products/seam/mail ${src.schema.dir}/mail-${version}.xsd
- http://jboss.com/products/seam/navigation ${src.schema.dir}/navigation-${version}.xsd
- http://jboss.com/products/seam/pages ${src.schema.dir}/pages-${version}.xsd
- http://jboss.com/products/seam/pdf ${src.schema.dir}/pdf-${version}.xsd
- http://jboss.com/products/seam/persistence ${src.schema.dir}/persistence-${version}.xsd
- http://jboss.com/products/seam/remoting ${src.schema.dir}/remoting-${version}.xsd
- http://jboss.com/products/seam/security ${src.schema.dir}/security-${version}.xsd
- http://jboss.com/products/seam/theme ${src.schema.dir}/theme-${version}.xsd
- http://jboss.com/products/seam/transaction ${src.schema.dir}/transaction-${version}.xsd
- http://jboss.com/products/seam/web ${src.schema.dir}/web-${version}.xsd "
+ http://jboss.com/products/seam/async ${src.schema.dir}/async-${schema.version}.xsd
+ http://jboss.com/products/seam/bpm ${src.schema.dir}/bpm-${schema.version}.xsd
+ http://jboss.com/products/seam/components ${src.schema.dir}/components-${schema.version}.xsd
+ http://jboss.com/products/seam/core ${src.schema.dir}/core-${schema.version}.xsd
+ http://jboss.com/products/seam/drools ${src.schema.dir}/drools-${schema.version}.xsd
+ http://jboss.com/products/seam/framework ${src.schema.dir}/framework-${schema.version}.xsd
+ http://jboss.com/products/seam/international ${src.schema.dir}/international-${schema.version}.xsd
+ http://jboss.com/products/seam/jms ${src.schema.dir}/jms-${schema.version}.xsd
+ http://jboss.com/products/seam/mail ${src.schema.dir}/mail-${schema.version}.xsd
+ http://jboss.com/products/seam/navigation ${src.schema.dir}/navigation-${schema.version}.xsd
+ http://jboss.com/products/seam/pageflow ${src.schema.dir}/pageflow-${schema.version}.xsd
+ http://jboss.com/products/seam/pages ${src.schema.dir}/pages-${schema.version}.xsd
+ http://jboss.com/products/seam/pdf ${src.schema.dir}/pdf-${schema.version}.xsd
+ http://jboss.com/products/seam/persistence ${src.schema.dir}/persistence-${schema.version}.xsd
+ http://jboss.com/products/seam/remoting ${src.schema.dir}/remoting-${schema.version}.xsd
+ http://jboss.com/products/seam/security ${src.schema.dir}/security-${schema.version}.xsd
+ http://jboss.com/products/seam/theme ${src.schema.dir}/theme-${schema.version}.xsd
+ http://jboss.com/products/seam/transaction ${src.schema.dir}/transaction-${schema.version}.xsd
+ http://jboss.com/products/seam/web ${src.schema.dir}/web-${schema.version}.xsd "
/>
<taskdef name="xmlvalidate.task" classname="org.apache.tools.ant.taskdefs.optional.XMLValidateTask" classpathref="build.classpath" />
-<fileset id="validate.resources" dir="${basedir}/resources">
- <include name="META-INF/application.xml" />
- <include name="META-INF/ejb-jar.xml" />
- <include name="META-INF/persistence.xml" />
- <include name="META-INF/jboss-app.xml" />
- <include name="META-INF/orm.xml" />
- <include name="WEB-INF/components.xml" />
- <include name="WEB-INF/pages.xml"/>
- <include name="WEB-INF/faces-config.xml" />
- <include name="WEB-INF/web.xml" />
- <include name="WEB-INF/jboss-web.xml" />
- <include name="${example.ds}" />
- <include name="hibernate.cfg.xml" />
- <include name="*.jpdl.xml"/>
- <exclude name=".gpd.*.jpdl.xml"/>
+<fileset id="validate.resources" dir="${validate.resources.dir}">
+ <include name="**/META-INF/application.xml" />
+ <include name="**/META-INF/ejb-jar.xml" />
+ <include name="**/META-INF/persistence.xml" />
+ <include name="**/META-INF/jboss-app.xml" />
+ <include name="**/META-INF/orm.xml" />
+ <include name="**/WEB-INF/components.xml" />
+ <include name="**/WEB-INF/pages.xml"/>
+ <include name="**/WEB-INF/faces-config.xml" />
+ <include name="**/WEB-INF/web.xml" />
+ <include name="**/WEB-INF/jboss-web.xml" />
+ <include name="**/${example.ds}" />
+ <include name="**/hibernate.cfg.xml" />
+ <include name="**/*.jpdl.xml"/>
+ <exclude name="**/.gpd.*.jpdl.xml"/>
</fileset>
-<target name="validate.conf" description="Validate XML Configuration Files">
+<target name="validateConfiguration" depends="initValidateConfiguration" description="Validate XML Configuration Files">
<validateConfiguration>
<fileset refid="validate.resources" />
</validateConfiguration>
@@ -53,10 +54,10 @@
<xmlcatalog>
<dtd
publicId="-//JBoss/Seam Component Configuration DTD 1.3//EN"
- location="${src.schema.dir}/components-${version}.dtd"/>
+ location="${src.schema.dir}/components-${schema.version}.dtd"/>
<dtd
publicId="-//JBoss/Seam Pages Configuration DTD 1.3//EN"
- location="${src.schema.dir}/pages-${version}.dtd"/>
+ location="${src.schema.dir}/pages-${schema.version}.dtd"/>
</xmlcatalog>
</xmlvalidate.task>
</presetdef>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list