[jboss-cvs] jboss-seam/build ...
Peter Muir
peter at bleepbleep.org.uk
Mon Sep 24 05:40:12 EDT 2007
User: pmuir
Date: 07/09/24 05:40:12
Modified: build build.properties common.build.xml build.xml
Added: build sample.build.properties validate.xml
default.build.properties
Log:
Refactor out default.build.properties
Revision Changes Path
1.2 +1 -1 jboss-seam/build/build.properties
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.properties
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/build/build.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- build.properties 21 Sep 2007 20:29:21 -0000 1.1
+++ build.properties 24 Sep 2007 09:40:12 -0000 1.2
@@ -1 +1 @@
-offline.repository=/Users/pmuir/workspace/maven2.repository.jboss.org
\ No newline at end of file
+offline.repository /Users/pmuir/workspace/maven2.repository.jboss.org
\ No newline at end of file
1.5 +23 -7 jboss-seam/build/common.build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: common.build.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/build/common.build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- common.build.xml 22 Sep 2007 20:57:10 -0000 1.4
+++ common.build.xml 24 Sep 2007 09:40:12 -0000 1.5
@@ -10,10 +10,23 @@
-->
<project basedir="." xmlns:artifact="urn:maven-artifact-ant">
+ <tstamp />
+
+ <property name="seam.dir" value="../" />
+
+ <property name="build.dir" value="${seam.dir}/build" />
+ <property name="tmp.dir" value="${seam.dir}/classes" />
+ <property name="lib.dir" value="${seam.dir}/lib" />
+
+ <import file="${build.dir}/utilities.build.xml" />
+
+ <path id="maven-ant-tasks.classpath" path="${build.dir}/lib/maven-ant-tasks.jar" />
+ <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.classpath" />
+
<!-- If build.properties doesn't exist, create it by copying build.properties.sample -->
<condition property="copy.default.properties">
<and>
- <available file="${seam.dir}/build.properties.sample" />
+ <available file="${build.dir}/sample.build.properties" />
<not>
<available file="${seam.dir}/build.properties" />
</not>
@@ -21,15 +34,18 @@
</condition>
<copy todir="${seam.dir}">
- <fileset dir="${seam.dir}">
- <include name="build.properties.sample" if="copy.default.properties" />
+ <fileset dir="${build.dir}">
+ <include name="sample.build.properties" if="copy.default.properties" />
</fileset>
- <mapper type="glob" from="build.properties.sample" to="build.properties" />
+ <mapper type="glob" from="sample.build.properties" to="build.properties" />
</copy>
- <!-- Give user a chance to override without editing this file or typing -D -->
+ <!-- User set properties, order of this and default properties is important! -->
<property file="${seam.dir}/build.properties" />
+ <!-- Load default build properties -->
+ <property file="${build.dir}/default.build.properties" />
+
<!-- Set the version if not set in build.properties -->
<condition property="version" value="${DSTAMP}">
<not>
1.14 +3 -9 jboss-seam/build/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/build/build.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- build.xml 22 Sep 2007 13:41:43 -0000 1.13
+++ build.xml 24 Sep 2007 09:40:12 -0000 1.14
@@ -1,16 +1,10 @@
<?xml version="1.0"?>
<project name="Seam2 Build Utilities" basedir="." default="help" xmlns:artifact="urn:maven-artifact-ant">
- <path id="maven-ant-tasks.classpath" path="lib/maven-ant-tasks.jar" />
- <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.classpath" />
-
- <property name="seam.dir" value="${basedir}/../" />
- <property name="tmp.dir" value="${seam.dir}/classes" />
- <property name="build.dir" value="${basedir}" />
- <property file="${seam.dir}/build.properties" />
+ <property file="default.build.properties" />
<property file="build.properties" />
- <import file="utilities.build.xml" />
+ <property name="seam.dir" value="${basedir}/../" />
<import file="common.build.xml" />
<artifact:remoteRepository id="snapshots.jboss.org" url="dav:https://snapshots.jboss.org/maven2" />
1.1 date: 2007/09/24 09:40:12; author: pmuir; state: Exp;jboss-seam/build/sample.build.properties
Index: sample.build.properties
===================================================================
# Use this properties file to set system specific properties
# ----------------------------------------------------------
#
# Location of JBoss AS and Tomcat
# -------------------------------
#jboss.home /Applications/jboss-4.2.1.GA # Default
#tomcat.home /Applications/apache-tomcat-6.0 # Default
#jboss.home C:\\jboss-4.2.1.GA
#tomcat.home C:\\Tomcat-6.0
#
# Misc Settings
# -------------
#validate.xml true # Enabled validation of example XML descriptors
#dist.dir ../jboss-seam-dist # Directory in which to put build distribution, defaults to ../jboss-seam-${version}.${patchlevel}
1.1 date: 2007/09/24 09:40:12; author: pmuir; state: Exp;jboss-seam/build/validate.xml
Index: validate.xml
===================================================================
<?xml version="1.0"?>
<project basedir=".">
<property name="seam.dir" value="${basedir}" />
<property name="seam.schemaLocations" value="
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">
<classpath>
<fileset dir="${seam.dir}/lib" />
</classpath>
</taskdef>
<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="validateConfiguration" description="Validate XML Configuration Files">
<validateConfiguration>
<fileset refid="validate.resources" />
</validateConfiguration>
</target>
<presetdef name="validateConfiguration" >
<xmlvalidate.task classname="org.apache.xerces.jaxp.SAXParserImpl$JAXPSAXParser">
<attribute name="http://xml.org/sax/features/validation" value="true" />
<attribute name="http://apache.org/xml/features/validation/schema" value="true" />
<attribute name="http://xml.org/sax/features/namespaces" value="true" />
<property name="http://apache.org/xml/properties/schema/external-schemaLocation" value="${seam.schemaLocations}" />
<xmlcatalog>
<dtd publicId="-//JBoss/Seam Component Configuration DTD 2.0//EN" location="${src.schema.dir}/components-${schema.version}.dtd" />
<dtd publicId="-//JBoss/Seam Pages Configuration DTD 2.0//EN" location="${src.schema.dir}/pages-${schema.version}.dtd" />
</xmlcatalog>
<classpath>
<fileset dir="${seam.dir}/lib" />
</classpath>
</xmlvalidate.task>
</presetdef>
</project>
1.1 date: 2007/09/24 09:40:12; author: pmuir; state: Exp;jboss-seam/build/default.build.properties
Index: default.build.properties
===================================================================
# Use this properties file to set default properties for Seam.
# They can be overridden in ../build.properties
#
# Seam Version
# ------------
version = 2.0
patchlevel = 0.CR1
#
# Other program locations
# -----------------------
jboss.home /Applications/jboss-4.2.1.GA
tomcat.home /Applications/apache-tomcat-6.0
More information about the jboss-cvs-commits
mailing list