To protect your data, the CISO officer has suggested users to enable GitLab 2FA as soon as possible.

Commit 40457401 authored by jzigman's avatar jzigman
Browse files

[svn r651] Standardize formatting with eclipse default, except spaces only and indentation of 2

parent 6a7a085a
......@@ -187,7 +187,7 @@ BUILDING:
<echo level="error">
build: FAIL
See ${log.build.report} for a summary of benchmark build status.
</echo>
</echo>
<echo file="${log.build.fail}" level="error" message="build: FAIL${line.separator}"/>
</target>
......
<project name="lib-common">
<import file="../util.xml"/>
<import file="libs.xml"/>
<property name="lib-build-dir" location="libs/${lib-name}/build"/>
<property name="lib-output-dir" location="libs/${lib-name}/dist"/>
<property name="lib-jars" location="${lib-output-dir}/jar"/>
<property name="lib-dat" value="${bm-output-dir}/dat"/>
<property name="lib-downloads" location="libs/${lib-name}/downloads"/>
<property name="lib-src-dir" location="libs/${lib-name}/src"/>
<property name="lib-data" location="libs/${lib-name}/data"/>
<import file="../util.xml"/>
<import file="libs.xml"/>
<property name="lib-build-dir" location="libs/${lib-name}/build"/>
<property name="lib-output-dir" location="libs/${lib-name}/dist"/>
<property name="lib-jars" location="${lib-output-dir}/jar"/>
<property name="lib-dat" value="${bm-output-dir}/dat"/>
<property name="lib-downloads" location="libs/${lib-name}/downloads"/>
<property name="lib-src-dir" location="libs/${lib-name}/src"/>
<property name="lib-data" location="libs/${lib-name}/data"/>
<target name="all" depends="url-source, svn-source, pre-build, build, jar, complete"/>
<target name="all" depends="url-source, svn-source, pre-build, build, jar, complete"/>
<target name="url-source" if="lib-url">
<antcall target="check-source">
<param name="target-dir" value="${lib-downloads}"/>
<param name="target-url" value="${lib-url}"/>
<param name="target-file" value="${lib-src}"/>
<antcall target="check-source">
<param name="target-dir" value="${lib-downloads}"/>
<param name="target-url" value="${lib-url}"/>
<param name="target-file" value="${lib-src}"/>
</antcall>
</target>
<target name="svn-source" if="lib-svn-url">
<antcall target="check-svn-source">
<param name="target-dir" value="${lib-downloads}"/>
<param name="svn-url" value="${lib-svn-url}"/>
<param name="svn-revision" value="${lib-svn-revision}"/>
<param name="target-file" value="${lib-src}"/>
<antcall target="check-svn-source">
<param name="target-dir" value="${lib-downloads}"/>
<param name="svn-url" value="${lib-svn-url}"/>
<param name="svn-revision" value="${lib-svn-revision}"/>
<param name="target-file" value="${lib-src}"/>
</antcall>
</target>
<target name="pre-build" depends="clean, init, unpack"/>
<target name="clean">
<delete dir="${lib-output-dir}"/>
<delete dir="${lib-build-dir}"/>
</target>
<target name="pre-build" depends="clean, init, unpack"/>
<target name="clean">
<delete dir="${lib-output-dir}"/>
<delete dir="${lib-build-dir}"/>
</target>
<target name="init" depends="clean">
<mkdir dir="${lib-output-dir}"/>
<mkdir dir="${lib-jars}"/>
</target>
<target name="unpack"/>
<target name="init" depends="clean">
<mkdir dir="${lib-output-dir}"/>
<mkdir dir="${lib-jars}"/>
</target>
<target name="unpack"/>
<target name="build"/>
<target name="patch">
<patch patchfile="libs/${lib-name}/${lib-name}.patch" dir="${lib-build-dir}" strip="0" ignorewhitespace="yes"/>
</target>
<target name="untar">
<target name="build"/>
<target name="patch">
<patch patchfile="libs/${lib-name}/${lib-name}.patch" dir="${lib-build-dir}" strip="0" ignorewhitespace="yes"/>
</target>
<target name="untar">
<mkdir dir="${lib-build-dir}"/>
<untar src="${lib-downloads}/${lib-src}" dest="${lib-build-dir}/" compression="gzip"/>
</target>
</target>
<target name="unzip">
<target name="unzip">
<mkdir dir="${lib-build-dir}/"/>
<unzip src="${lib-downloads}/${lib-src}" dest="${lib-build-dir}/"/>
</target>
</target>
<target name="jar"/>
<target name="complete">
<jar jarfile="${jar-target}" basedir="${lib-output-dir}" update="true"/>
</target>
<target name="jar"/>
<target name="complete">
<jar jarfile="${jar-target}" basedir="${lib-output-dir}" update="true"/>
</target>
</project>
<project name="commons-httpclient" default="all" basedir="../..">
<description>Jakarta Commons HttpClient, required by tomcat</description>
<property file="ant/dacapo.properties"/>
<property file="ant/dacapo.properties"/>
<property name="lib-name" value="commons-httpclient"/>
<property name="lib-name" value="commons-httpclient"/>
<property name="lib-version" value="3.1"/>
<property name="lib-url" value="${apache.dl.url}/httpcomponents/${lib-name}/source/"/>
<property name="lib-src" value="${lib-name}-${lib-version}-src.tar.gz"/>
<import file="../common.xml"/>
<property name="lib-src" value="${lib-name}-${lib-version}-src.tar.gz"/>
<import file="../common.xml"/>
<property name="lib-build-top" value="${lib-build-dir}/${lib-name}-${lib-version}"/>
<target name="unpack" depends="untar"/>
<target name="build">
<ant antfile="build.xml" dir="${lib-build-top}" inheritAll="false">
<property name="commons-logging.jar" location="${commons-logging-jar}"/>
<property name="commons-codec.jar" location="${commons-codec-jar}"/>
<target name="dist"/>
</ant>
</target>
<property name="lib-build-top" value="${lib-build-dir}/${lib-name}-${lib-version}"/>
<target name="unpack" depends="untar"/>
<target name="build">
<ant antfile="build.xml" dir="${lib-build-top}" inheritAll="false">
<property name="commons-logging.jar" location="${commons-logging-jar}"/>
<property name="commons-codec.jar" location="${commons-codec-jar}"/>
<target name="dist"/>
</ant>
</target>
<target name="jar">
<copy file="${lib-build-top}/dist/commons-httpclient.jar" tofile="${commons-httpclient-jar}"/>
</target>
</project>
\ No newline at end of file
<target name="jar">
<copy file="${lib-build-top}/dist/commons-httpclient.jar" tofile="${commons-httpclient-jar}"/>
</target>
</project>
<project name="commons-logging" default="all" basedir="../..">
<description>Jakarta Commons Logging, required by httpclient (and therefore tomcat)</description>
<property file="ant/dacapo.properties"/>
<property file="ant/dacapo.properties"/>
<property name="lib-name" value="commons-logging"/>
<property name="lib-name" value="commons-logging"/>
<property name="lib-version" value="1.1.1"/>
<property name="lib-url" value="${apache.dl.url}/commons/logging/source/"/>
<property name="lib-src" value="${lib-name}-${lib-version}-src.tar.gz"/>
<import file="../common.xml"/>
<property name="lib-src" value="${lib-name}-${lib-version}-src.tar.gz"/>
<import file="../common.xml"/>
<property name="lib-build-top" value="${lib-build-dir}/${lib-name}-${lib-version}-src"/>
<target name="unpack" depends="untar"/>
<target name="build">
<ant antfile="build.xml" dir="${lib-build-top}" inheritAll="false">
<property name="servletapi.jar" value="lib/servletapi-2.3.jar"/>
<property name="log4j12.jar" value="lib/log4j-1.2.12.jar"/>
<property name="avalon-framework.jar" value="lib/avalon-framework-4.1.3.jar"/>
<property name="logkit.jar" value="lib/logkit-1.0.1.jar"/>
<target name="getlibs"/>
<target name="compile"/>
<target name="build-jar"/>
</ant>
</target>
<property name="lib-build-top" value="${lib-build-dir}/${lib-name}-${lib-version}-src"/>
<target name="unpack" depends="untar"/>
<target name="build">
<ant antfile="build.xml" dir="${lib-build-top}" inheritAll="false">
<property name="servletapi.jar" value="lib/servletapi-2.3.jar"/>
<property name="log4j12.jar" value="lib/log4j-1.2.12.jar"/>
<property name="avalon-framework.jar" value="lib/avalon-framework-4.1.3.jar"/>
<property name="logkit.jar" value="lib/logkit-1.0.1.jar"/>
<target name="getlibs"/>
<target name="compile"/>
<target name="build-jar"/>
</ant>
</target>
<target name="jar">
<copy file="${lib-build-top}/target/commons-logging-api-1.1.1-SNAPSHOT.jar" tofile="${commons-logging-jar}"/>
</target>
</project>
\ No newline at end of file
<target name="jar">
<copy file="${lib-build-top}/target/commons-logging-api-1.1.1-SNAPSHOT.jar" tofile="${commons-logging-jar}"/>
</target>
</project>
......@@ -28,31 +28,31 @@
</target>
<target name="jar">
<copy tofile="${derby-jar}" flatten="true">
<fileset dir="${lib-build-top}">
<include name="jars/*/derby.jar"/>
<copy tofile="${derby-jar}" flatten="true">
<fileset dir="${lib-build-top}">
<include name="jars/*/derby.jar"/>
</fileset>
</copy>
<copy tofile="${derbyclient-jar}" flatten="true">
<fileset dir="${lib-build-top}">
<include name="jars/*/derbyclient.jar"/>
</fileset>
</copy>
<copy tofile="${derbynet-jar}" flatten="true">
<fileset dir="${lib-build-top}">
<include name="jars/*/derbynet.jar"/>
</copy>
<copy tofile="${derbyclient-jar}" flatten="true">
<fileset dir="${lib-build-top}">
<include name="jars/*/derbyclient.jar"/>
</fileset>
</copy>
<copy tofile="${derbynet-jar}" flatten="true">
<fileset dir="${lib-build-top}">
<include name="jars/*/derbynet.jar"/>
</fileset>
</copy>
<copy tofile="${derbytools-jar}" flatten="true">
<fileset dir="${lib-build-top}">
<include name="jars/*/derbytools.jar"/>
</copy>
<copy tofile="${derbytools-jar}" flatten="true">
<fileset dir="${lib-build-top}">
<include name="jars/*/derbytools.jar"/>
</fileset>
</copy>
<copy tofile="${derbytesting-jar}" flatten="true">
<fileset dir="${lib-build-top}">
<include name="jars/*/derbyTesting.jar"/>
</copy>
<copy tofile="${derbytesting-jar}" flatten="true">
<fileset dir="${lib-build-top}">
<include name="jars/*/derbyTesting.jar"/>
</fileset>
</copy>
</copy>
</target>
</project>
<project name="janino" default="all" basedir="../..">
<description>janino library, required by sunflow</description>
<property file="ant/dacapo.properties"/>
<property file="ant/dacapo.properties"/>
<property name="lib-name" value="janino"/>
<property name="lib-name" value="janino"/>
<property name="lib-version" value="2.5.15"/>
<property name="lib-url" value="http://www.janino.net/download"/>
<property name="lib-src" value="janino-${lib-version}.zip"/>
<import file="../common.xml"/>
<property name="lib-src" value="janino-${lib-version}.zip"/>
<import file="../common.xml"/>
<property name="lib-build-top" value="${lib-build-dir}/janino-${lib-version}"/>
<target name="unpack" depends="unzip"/>
<target name="build">
<condition property="build.dest" value="${build}" else="${build.deps}">
<not>
<equals arg1="${externalize.deps}" arg2="true"/>
</not>
</condition>
<condition property="jdk.home" value="${java.home}" else="${java.home}/..">
<not><contains string="${java.home}" substring="/jre"/></not>
</condition>
<ant antfile="build.xml" dir="${lib-build-top}" inheritAll="false">
<property name="jdk_1_2_2_home" value="${jdk.home}"/>
</ant>
</target>
<property name="lib-build-top" value="${lib-build-dir}/janino-${lib-version}"/>
<target name="unpack" depends="unzip"/>
<target name="build">
<condition property="build.dest" value="${build}" else="${build.deps}">
<not>
<equals arg1="${externalize.deps}" arg2="true"/>
</not>
</condition>
<condition property="jdk.home" value="${java.home}" else="${java.home}/..">
<not><contains string="${java.home}" substring="/jre"/></not>
</condition>
<ant antfile="build.xml" dir="${lib-build-top}" inheritAll="false">
<property name="jdk_1_2_2_home" value="${jdk.home}"/>
</ant>
</target>
<target name="jar">
<copy file="${lib-build-top}/lib/janino.jar" tofile="${janino-jar}"/>
</target>
<target name="jar">
<copy file="${lib-build-top}/lib/janino.jar" tofile="${janino-jar}"/>
</target>
</project>
<project name="junit" default="all" basedir="../..">
<description>junit library, required by pmd, hsqldb and derby</description>
<property file="ant/dacapo.properties"/>
<property name="lib-name" value="junit"/>
<property file="ant/dacapo.properties"/>
<property name="lib-name" value="junit"/>
<property name="lib-version" value="4.7"/>
<property name="lib-url" value="${sourceforge.dl.url}/junit"/>
<property name="lib-src" value="junit${lib-version}.zip"/>
<import file="../common.xml"/>
<target name="unpack" depends="unzip"/>
<target name="unzip">
<mkdir dir="${lib-build-dir}/"/>
<unzip src="${lib-downloads}/${lib-src}" dest="${lib-build-dir}/">
<patternset>
<include name="junit${lib-version}/junit-${lib-version}.jar"/>
</patternset>
</unzip>
</target>
<property name="lib-src" value="junit${lib-version}.zip"/>
<import file="../common.xml"/>
<target name="unpack" depends="unzip"/>
<target name="unzip">
<mkdir dir="${lib-build-dir}/"/>
<unzip src="${lib-downloads}/${lib-src}" dest="${lib-build-dir}/">
<patternset>
<include name="junit${lib-version}/junit-${lib-version}.jar"/>
</patternset>
</unzip>
</target>
<target name="jar" depends="junit-jar-check" unless="junit-build-done">
<copy file="${lib-build-dir}/junit${lib-version}/junit-${lib-version}.jar" tofile="${junit-jar}"/>
</target>
<target name="jar" depends="junit-jar-check" unless="junit-build-done">
<copy file="${lib-build-dir}/junit${lib-version}/junit-${lib-version}.jar" tofile="${junit-jar}"/>
</target>
<target name="junit-jar-check">
<condition property="junit-build-done">
<available file="${junit-jar}"/>
</condition>
</target>
<target name="junit-jar-check">
<condition property="junit-build-done">
<available file="${junit-jar}"/>
</condition>
</target>
</project>
<project name="libs">
<property name="lib-base" value="${basedir}/libs"/>
<property name="lib-base" value="${basedir}/libs"/>
<!-- daytrader -->
<target name="daytrader">
<ant antfile="${lib-base}/daytrader/build.xml"/>
</target>
<!-- jpetstore -->
<property name="jpetstore-common" value="${lib-base}/jpetstore/dist/jar/ibatis-common-2.jar"/>
<property name="jpetstore-dao" value="${lib-base}/jpetstore/dist/jar/ibatis-dao-2.jar"/>
<property name="jpetstore-sqlmap" value="${lib-base}/jpetstore/dist/jar/ibatis-sqlmap-2.jar"/>
<property name="jpetstore-jakarta-oro" value="${lib-base}/jpetstore/dist/jar/jakarta-oro.jar"/>
<property name="jpetstore-struts" value="${lib-base}/jpetstore/dist/jar/struts.jar"/>
<property name="jpetstore-zip" value="${lib-base}/jpetstore/dist/jar/jpetstore.zip"/>
<target name="jpetstore">
<ant antfile="${lib-base}/jpetstore/build.xml"/>
</target>
<!-- jakarta commons HTTP client -->
<property name="commons-httpclient-jar" value="${lib-base}/commons-httpclient/dist/jar/commons-httpclient.jar"/>
<target name="commons-httpclient" depends="commons-logging,commons-codec">
<ant antfile="${lib-base}/commons-httpclient/build.xml"/>
</target>
<!-- jakarta commons logging -->
<property name="commons-logging-jar" value="${lib-base}/commons-logging/dist/jar/commons-logging.jar"/>
<target name="commons-logging">
<ant antfile="${lib-base}/commons-logging/build.xml"/>
</target>
<!-- jakarta commons codec -->
<property name="commons-codec-jar" value="${lib-base}/commons-codec/dist/jar/commons-codec.jar"/>
<target name="commons-codec">
<ant antfile="${lib-base}/commons-codec/build.xml"/>
</target>
<!-- janino -->
<property name="janino-jar" value="${lib-base}/janino/dist/jar/janino-2.5.12.jar"/>
<target name="janino">
<ant antfile="${lib-base}/janino/build.xml"/>
</target>
<!-- jdbcbench -->
<property name="jdbcbench-jar" value="${lib-base}/jdbcbench/dist/jar/jdbcbench.jar"/>
<target name="jdbcbench">
<ant antfile="${lib-base}/jdbcbench/build.xml"/>
</target>
<!-- derby -->
<property name="derby-jar" value="${lib-base}/derby/dist/jar/derby.jar"/>
<property name="derbyclient-jar" value="${lib-base}/derby/dist/jar/derbyclient.jar"/>
<property name="derbynet-jar" value="${lib-base}/derby/dist/jar/derbynet.jar"/>
<property name="derbytools-jar" value="${lib-base}/derby/dist/jar/derbytools.jar"/>
<property name="derbytesting-jar" value="${lib-base}/derby/dist/jar/derbyTesting.jar"/>
<target name="derby">
<ant antfile="${lib-base}/derby/build.xml"/>
</target>
<!-- junit -->
<property name="junit-jar" value="${lib-base}/junit/dist/jar/junit-3.8.1.jar"/>
<target name="junit">
<ant antfile="${lib-base}/junit/build.xml"/>
</target>
<!-- h2-->
<property name="h2-version" value="1.2.121"/>
<property name="h2-jar" value="${lib-base}/h2/dist/jar/h2-${h2-version}.jar"/>
<target name="h2">
<ant antfile="${lib-base}/h2/build.xml"/>
</target>
<!-- lucene -->
<property name="lucene-jars" value="${lib-base}/lucene/dist/jar"/>
<property name="lucene-core-jar-name" value="lucene-core-2.4.jar"/>
<property name="lucene-demos-jar-name" value="lucene-demos-2.4.jar"/>
<target name="lucene">
<ant antfile="${lib-base}/lucene/build.xml"/>
</target>
<!-- xerces -->
<property name="xerces-jars" value="${lib-base}/xerces/dist/jar"/>
<property name="xerces-impl-jar-name" value="xercesImpl.jar"/>
<property name="xerces-api-jar-name" value="xml-apis.jar"/>
<target name="xerces">
<ant antfile="${lib-base}/xerces/build.xml"/>
</target>
<!-- daytrader -->
<target name="daytrader">
<ant antfile="${lib-base}/daytrader/build.xml"/>
</target>
<!-- jpetstore -->
<property name="jpetstore-common" value="${lib-base}/jpetstore/dist/jar/ibatis-common-2.jar"/>
<property name="jpetstore-dao" value="${lib-base}/jpetstore/dist/jar/ibatis-dao-2.jar"/>
<property name="jpetstore-sqlmap" value="${lib-base}/jpetstore/dist/jar/ibatis-sqlmap-2.jar"/>
<property name="jpetstore-jakarta-oro" value="${lib-base}/jpetstore/dist/jar/jakarta-oro.jar"/>
<property name="jpetstore-struts" value="${lib-base}/jpetstore/dist/jar/struts.jar"/>
<property name="jpetstore-zip" value="${lib-base}/jpetstore/dist/jar/jpetstore.zip"/>
<target name="jpetstore">
<ant antfile="${lib-base}/jpetstore/build.xml"/>
</target>
<!-- jakarta commons HTTP client -->
<property name="commons-httpclient-jar" value="${lib-base}/commons-httpclient/dist/jar/commons-httpclient.jar"/>
<target name="commons-httpclient" depends="commons-logging,commons-codec">
<ant antfile="${lib-base}/commons-httpclient/build.xml"/>
</target>
<!-- jakarta commons logging -->
<property name="commons-logging-jar" value="${lib-base}/commons-logging/dist/jar/commons-logging.jar"/>
<target name="commons-logging">
<ant antfile="${lib-base}/commons-logging/build.xml"/>
</target>
<!-- jakarta commons codec -->
<property name="commons-codec-jar" value="${lib-base}/commons-codec/dist/jar/commons-codec.jar"/>
<target name="commons-codec">
<ant antfile="${lib-base}/commons-codec/build.xml"/>
</target>
<!-- janino -->
<property name="janino-jar" value="${lib-base}/janino/dist/jar/janino-2.5.12.jar"/>
<target name="janino">
<ant antfile="${lib-base}/janino/build.xml"/>
</target>
<!-- jdbcbench -->
<property name="jdbcbench-jar" value="${lib-base}/jdbcbench/dist/jar/jdbcbench.jar"/>
<target name="jdbcbench">
<ant antfile="${lib-base}/jdbcbench/build.xml"/>
</target>
<!-- derby -->
<property name="derby-jar" value="${lib-base}/derby/dist/jar/derby.jar"/>
<property name="derbyclient-jar" value="${lib-base}/derby/dist/jar/derbyclient.jar"/>
<property name="derbynet-jar" value="${lib-base}/derby/dist/jar/derbynet.jar"/>
<property name="derbytools-jar" value="${lib-base}/derby/dist/jar/derbytools.jar"/>
<property name="derbytesting-jar" value="${lib-base}/derby/dist/jar/derbyTesting.jar"/>
<target name="derby">
<ant antfile="${lib-base}/derby/build.xml"/>
</target>
<!-- junit -->
<property name="junit-jar" value="${lib-base}/junit/dist/jar/junit-3.8.1.jar"/>
<target name="junit">
<ant antfile="${lib-base}/junit/build.xml"/>
</target>
<!-- h2-->
<property name="h2-version" value="1.2.121"/>
<property name="h2-jar" value="${lib-base}/h2/dist/jar/h2-${h2-version}.jar"/>
<target name="h2">
<ant antfile="${lib-base}/h2/build.xml"/>
</target>
<!-- lucene -->
<property name="lucene-jars" value="${lib-base}/lucene/dist/jar"/>
<property name="lucene-core-jar-name" value="lucene-core-2.4.jar"/>
<property name="lucene-demos-jar-name" value="lucene-demos-2.4.jar"/>
<target name="lucene">
<ant antfile="${lib-base}/lucene/build.xml"/>
</target>
<!-- xerces -->
<property name="xerces-jars" value="${lib-base}/xerces/dist/jar"/>
<property name="xerces-impl-jar-name" value="xercesImpl.jar"/>
<property name="xerces-api-jar-name" value="xml-apis.jar"/>
<target name="xerces">
<ant antfile="${lib-base}/xerces/build.xml"/>
</target>
</project>
<project name="xerces" default="all" basedir="../..">
<description>xerces library, required by xalan</description>
<property file="ant/dacapo.properties"/>
<property name="lib-name" value="xerces"/>
<property file="ant/dacapo.properties"/>
<property name="lib-name" value="xerces"/>
<property name="lib-version" value="2.8.0"/>
<property name="lib-_version" value="2_8_0"/>
<property name="lib-url" value="${apache.dl.url}/xml/xerces-j/binaries"/>
<property name="lib-src" value="Xerces-J-bin.${lib-version}.tar.gz"/>
<property name="lib-src" value="Xerces-J-bin.${lib-version}.tar.gz"/>
<import file="../common.xml"/>
<import file="../common.xml"/>
<property name="lib-build-top" value="${lib-build-dir}/${lib-name}-${lib-_version}"/>