vgritsenko 2003/09/04 19:28:25
Modified: . build.properties build.xml contributor.xml
status.xml .cvsignore
Removed: . contributor.properties.sample
Log:
Update contributor.xml to use build.properties
Revision Changes Path
1.2 +21 -7 xml-xindice/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/xml-xindice/build.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.properties 5 Sep 2003 00:42:15 -0000 1.1
+++ build.properties 5 Sep 2003 02:28:25 -0000 1.2
@@ -54,6 +54,11 @@
tomcat.home=${ENVIRONMENT.TOMCAT_HOME}
+# ---- PMD
---------------------------------------------------------------------
+# Location of the pmd jar file. The latest version of PMD can be found at
+# http://pmd.sourceforge.net
+#pmd.jar=/usr/local/java/pmd-1.0rc3/lib/pmd-1.0rc3.jar
+
# ---- System Properties
-------------------------------------------------------
@@ -62,7 +67,7 @@
# you're doing.
# Java packages
-javadoc.pkgs=org.apache.xindice.*
+packages=org.apache.xindice.*
# Project's properties
project.name=xml-xindice
@@ -71,26 +76,35 @@
project.year=1999-2003
# Source directories
+documentation.dir=${basedir}/src/documentation
+config.dir=${basedir}/config
+tools.dir=${basedir}/tools/lib
+bin.dir=bin
root.dir=java
jar.dir=${root.dir}/lib
src.dir=${root.dir}/src
-config.dir=${basedir}/config
-test.dir=${root.dir}/tests
test.src.dir=${root.dir}/tests/src
-tools.dir=${basedir}/tools/lib
+scratchpad.src.dir=${root.dir}/scratchpad/src
+scratchpad.jar.dir=${root.dir}/scratchpad/lib
# Destination directories
build.dir=build
src.build.dir=${build.dir}/classes
test.build.dir=${build.dir}/classes-tests
-test.report.dir=${build.dir}/test-reports
-reports.dir=${build.dir}/reports
+test.result.dir=${build.dir}/test-results
+test.report.dir=${build.dir}/test-report
api.dir=${build.dir}/api
+eclipse.temp=${build.dir}/temp
dist.dir=dist
+# Examples directories
+examples.dir=${root.dir}/examples
+
# Guide directories
guide.root.dir=${root.dir}/examples/guide
guide.src.dir=${guide.root.dir}/src
guide.build.dir=${build.dir}/classes-guide
+
+# Release directories
webapp.name=xindice
1.60 +24 -12 xml-xindice/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-xindice/build.xml,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- build.xml 5 Sep 2003 00:42:15 -0000 1.59
+++ build.xml 5 Sep 2003 02:28:25 -0000 1.60
@@ -123,7 +123,7 @@
<!-- ===================================================================
-->
<target name="test-build" depends="src-build">
<mkdir dir="${test.build.dir}"/>
- <mkdir dir="${test.report.dir}"/>
+ <mkdir dir="${test.result.dir}"/>
<javac srcdir="${test.src.dir}" destdir="${test.build.dir}"
debug="${compile.debug}" optimize="${compile.optimize}"
nowarn="${compile.nowarn}" deprecation="${compile.deprecation}"
verbose="${compile.verbose}">
<classpath>
<path refid="project.class.path"/>
@@ -146,7 +146,7 @@
<formatter type="xml"/>
<test name="org.apache.xindice.UnitTests"
- outfile="${test.report.dir}/org.apache.xindice.UnitTests"/>
+ outfile="${test.result.dir}/org.apache.xindice.UnitTests"/>
<classpath>
<path refid="project.class.path"/>
<pathelement location="${test.build.dir}"/>
@@ -166,7 +166,7 @@
<formatter type="xml"/>
<test
name="org.apache.xindice.client.xmldb.resources.BinaryResourceTest"
-
outfile="${test.report.dir}/org.apache.xindice.client.xmldb.resources.BinaryResourceTest"/>
+
outfile="${test.result.dir}/org.apache.xindice.client.xmldb.resources.BinaryResourceTest"/>
<classpath>
<path refid="project.class.path"/>
<pathelement location="${test.build.dir}"/>
@@ -186,7 +186,7 @@
<formatter type="xml"/>
<test name="org.apache.xindice.IntegrationEmbedTests"
-
outfile="${test.report.dir}/org.apache.xindice.IntegrationEmbedTests"/>
+
outfile="${test.result.dir}/org.apache.xindice.IntegrationEmbedTests"/>
<classpath>
<path refid="project.class.path"/>
<pathelement location="${test.build.dir}"/>
@@ -210,7 +210,8 @@
<formatter type="plain" usefile="no"/>
<formatter type="xml" />
- <test name="org.apache.xindice.IntegrationXmlRpcTests"
outfile="${test.report.dir}/org.apache.xindice.IntegrationXmlRpcTests"/>
+ <test name="org.apache.xindice.IntegrationXmlRpcTests"
+
outfile="${test.result.dir}/org.apache.xindice.IntegrationXmlRpcTests"/>
<classpath>
<path refid="project.class.path"/>
<pathelement location="${test.build.dir}"/>
@@ -229,7 +230,8 @@
<formatter type="plain" usefile="no"/>
<formatter type="xml"/>
- <test name="org.apache.xindice.IntegrationManagedTests"
outfile="${test.report.dir}/org.apache.xindice.IntegrationManagedTests.xml"/>
+ <test name="org.apache.xindice.IntegrationManagedTests"
+
outfile="${test.result.dir}/org.apache.xindice.IntegrationManagedTests.xml"/>
<classpath>
<path refid="project.class.path"/>
<pathelement location="${test.build.dir}"/>
@@ -260,12 +262,12 @@
</target>
<target name="test-report" depends="init">
- <mkdir dir="${reports.dir}"/>
- <junitreport todir="${test.report.dir}">
- <fileset dir="${test.report.dir}">
+ <mkdir dir="${test.report.dir}"/>
+ <junitreport todir="${test.result.dir}">
+ <fileset dir="${test.result.dir}">
<include name="*.xml"/>
</fileset>
- <report format="frames" todir="${reports.dir}/test"/>
+ <report format="frames" todir="${test.report.dir}"/>
</junitreport>
</target>
@@ -348,7 +350,17 @@
<target name="javadoc" depends="init" description="Creates Javadoc API
documentation">
<delete dir="${api.dir}"/>
<mkdir dir="${api.dir}"/>
- <javadoc packagenames="org.apache.xindice.*" destdir="${api.dir}"
overview="${src.dir}/overview.html" author="true" version="true"
protected="true" use="false" windowtitle="Xindice API v${project.version}"
doctitle="Xindice API, version ${project.version}<br>API specification"
header="<b>Xindice API<br>version ${project.version}</b>"
bottom="Copyright (c) ${project.year} The Apache Software Foundation. All
Rights Reserved.">
+ <javadoc packagenames="${packages}"
+ destdir="${api.dir}"
+ overview="${src.dir}/overview.html"
+ author="true"
+ version="true"
+ protected="true"
+ use="false"
+ windowtitle="Xindice API v${project.version}"
+ doctitle="Xindice API, version
${project.version}<br>API specification"
+ header="<b>Xindice API<br>version
${project.version}</b>"
+ bottom="Copyright (c) ${project.year} The Apache Software
Foundation. All Rights Reserved.">
<group title="Core packages"
packages="org.apache.xindice.core*:org.apache.xindice.xml*:org.apache.xindice.util"/>
<group title="Server packages"
packages="org.apache.xindice.server*"/>
<group title="Client packages"
packages="org.apache.xindice.client*"/>
1.9 +96 -126 xml-xindice/contributor.xml
Index: contributor.xml
===================================================================
RCS file: /home/cvs/xml-xindice/contributor.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- contributor.xml 1 Aug 2003 18:46:47 -0000 1.8
+++ contributor.xml 5 Sep 2003 02:28:25 -0000 1.9
@@ -14,51 +14,22 @@
- Author: Vladimir R. Bossicard ([EMAIL PROTECTED])
-->
-<project name="xindice-contributor" default="main" basedir=".">
+<project name="xindice-contributor" default="all" basedir=".">
- <property file="contributor.properties" />
+ <property file="local.build.properties" />
+ <property file="build.properties" />
- <!-- Project's properties -->
- <property name="project.name" value="xml-xindice"/>
- <property name="project.filename" value="xindice"/>
- <property name="project.version" value="1.1b2"/>
- <property name="project.year" value="1999-2002"/>
-
- <property name="webapp.name" value="Xindice"/>
-
- <!-- source directories -->
- <property name="root.dir" value="java"/>
- <property name="jar.dir" value="${root.dir}/lib"/>
- <property name="tools.dir" value="tools"/>
- <property name="src.dir" value="${root.dir}/src"/>
- <property name="scratchpad.src.dir" value="${root.dir}/scratchpad/src"/>
- <property name="scratchpad.jar.dir" value="${root.dir}/scratchpad/lib"/>
- <property name="test.src.dir" value="${root.dir}/tests/src"/>
- <property name="examples.dir" value="${root.dir}/examples"/>
- <property name="bin.dir" value="bin"/>
- <property name="config.dir" value="config"/>
- <property name="documentation.dir" value="src/documentation"/>
-
- <!-- destination directories -->
- <property name="build.dir" value="build"/>
- <property name="build.temp" value="${build.dir}/temp"/>
- <property name="src.build.dir" value="${build.dir}/classes"/>
- <property name="test.build.dir" value="${build.dir}/classes-tests"/>
- <property name="examples.build.dir"
value="${build.dir}/classes-examples"/>
- <property name="api.dir" value="${build.dir}/api"/>
- <property name="dist.dir" value="dist"/>
-
- <target name="main" depends="forrest, publish"/>
+ <target name="all" depends="forrest, publish"/>
<target name="forrest">
- <exec dir="." executable="forrest" os="Linux"/>
+ <exec dir="." executable="forrest" os="Linux"/>
<exec dir="." executable="forrest" os="Mac OS X"/>
- <exec dir="." executable="forrest.bat" os="Windows 2000"/>
+ <exec dir="." executable="forrest.bat" os="Windowzs"/>
</target>
<target name="publish">
<!-- creates the jar zip release -->
- <zip destfile="${dist.dir}/xindice-jar-${project.version}.zip">
+ <zip destfile="${dist.dir}/xindice-${project.version}-jar.zip">
<zipfileset dir="." includes="LICENSE,README"
prefix="xindice-${project.version}"/>
<zipfileset dir="${dist.dir}"
includes="xindice-${project.version}.jar"
prefix="xindice-${project.version}/${dist.dir}"/>
<zipfileset dir="${bin.dir}" includes="lcp*,xindice*"
excludes="xindice-war*" prefix="xindice-${project.version}/${bin.dir}"/>
@@ -68,7 +39,7 @@
<zipfileset dir="${api.dir}"
prefix="xindice-${project.version}/docs/api"/>
</zip>
- <tar destfile="${build.dir}/xindice-jar-${project.version}.tar">
+ <tar destfile="${build.dir}/xindice-${project.version}-jar.tar">
<tarfileset dir="."
prefix="xindice-${project.version}"
preserveLeadingSlashes="true">
@@ -108,11 +79,11 @@
</tarfileset>
</tar>
- <gzip src="${build.dir}/xindice-jar-${project.version}.tar"
- zipfile="${dist.dir}/xindice-jar-${project.version}.tar.gz"/>
+ <gzip src="${build.dir}/xindice-${project.version}-jar.tar"
+ zipfile="${dist.dir}/xindice-${project.version}-jar.tar.gz"/>
<!-- creates the war zip release -->
- <zip destfile="${dist.dir}/xindice-war-${project.version}.zip">
+ <zip destfile="${dist.dir}/xindice-${project.version}-war.zip">
<zipfileset dir="." includes="LICENSE,README" prefix=""/>
<zipfileset dir="${dist.dir}"
includes="xindice-${project.version}.xml,xindice-${project.version}.war"
prefix=""/>
@@ -120,7 +91,7 @@
<zipfileset dir="${api.dir}" prefix="docs/api"/>
</zip>
- <tar destfile="${build.dir}/xindice-war-${project.version}.tar">
+ <tar destfile="${build.dir}/xindice-${project.version}-war.tar">
<tarfileset dir="."
prefix="xindice-${project.version}"
preserveLeadingSlashes="true">
@@ -145,11 +116,11 @@
</tarfileset>
</tar>
- <gzip src="${build.dir}/xindice-war-${project.version}.tar"
- zipfile="${dist.dir}/xindice-war-${project.version}.tar.gz"/>
+ <gzip src="${build.dir}/xindice-${project.version}-war.tar"
+ zipfile="${dist.dir}/xindice-${project.version}-war.tar.gz"/>
<!-- creates the src zip release -->
- <zip destfile="${dist.dir}/xindice-src-${project.version}.zip">
+ <zip destfile="${dist.dir}/xindice-${project.version}-src.zip">
<zipfileset dir="." includes="LICENSE,README,build.*"
prefix="xindice-${project.version}"/>
<zipfileset dir="${bin.dir}" excludes="CVS*"
prefix="xindice-${project.version}/${bin.dir}"/>
<zipfileset dir="${jar.dir}" excludes="CVS*"
prefix="xindice-${project.version}/${jar.dir}"/>
@@ -161,7 +132,7 @@
<zipfileset dir="${documentation.dir}" excludes="CVS*"
prefix="xindice-${project.version}/${documentation.dir}"/>
</zip>
- <tar destfile="${build.dir}/xindice-src-${project.version}.tar">
+ <tar destfile="${build.dir}/xindice-${project.version}-src.tar">
<tarfileset dir="."
prefix="xindice-${project.version}"
preserveLeadingSlashes="true">
@@ -214,8 +185,8 @@
</tarfileset>
</tar>
- <gzip src="${build.dir}/xindice-src-${project.version}.tar"
- zipfile="${dist.dir}/xindice-src-${project.version}.tar.gz"/>
+ <gzip src="${build.dir}/xindice-${project.version}-src.tar"
+ zipfile="${dist.dir}/xindice-${project.version}-src.tar.gz"/>
</target>
@@ -261,83 +232,82 @@
</pmd>
</target>
- <!-- Build the Eclipse projects files -->
- <target name="eclipse-project" description="Generate the Eclipse project
files">
- <property name="eclipse" value="tools/eclipse"/>
-
- <!-- prepare the various paths that will form the project -->
- <path id="srcs">
- <!-- main source dir -->
- <pathelement path="${src.dir}"/>
- <!-- scratchpad source dir -->
- <pathelement path="${scratchpad.src.dir}"/>
- <!-- unit tests dir -->
- <pathelement path="${test.src.dir}"/>
- <!-- examples (guide) dir -->
- <pathelement path="${examples.dir}/guide/src"/>
- <!-- examples (Addressbook) dir -->
- <pathelement path="${examples.dir}/Addressbook/src/java"/>
- </path>
-
- <path id="libs">
- <!-- main libs -->
- <fileset dir="${jar.dir}">
- <include name="*.jar"/>
- </fileset>
- <!-- tools libs -->
- <fileset dir="${tools.dir}/lib">
- <include name="*.jar"/>
- </fileset>
- <!-- scratchpad libs -->
- <fileset dir="${scratchpad.jar.dir}">
- <include name="*.jar"/>
- </fileset>
- </path>
-
- <!-- convert paths to properties -->
- <property name="srcs" refid="srcs"/>
- <property name="libs" refid="libs"/>
-
- <!-- expand properties in the template file -->
- <copy file="${eclipse}/classpath-tmpl.xml"
- tofile="${build.temp}/classpath-temp.xml"
- filtering="yes"
- overwrite="yes">
- <filterset>
- <filter token="SRC_DIRS" value="${srcs}"/>
- <filter token="LIBS" value="${libs}"/>
- </filterset>
- </copy>
-
- <!-- split the path in 'item' XML elements -->
- <replace file="${build.temp}/classpath-temp.xml"
- token="${path.separator}" value="</item>

<item>"/>
- <!-- relativize file names by removing the current directory -->
- <replace file="${build.temp}/classpath-temp.xml"
- token="${user}${file.separator}" value=""/>
- <!-- and in case that fails, remove the base directory -->
- <replace file="${build.temp}/classpath-temp.xml"
- token="${basedir}${file.separator}" value=""/>
-
- <!-- replace platform-dependent path separator by '/' -->
- <replace file="${build.temp}/classpath-temp.xml"
- token="${file.separator}" value="/"/>
-
- <!-- now build the .classpath file -->
- <xslt in="${build.temp}/classpath-temp.xml" out="${basedir}/.classpath"
- processor="trax"
- style="${eclipse}/make-classpath.xsl"/>
-
- <!-- copy the project file (expand version) -->
- <copy file="${eclipse}/project"
- tofile="${basedir}/.project"
- overwrite="yes">
- <filterset>
- <filter token="VERSION" value="${project.version}"/>
- </filterset>
- </copy>
-
- <delete file="${build.temp}/classpath-temp.xml"/>
- </target>
+ <!-- Build the Eclipse projects files -->
+ <target name="eclipse-project" description="Generate the Eclipse project
files">
+ <property name="eclipse" value="tools/eclipse"/>
+
+ <!-- prepare the various paths that will form the project -->
+ <path id="srcs">
+ <!-- main source dir -->
+ <pathelement path="${src.dir}"/>
+ <!-- scratchpad source dir -->
+ <pathelement path="${scratchpad.src.dir}"/>
+ <!-- unit tests dir -->
+ <pathelement path="${test.src.dir}"/>
+ <!-- examples (guide) dir -->
+ <pathelement path="${examples.dir}/guide/src"/>
+ <!-- examples (Addressbook) dir -->
+ <pathelement path="${examples.dir}/Addressbook/src/java"/>
+ </path>
+
+ <path id="libs">
+ <!-- main libs -->
+ <fileset dir="${jar.dir}">
+ <include name="*.jar"/>
+ </fileset>
+ <!-- tools libs -->
+ <fileset dir="${tools.dir}/lib">
+ <include name="*.jar"/>
+ </fileset>
+ <!-- scratchpad libs -->
+ <fileset dir="${scratchpad.jar.dir}">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
+ <!-- convert paths to properties -->
+ <property name="srcs" refid="srcs"/>
+ <property name="libs" refid="libs"/>
+
+ <!-- expand properties in the template file -->
+ <copy file="${eclipse}/classpath-tmpl.xml"
+ tofile="${eclipse.temp}/classpath-temp.xml"
+ filtering="yes"
+ overwrite="yes">
+ <filterset>
+ <filter token="SRC_DIRS" value="${srcs}"/>
+ <filter token="LIBS" value="${libs}"/>
+ </filterset>
+ </copy>
+
+ <!-- split the path in 'item' XML elements -->
+ <replace file="${eclipse.temp}/classpath-temp.xml"
+ token="${path.separator}" value="</item>

<item>"/>
+ <!-- relativize file names by removing the current directory -->
+ <replace file="${eclipse.temp}/classpath-temp.xml"
+ token="${user}${file.separator}" value=""/>
+ <!-- and in case that fails, remove the base directory -->
+ <replace file="${eclipse.temp}/classpath-temp.xml"
+ token="${basedir}${file.separator}" value=""/>
+
+ <!-- replace platform-dependent path separator by '/' -->
+ <replace file="${eclipse.temp}/classpath-temp.xml"
+ token="${file.separator}" value="/"/>
+
+ <!-- now build the .classpath file -->
+ <xslt in="${eclipse.temp}/classpath-temp.xml"
out="${basedir}/.classpath"
+ processor="trax"
+ style="${eclipse}/make-classpath.xsl"/>
+
+ <!-- copy the project file (expand version) -->
+ <copy file="${eclipse}/project"
+ tofile="${basedir}/.project"
+ overwrite="yes">
+ <filterset>
+ <filter token="VERSION" value="${project.version}"/>
+ </filterset>
+ </copy>
+ <delete file="${eclipse.temp}/classpath-temp.xml"/>
+ </target>
</project>
1.12 +1 -1 xml-xindice/status.xml
Index: status.xml
===================================================================
RCS file: /home/cvs/xml-xindice/status.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- status.xml 5 Sep 2003 00:42:15 -0000 1.11
+++ status.xml 5 Sep 2003 02:28:25 -0000 1.12
@@ -61,7 +61,7 @@
<!-- Add new releases here -->
<release version="1.1-dev" date="September 4 2003">
<action dev="VG" type="add">
- Updated build script: all build properties extracted into
build.properties
+ Updated build scripts: all build properties extracted into
build.properties
file. You can override them in local.build.properties file.
</action>
<action dev="VG" type="add">
1.9 +0 -1 xml-xindice/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/xml-xindice/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 5 Sep 2003 00:49:15 -0000 1.8
+++ .cvsignore 5 Sep 2003 02:28:25 -0000 1.9
@@ -1,6 +1,5 @@
build
dist
-contributor.properties
local.build.properties
binary.patch.txt
xerces-limit.patch.txt
