Add spring-build 2.5.2

spring-build was previously included via an svn:external. Adding directly to the source tree under Git to avoid the need for a git submodule. In order to build from any earlier commit, it is recommended to export spring-build or symlink an existing copy into the root of the spring-framework project and then build normally. $ svn export https://src.springsource.org/svn/spring-build/tags/project-build-2.5.2 spring-build
spring-projects · Dec 19, 2011 · 2882ae2 · 2882ae2
1 parent 4a7b96c
commit 2882ae2
Show file tree

Hide file tree

Showing 85 changed files with 5,181 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,12 @@
+.springBeans
+.DS_Store
 target
 integration-repo
 ivy-cache
-spring-build
 jmx.log
-.springBeans
-.DS_Store
+jxl.log
+jmx.log
+org.springframework.jdbc/derby.log
+org.springframework.spring-parent/.classpath
+org.springframework.spring-parent/.project
+org.springframework.test/test-output/
diff --git a/spring-build/aspect/artifact.xml b/spring-build/aspect/artifact.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Copyright 2010 SpringSource
+   
+   Licensed 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.
+-->
+<project name="artifact-aspect" xmlns:ivy="antlib:org.apache.ivy.ant">
+
+	<import file="common.xml"/>
+	<import file="../common/artifact.xml"/>
+
+	<target name="jar" depends="ivy.init, resolve.aspects, artifact-common.jar"
+			description="Creates a JAR file containing the output of a compilation of the source tree."/>
+
+<!-- Other targets -->
+	<target name="compile.init" depends="ivy.init">
+		<ivy:cachepath resolveId="ajc.classpath" pathid="ajc.classpath" organisation="org.aspectj"
+				module="com.springsource.org.aspectj.tools" revision="${org.aspectj.tools.version}" conf="runtime"
+				type="jar" inline="true" log="download-only"/>
+		<taskdef resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties" classpathref="ajc.classpath"/>
+	</target>
+
+</project>
diff --git a/spring-build/aspect/common.xml b/spring-build/aspect/common.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Copyright 2010 SpringSource
+   
+   Licensed 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.
+-->
+<project name="common-aspect">
+
+	<import file="../common/common.xml"/>
+
+<!-- Macros -->
+	<macrodef name="do-compile">
+		<attribute name="classpath.id"/>
+		<attribute name="input.dir"/>
+		<attribute name="output.dir"/>
+		<attribute name="resources.dir"/>
+		<sequential>
+			<iajc sourceroots="@{input.dir}" destDir="@{output.dir}" classpathRef="@{classpath.id}" source="${source.version}"
+					debug="${compile.debug}" debugLevel="${compile.debug.level}" checkRuntimeVersion="false"
+					aspectPathRef="aspects.classpath" X="${aspectj.x}"/>
+			<copy todir="@{output.dir}">
+				<fileset dir="@{input.dir}" erroronmissingdir="false">
+					<exclude name="**/*.aj"/>
+					<exclude name="**/*.java"/>
+					<exclude name="*.aj"/>
+					<exclude name="*.java"/>
+				</fileset>
+			</copy>
+			<copy todir="@{output.dir}">
+				<fileset dir="@{resources.dir}" erroronmissingdir="false"/>
+			</copy>
+		</sequential>
+	</macrodef>
+
+</project>
diff --git a/spring-build/aspect/default.xml b/spring-build/aspect/default.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Copyright 2010 SpringSource
+   
+   Licensed 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.
+-->
+<project name="default-aspect">
+
+	<import file="common.xml"/>
+	<import file="artifact.xml"/>
+	<import file="quality.xml"/>
+	<import file="package.xml"/>
+	<import file="publish.xml"/>
+
+</project>
diff --git a/spring-build/aspect/package.xml b/spring-build/aspect/package.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Copyright 2010 SpringSource
+   
+   Licensed 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.
+-->
+<project name="package-aspect">
+
+	<import file="common.xml"/>
+	<import file="../common/package.xml"/>
+
+</project>
diff --git a/spring-build/aspect/publish.xml b/spring-build/aspect/publish.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Copyright 2010 SpringSource
+   
+   Licensed 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.
+-->
+<project name="publish-aspect">
+
+	<import file="common.xml"/>
+	<import file="../common/publish.xml"/>
+
+</project>
diff --git a/spring-build/aspect/quality.xml b/spring-build/aspect/quality.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Copyright 2010 SpringSource
+   
+   Licensed 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.
+-->
+<project name="quality-aspect" xmlns:ivy="antlib:org.apache.ivy.ant">
+
+	<import file="common.xml"/>
+	<import file="../common/quality.xml"/>
+
+	<target name="test.do" depends="ivy.init, resolve.test, resolve.aspects, compile.init, test.init" if="test.exists">
+		<path id="test.compile.classpath">
+			<pathelement location="${jar.output.file}"/>
+			<path refid="compile.classpath"/>
+			<path refid="test.classpath"/>
+		</path>
+		<path id="test.aspect.path">
+			<pathelement location="${jar.output.file}"/>
+			<path refid="aspects.classpath"/>
+		</path>
+		<test-compile classpath.id="test.compile.classpath" input.dir="${test.java.dir}" output.dir="${test.output.dir}"
+				resources.dir="${test.resources.dir}"/>
+		<iajc inPath="${test.output.dir}" aspectPathRef="test.aspect.path" classpathRef="test.compile.classpath"
+				destDir="${test.output.dir}" source="${source.version}" checkRuntimeVersion="false" X="${aspectj.x}"/>
+
+		<path id="test.run.classpath">
+			<pathelement location="${jar.output.file}"/>
+			<pathelement location="${test.output.dir}"/>
+			<path refid="compile.classpath"/>
+			<path refid="test.classpath"/>
+			<path refid="runtime.classpath"/>
+		</path>
+		<test-run classpath.id="test.run.classpath"/>
+	</target>
+
+	<target name="clover.instrument" depends="ivy.init, resolve.aspects, resolve.test, compile.init, clover.init">
+		<instrument input.dir="${main.java.dir}" output.dir="${main.clover.dir}"/>
+		<path id="clover.compile.classpath">
+			<path refid="clover.classpath"/>
+			<path refid="compile.classpath"/>
+		</path>
+		<compile classpath.id="clover.compile.classpath" input.dir="${main.clover.dir}" output.dir="${main.output.dir}"
+				resources.dir="${main.resources.dir}"/>
+
+		<instrument input.dir="${test.java.dir}" output.dir="${test.clover.dir}"/>
+		<path id="test.compile.classpath">
+			<pathelement location="${main.output.dir}"/>
+			<path refid="clover.classpath"/>
+			<path refid="compile.classpath"/>
+			<path refid="test.classpath"/>
+		</path>
+		<path id="test.aspect.path">
+			<pathelement location="${main.output.dir}"/>
+			<path refid="aspects.classpath"/>
+		</path>
+		<test-compile classpath.id="test.compile.classpath" input.dir="${test.clover.dir}" output.dir="${test.output.dir}"
+				resources.dir="${test.resources.dir}"/>
+		<iajc inPath="${test.output.dir}" aspectPathRef="test.aspect.path" classpathRef="test.compile.classpath"
+				destDir="${test.output.dir}" source="${source.version}" checkRuntimeVersion="false" X="${aspectj.x}"/>
+		<delete dir="${clover.staging.dir}" quiet="true"/>
+	</target>
+
+</project>
diff --git a/spring-build/common/artifact.xml b/spring-build/common/artifact.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Copyright 2010 SpringSource
+   
+   Licensed 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.
+-->
+<project name="artifact-common" xmlns:ivy="antlib:org.apache.ivy.ant"
+		xmlns:bundlor="antlib:com.springsource.bundlor.ant">
+
+<!-- Main targets -->
+	<target name="javadoc-all" depends="ivy.init, resolve.compile, src.init" if="src.exists"
+			description="Creates javadoc documentation for all classes.">
+		<java-doc input.dir="${main.java.dir}" output.dir="${javadoc-all.output.dir}" classpath.id="compile.classpath"
+				access="private"/>
+	</target>
+
+	<target name="javadoc-api" depends="ivy.init, resolve.compile, src.init" if="src.exists"
+			description="Creates javadoc documentation for all classes.">
+		<java-doc input.dir="${main.java.dir}" output.dir="${javadoc-api.output.dir}" classpath.id="compile.classpath"
+				access="protected" exclude.package.names="${javadoc.exclude.package.names}"/>
+	</target>
+
+	<target name="jar" depends="ivy.init, resolve.compile, compile.init, jar.init"
+			description="Creates a JAR file containing the output of a compilation of the source tree.">
+		<delete quiet="true" file="${ivy.output.file}"/>
+		<mkdir dir="${ivy.output.dir}"/>
+		<delete quiet="true" file="${jar.output.file}"/>
+		<mkdir dir="${jar.output.dir}"/>
+		<delete quiet="true" file="${source-jar.output.file}"/>
+		<mkdir dir="${source-jar.output.dir}"/>
+
+		<compile classpath.id="compile.classpath" input.dir="${main.java.dir}" output.dir="${main.output.dir}"
+				resources.dir="${main.resources.dir}"/>
+		<ivy:retrieve resolveId="additional.classpath" conf="additional" type="jar" transitive="false"
+				pattern="${main.output.dir}/[artifact]-[revision].[ext]" log="download-only"/>
+		<antcall target="bundlor"/>
+		<jar destfile="${jar.output.file}" basedir="${main.output.dir}" index="true" filesetmanifest="merge">
+			<manifest>
+				<attribute name="Bundle-ManifestVersion" value="2"/>
+				<attribute name="Bundle-Version" value="${bundle.version}"/>
+				<attribute name="Bundle-Creator" value="${user.name}"/>
+				<attribute name="Implementation-Title" value="${implementation.title}"/>
+				<attribute name="Implementation-Version" value="${implementation.version}"/>
+			</manifest>
+		</jar>
+		<jar destfile="${source-jar.output.file}" basedir="${main.java.dir}" index="true"/>
+		<ivy:publish resolver="integration" pubdate="${timestamp}" status="${release.type}">
+			<artifacts pattern="${ivy.output.dir}/[artifact].[ext]"/>
+			<artifacts pattern="${jar.output.dir}/[artifact].[ext]"/>
+			<artifacts pattern="${source-jar.output.dir}/[artifact].[ext]"/>
+			<artifacts pattern="${license.dir}/[artifact].[ext]"/>
+		</ivy:publish>
+	</target>
+
+<!-- Other targets -->
+	<propertyset id="bundlor.properties"/>
+
+	<target name="compile.init" depends="ivy.init"/>
+
+	<target name="jar.init">
+		<fail message="The 'integration.repo.dir' property must be set on this project.">
+			<condition>
+				<not>
+					<isset property="integration.repo.dir"/>
+				</not>
+			</condition>
+		</fail>
+		<fail message="The 'ivy.cache.dir' property must be set on this project.">
+			<condition>
+				<not>
+					<isset property="ivy.cache.dir"/>
+				</not>
+			</condition>
+		</fail>
+		<fail message="The 'version' property must be set on this project.">
+			<condition>
+				<not>
+					<isset property="version"/>
+				</not>
+			</condition>
+		</fail>
+	</target>
+
+	<target name="bundlor" depends="bundlor.init" unless="disable.bundlor">
+		<bundlor:bundlor inputPath="${main.output.dir}" outputPath="${main.output.dir}"
+				bundleVersion="${bundle.version}" manifestTemplatePath="${manifest.template.file}"
+				failOnWarnings="${fail.on.warnings}">
+			<propertyset refid="bundlor.properties"/>
+			<propertyset>
+				<propertyref builtin="all"/>
+			</propertyset>
+		</bundlor:bundlor>
+	</target>
+
+	<target name="bundlor.init" depends="ivy.init" unless="disable.bundlor">
+		<ivy:cachepath resolveId="bundlor.classpath" pathid="bundlor.classpath" organisation="com.springsource.bundlor"
+				module="com.springsource.bundlor.ant" revision="${bundlor.ant.version}" conf="ant" inline="true"
+				type="jar" log="download-only"/>
+		<taskdef resource="com/springsource/bundlor/ant/antlib.xml" uri="antlib:com.springsource.bundlor.ant"
+				classpathref="bundlor.classpath"/>
+	</target>
+
+	<target name="javadoc.prep" depends="src.init" if="src.exists">
+		<mkdir dir="${javadoc.prep.dir}"/>
+		<copy todir="${javadoc.prep.dir}">
+			<fileset dir="${main.java.dir}" erroronmissingdir="false"/>
+		</copy>
+	</target>
+
+</project>