Skip to content

Commit 2882ae2

Browse files
cbeamscbeams
committed
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
1 parent 4a7b96c commit 2882ae2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+5181
-3
lines changed

‎.gitignore

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1+
.springBeans
2+
.DS_Store
13
target
24
integration-repo
35
ivy-cache
4-
spring-build
56
jmx.log
6-
.springBeans
7-
.DS_Store
7+
jxl.log
8+
jmx.log
9+
org.springframework.jdbc/derby.log
10+
org.springframework.spring-parent/.classpath
11+
org.springframework.spring-parent/.project
12+
org.springframework.test/test-output/

‎spring-build/aspect/artifact.xml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Copyright 2010 SpringSource
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
-->
17+
<project name="artifact-aspect" xmlns:ivy="antlib:org.apache.ivy.ant">
18+
19+
<import file="common.xml"/>
20+
<import file="../common/artifact.xml"/>
21+
22+
<target name="jar" depends="ivy.init, resolve.aspects, artifact-common.jar"
23+
description="Creates a JAR file containing the output of a compilation of the source tree."/>
24+
25+
<!-- Other targets -->
26+
<target name="compile.init" depends="ivy.init">
27+
<ivy:cachepath resolveId="ajc.classpath" pathid="ajc.classpath" organisation="org.aspectj"
28+
module="com.springsource.org.aspectj.tools" revision="${org.aspectj.tools.version}" conf="runtime"
29+
type="jar" inline="true" log="download-only"/>
30+
<taskdef resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties" classpathref="ajc.classpath"/>
31+
</target>
32+
33+
</project>

‎spring-build/aspect/common.xml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Copyright 2010 SpringSource
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
-->
17+
<project name="common-aspect">
18+
19+
<import file="../common/common.xml"/>
20+
21+
<!-- Macros -->
22+
<macrodef name="do-compile">
23+
<attribute name="classpath.id"/>
24+
<attribute name="input.dir"/>
25+
<attribute name="output.dir"/>
26+
<attribute name="resources.dir"/>
27+
<sequential>
28+
<iajc sourceroots="@{input.dir}" destDir="@{output.dir}" classpathRef="@{classpath.id}" source="${source.version}"
29+
debug="${compile.debug}" debugLevel="${compile.debug.level}" checkRuntimeVersion="false"
30+
aspectPathRef="aspects.classpath" X="${aspectj.x}"/>
31+
<copy todir="@{output.dir}">
32+
<fileset dir="@{input.dir}" erroronmissingdir="false">
33+
<exclude name="**/*.aj"/>
34+
<exclude name="**/*.java"/>
35+
<exclude name="*.aj"/>
36+
<exclude name="*.java"/>
37+
</fileset>
38+
</copy>
39+
<copy todir="@{output.dir}">
40+
<fileset dir="@{resources.dir}" erroronmissingdir="false"/>
41+
</copy>
42+
</sequential>
43+
</macrodef>
44+
45+
</project>

‎spring-build/aspect/default.xml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Copyright 2010 SpringSource
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
-->
17+
<project name="default-aspect">
18+
19+
<import file="common.xml"/>
20+
<import file="artifact.xml"/>
21+
<import file="quality.xml"/>
22+
<import file="package.xml"/>
23+
<import file="publish.xml"/>
24+
25+
</project>

‎spring-build/aspect/package.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Copyright 2010 SpringSource
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
-->
17+
<project name="package-aspect">
18+
19+
<import file="common.xml"/>
20+
<import file="../common/package.xml"/>
21+
22+
</project>

‎spring-build/aspect/publish.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Copyright 2010 SpringSource
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
-->
17+
<project name="publish-aspect">
18+
19+
<import file="common.xml"/>
20+
<import file="../common/publish.xml"/>
21+
22+
</project>

‎spring-build/aspect/quality.xml

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Copyright 2010 SpringSource
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
-->
17+
<project name="quality-aspect" xmlns:ivy="antlib:org.apache.ivy.ant">
18+
19+
<import file="common.xml"/>
20+
<import file="../common/quality.xml"/>
21+
22+
<target name="test.do" depends="ivy.init, resolve.test, resolve.aspects, compile.init, test.init" if="test.exists">
23+
<path id="test.compile.classpath">
24+
<pathelement location="${jar.output.file}"/>
25+
<path refid="compile.classpath"/>
26+
<path refid="test.classpath"/>
27+
</path>
28+
<path id="test.aspect.path">
29+
<pathelement location="${jar.output.file}"/>
30+
<path refid="aspects.classpath"/>
31+
</path>
32+
<test-compile classpath.id="test.compile.classpath" input.dir="${test.java.dir}" output.dir="${test.output.dir}"
33+
resources.dir="${test.resources.dir}"/>
34+
<iajc inPath="${test.output.dir}" aspectPathRef="test.aspect.path" classpathRef="test.compile.classpath"
35+
destDir="${test.output.dir}" source="${source.version}" checkRuntimeVersion="false" X="${aspectj.x}"/>
36+
37+
<path id="test.run.classpath">
38+
<pathelement location="${jar.output.file}"/>
39+
<pathelement location="${test.output.dir}"/>
40+
<path refid="compile.classpath"/>
41+
<path refid="test.classpath"/>
42+
<path refid="runtime.classpath"/>
43+
</path>
44+
<test-run classpath.id="test.run.classpath"/>
45+
</target>
46+
47+
<target name="clover.instrument" depends="ivy.init, resolve.aspects, resolve.test, compile.init, clover.init">
48+
<instrument input.dir="${main.java.dir}" output.dir="${main.clover.dir}"/>
49+
<path id="clover.compile.classpath">
50+
<path refid="clover.classpath"/>
51+
<path refid="compile.classpath"/>
52+
</path>
53+
<compile classpath.id="clover.compile.classpath" input.dir="${main.clover.dir}" output.dir="${main.output.dir}"
54+
resources.dir="${main.resources.dir}"/>
55+
56+
<instrument input.dir="${test.java.dir}" output.dir="${test.clover.dir}"/>
57+
<path id="test.compile.classpath">
58+
<pathelement location="${main.output.dir}"/>
59+
<path refid="clover.classpath"/>
60+
<path refid="compile.classpath"/>
61+
<path refid="test.classpath"/>
62+
</path>
63+
<path id="test.aspect.path">
64+
<pathelement location="${main.output.dir}"/>
65+
<path refid="aspects.classpath"/>
66+
</path>
67+
<test-compile classpath.id="test.compile.classpath" input.dir="${test.clover.dir}" output.dir="${test.output.dir}"
68+
resources.dir="${test.resources.dir}"/>
69+
<iajc inPath="${test.output.dir}" aspectPathRef="test.aspect.path" classpathRef="test.compile.classpath"
70+
destDir="${test.output.dir}" source="${source.version}" checkRuntimeVersion="false" X="${aspectj.x}"/>
71+
<delete dir="${clover.staging.dir}" quiet="true"/>
72+
</target>
73+
74+
</project>

‎spring-build/common/artifact.xml

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Copyright 2010 SpringSource
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
-->
17+
<project name="artifact-common" xmlns:ivy="antlib:org.apache.ivy.ant"
18+
xmlns:bundlor="antlib:com.springsource.bundlor.ant">
19+
20+
<!-- Main targets -->
21+
<target name="javadoc-all" depends="ivy.init, resolve.compile, src.init" if="src.exists"
22+
description="Creates javadoc documentation for all classes.">
23+
<java-doc input.dir="${main.java.dir}" output.dir="${javadoc-all.output.dir}" classpath.id="compile.classpath"
24+
access="private"/>
25+
</target>
26+
27+
<target name="javadoc-api" depends="ivy.init, resolve.compile, src.init" if="src.exists"
28+
description="Creates javadoc documentation for all classes.">
29+
<java-doc input.dir="${main.java.dir}" output.dir="${javadoc-api.output.dir}" classpath.id="compile.classpath"
30+
access="protected" exclude.package.names="${javadoc.exclude.package.names}"/>
31+
</target>
32+
33+
<target name="jar" depends="ivy.init, resolve.compile, compile.init, jar.init"
34+
description="Creates a JAR file containing the output of a compilation of the source tree.">
35+
<delete quiet="true" file="${ivy.output.file}"/>
36+
<mkdir dir="${ivy.output.dir}"/>
37+
<delete quiet="true" file="${jar.output.file}"/>
38+
<mkdir dir="${jar.output.dir}"/>
39+
<delete quiet="true" file="${source-jar.output.file}"/>
40+
<mkdir dir="${source-jar.output.dir}"/>
41+
42+
<compile classpath.id="compile.classpath" input.dir="${main.java.dir}" output.dir="${main.output.dir}"
43+
resources.dir="${main.resources.dir}"/>
44+
<ivy:retrieve resolveId="additional.classpath" conf="additional" type="jar" transitive="false"
45+
pattern="${main.output.dir}/[artifact]-[revision].[ext]" log="download-only"/>
46+
<antcall target="bundlor"/>
47+
<jar destfile="${jar.output.file}" basedir="${main.output.dir}" index="true" filesetmanifest="merge">
48+
<manifest>
49+
<attribute name="Bundle-ManifestVersion" value="2"/>
50+
<attribute name="Bundle-Version" value="${bundle.version}"/>
51+
<attribute name="Bundle-Creator" value="${user.name}"/>
52+
<attribute name="Implementation-Title" value="${implementation.title}"/>
53+
<attribute name="Implementation-Version" value="${implementation.version}"/>
54+
</manifest>
55+
</jar>
56+
<jar destfile="${source-jar.output.file}" basedir="${main.java.dir}" index="true"/>
57+
<ivy:publish resolver="integration" pubdate="${timestamp}" status="${release.type}">
58+
<artifacts pattern="${ivy.output.dir}/[artifact].[ext]"/>
59+
<artifacts pattern="${jar.output.dir}/[artifact].[ext]"/>
60+
<artifacts pattern="${source-jar.output.dir}/[artifact].[ext]"/>
61+
<artifacts pattern="${license.dir}/[artifact].[ext]"/>
62+
</ivy:publish>
63+
</target>
64+
65+
<!-- Other targets -->
66+
<propertyset id="bundlor.properties"/>
67+
68+
<target name="compile.init" depends="ivy.init"/>
69+
70+
<target name="jar.init">
71+
<fail message="The 'integration.repo.dir' property must be set on this project.">
72+
<condition>
73+
<not>
74+
<isset property="integration.repo.dir"/>
75+
</not>
76+
</condition>
77+
</fail>
78+
<fail message="The 'ivy.cache.dir' property must be set on this project.">
79+
<condition>
80+
<not>
81+
<isset property="ivy.cache.dir"/>
82+
</not>
83+
</condition>
84+
</fail>
85+
<fail message="The 'version' property must be set on this project.">
86+
<condition>
87+
<not>
88+
<isset property="version"/>
89+
</not>
90+
</condition>
91+
</fail>
92+
</target>
93+
94+
<target name="bundlor" depends="bundlor.init" unless="disable.bundlor">
95+
<bundlor:bundlor inputPath="${main.output.dir}" outputPath="${main.output.dir}"
96+
bundleVersion="${bundle.version}" manifestTemplatePath="${manifest.template.file}"
97+
failOnWarnings="${fail.on.warnings}">
98+
<propertyset refid="bundlor.properties"/>
99+
<propertyset>
100+
<propertyref builtin="all"/>
101+
</propertyset>
102+
</bundlor:bundlor>
103+
</target>
104+
105+
<target name="bundlor.init" depends="ivy.init" unless="disable.bundlor">
106+
<ivy:cachepath resolveId="bundlor.classpath" pathid="bundlor.classpath" organisation="com.springsource.bundlor"
107+
module="com.springsource.bundlor.ant" revision="${bundlor.ant.version}" conf="ant" inline="true"
108+
type="jar" log="download-only"/>
109+
<taskdef resource="com/springsource/bundlor/ant/antlib.xml" uri="antlib:com.springsource.bundlor.ant"
110+
classpathref="bundlor.classpath"/>
111+
</target>
112+
113+
<target name="javadoc.prep" depends="src.init" if="src.exists">
114+
<mkdir dir="${javadoc.prep.dir}"/>
115+
<copy todir="${javadoc.prep.dir}">
116+
<fileset dir="${main.java.dir}" erroronmissingdir="false"/>
117+
</copy>
118+
</target>
119+
120+
</project>

0 commit comments

Comments
 (0)