WARNING! Access to this system is limited to authorised users only.
Unauthorised users may be subject to prosecution.
Unauthorised access to this system is a criminal offence under Australian law (Federal Crimes Act 1914 Part VIA)
It is a criminal offence to:
(1) Obtain access to data without authority. -Penalty 2 years imprisonment.
(2) Damage, delete, alter or insert data without authority. -Penalty 10 years imprisonment.
User activity is monitored and recorded. Anyone using this system expressly consents to such monitoring and recording.

To protect your data, the CISO officer has suggested users to enable 2FA as soon as possible.
Currently 2.7% of users enabled 2FA.

Commit 4f1c85c3 authored by John Zhang's avatar John Zhang Committed by Rui Chen
Browse files

Combined bug fixing commit

Change the path of the LICENSE

Change the path of README.md

Fix the broken link problem for h2 and junit

Fix the broken link for janino package

Update the patch file for tomcat for fixing one broken link

Add the patch file for libs/commons-logging to fix the broken link for downloaded package

Fix the broken link of jstl and update the checksum for jstl

Delete the extra space in md5 checksum file for jstl

Deleting the echo in libs/common.xml

fix: assuming DaCapo is managed by git, properly extract commit hash from git

remove extra space

no fail on error

fix: correctly point to jar file so to extract version info

Fixed the error in tomcat and pmd

fixed typo
parent 5d4c7e45
......@@ -12,7 +12,7 @@
<property name="bm-name" value="pmd"/>
<property name="bm-version" value="4.2.5"/>
<property name="bm-url" value="${sourceforge.dl.url}/pmd"/>
<property name="bm-url" value="${sourceforge.dl.url}/pmd/pmd/4.2.5"/>
<property name="bm-src" value="${bm-name}-src-${bm-version}.zip"/>
<property name="jaxen-version" value="1.1.1"/>
<property name="asm-version" value="3.1"/>
......
......@@ -12,7 +12,8 @@
<property name="bm-name" value="sunflow"/>
<property name="bm-version" value="0.07.2"/>
<property name="bm-url" value="${sourceforge.dl.url}/sunflow"/>
<property name="bm-url" value="${sourceforge.dl.url}/sunflow/sunflow-src/v${bm-version}"/>
<property name="bm-bin-url" value="${sourceforge.dl.url}/sunflow/sunflow-bin/v${bm-version}"/>
<property name="bm-src" value="${bm-name}-src-v${bm-version}.zip"/>
<property name="bm-bin" value="${bm-name}-bin-v${bm-version}.zip"/>
......@@ -21,7 +22,7 @@
<target name="source" depends="common.source">
<antcall target="check-source">
<param name="target-dir" value="${bm-downloads}"/>
<param name="target-url" value="${bm-url}"/>
<param name="target-url" value="${bm-bin-url}"/>
<param name="target-file" value="${bm-bin}"/>
</antcall>
</target>
......
diff -N -u -r tomcat.orig/apache-tomcat-6.0.20-src/build.properties.default apache-tomcat-6.0.20-src/build.properties.default
--- tomcat.orig/apache-tomcat-6.0.20-src/build.properties.default 2008-07-22 10:01:29.000000000 +1000
+++ apache-tomcat-6.0.20-src/build.properties.default 2009-07-27 14:38:43.000000000 +1000
--- apache-tomcat-6.0.20-src/build.properties.default 2009-05-14 09:15:15.000000000 +1000
+++ ../build.properties.default 2017-12-15 15:13:11.136320083 +1100
@@ -45,7 +45,7 @@
base-commons.loc=http://archive.apache.org/dist/commons
base-tomcat.loc=http://archive.apache.org/dist/tomcat
-base-sf.loc=http://downloads.sourceforge.net
+base-sf.loc=http://softlayer.dl.sourceforge.net
+base-sf.loc=https://ncu.dl.sourceforge.net
# ----- Commons Logging, version 1.1 or later -----
commons-logging-version=1.1.1
@@ -90,8 +90,8 @@
nsis.installoptions.dll=${nsis.home}/Plugins/InstallOptions.dll
nsis.nsexec.dll=${nsis.home}/Plugins/nsExec.dll
nsis.nsisdl.dll=${nsis.home}/Plugins/NSISdl.dll
-nsis.loc=${base-sf.loc}/nsis/nsis-2.37.zip
+nsis.loc=${base-sf.loc}/project/nsis/NSIS%202/2.37/nsis-2.37.zip
# ----- Commons Daemon, version 1.0-Alpha or later -----
commons-daemon.home=${base.path}/commons-daemon-1.0.1
--- apache-tomcat-6.0.20-src/build.properties.default 2018-01-02 03:36:37.363894115 +1100
+++ ../build.properties.default 2018-01-02 03:43:20.926628287 +1100
@@ -59,7 +59,7 @@
jdt.home=${base.path}/eclipse/plugins
jdt.lib=${jdt.home}
jdt.jar=${jdt.lib}/org.eclipse.jdt.core_3.3.1.v_780_R33x.jar
-jdt.loc=http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops/R-3.3.1-200709211145/eclipse-JDT-3.3.1.zip
+jdt.loc=http://archive.eclipse.org/eclipse/downloads/drops/R-3.3.1-200709211145/eclipse-JDT-3.3.1.zip
# ----- Tomcat native library -----
tomcat-native.version=1.1.16
......@@ -9,6 +9,7 @@
<project name="DacapoBenchmarks" default="dist" basedir=".">
<property name="toolsdir" location="../tools"/>
<property name="log.dir" value="${basedir}/log"/>
<property environment="env"/>
<tstamp>
<format property="build.time" pattern="yyyyMMdd-hhmm"/>
</tstamp>
......@@ -76,35 +77,35 @@ BUILDING:
<property name="dacapo.doc.dir" value="${basedir}/doc"/>
<property name="dacapo.src.dir" value="${basedir}/src"/>
<target name="check-svn-present">
<available property="svn.present" file=".svn" type="dir"/>
<property name="svn.exe" value="svn"/>
<target name="check-git-present">
<available property="git.present" file="../.git" type="dir"/>
<property name="git.exe" value="git"/>
</target>
<target name="extract-svn-revision" depends="check-svn-present" if="svn.present">
<exec executable="${svn.exe}" failonerror="no" failifexecutionfails="no">
<arg value="info"/>
<redirector outputproperty="svn.revision">
<target name="extract-git-revision" depends="check-git-present" if="git.present">
<exec executable="${git.exe}" failonerror="no" failifexecutionfails="no">
<arg line="show --abbrev-commit HEAD"/>
<redirector outputproperty="git.revision">
<outputfilterchain>
<linecontains>
<contains value="Revision: "/>
</linecontains>
<linecontainsregexp>
<regexp pattern="^commit [a-z0-9]+$"/>
</linecontainsregexp>
<tokenfilter>
<replacestring from="Revision: " to=""/>
<replacestring from="commit " to=""/>
</tokenfilter>
</outputfilterchain>
</redirector>
</exec>
</target>
<target name="get-svn-revision" depends="extract-svn-revision">
<target name="get-git-revision" depends="extract-git-revision" unless="git.revision">
<!-- set property if not already set -->
<property name="svn.revision" value="unknown"/>
<property name="git.revision" value="unknown"/>
</target>
<target name="set-build-version-info" depends="get-svn-revision">
<target name="set-build-version-info" depends="get-git-revision">
<property name="build.nickname" value="development"/>
<property name="build.version" value="head-r${svn.revision}"/>
<property name="build.version" value="head-r${git.revision}"/>
</target>
<target name="init" depends="set-build-version-info">
......@@ -226,13 +227,13 @@ BUILDING:
<echo file="${dacapo.build.dir}/MANIFEST.MF" append="yes">Implementation-Version: ${build.version}${line.separator}</echo>
<!-- form the top level info -->
<copy file="${basedir}/LICENSE-2.0.txt" todir="${dacapo.build.dir}"/>
<copy file="${basedir}/README.txt" todir="${dacapo.build.dir}"/>
<copy file="${basedir}/../LICENSE" todir="${dacapo.build.dir}"/>
<copy file="${basedir}/../README.md" todir="${dacapo.build.dir}"/>
<copy file="${basedir}/RELEASE_NOTES.txt" todir="${dacapo.build.dir}"/>
<!-- this forms the base document section -->
<copy file="${basedir}/LICENSE-2.0.txt" tofile="${dacapo.build.doc.dir}/LICENSE.txt" />
<copy file="${basedir}/README.txt" todir="${dacapo.build.doc.dir}" />
<copy file="${basedir}/../LICENSE" todir="${dacapo.build.dir}"/>
<copy file="${basedir}/../README.md" todir="${dacapo.build.dir}"/>
<copy file="${basedir}/RELEASE_NOTES.txt" todir="${dacapo.build.doc.dir}" />
<copy todir="${dacapo.build.doc.dir}">
......
......@@ -7,8 +7,7 @@ mvn.version=2.1.0
# URLs
#
sourceforge.dl.url=http://softlayer.dl.sourceforge.net
sourceforge.dl.url=http://cfhcable.dl.sourceforge.net/project
sfdata.url=http://dacapobench.sourceforge.net/source-data
apache.dl.url=http://archive.apache.org/dist
jar-target=dacapo.jar
......@@ -256,7 +256,8 @@ public class TestHarness {
{
try {
JarFile jarFile = new JarFile(new File(TestHarness.class.getProtectionDomain().getCodeSource().getLocation().getFile()));
String url = TestHarness.class.getProtectionDomain().getCodeSource().getLocation().getFile();
JarFile jarFile = new JarFile(url.replace("!/harness", "").replace("file:", ""));
Manifest manifest = jarFile.getManifest();
Attributes attributes = manifest.getMainAttributes();
......
--- commons-httpclient-3.1/build.xml 2007-08-18 19:02:14.000000000 +1000
+++ ../build-new.xml 2017-12-06 13:49:28.000000000 +1100
@@ -181,14 +181,16 @@
destdir ="${build.home}/classes"
debug ="${compile.debug}"
deprecation ="${compile.deprecation}"
- optimize ="${compile.optimize}">
+ optimize ="${compile.optimize}"
+ encoding ="ISO8859_1">
<classpath refid="compile.classpath"/>
</javac>
<javac srcdir ="${source.home}/examples"
destdir ="${build.home}/examples"
debug ="${compile.debug}"
deprecation ="${compile.deprecation}"
- optimize ="${compile.optimize}">
+ optimize ="${compile.optimize}"
+ encoding ="ISO8859_1">
<classpath refid="compile.classpath"/>
</javac>
</target>
@@ -199,7 +201,8 @@
destdir ="${build.home}/tests"
debug ="${compile.debug}"
deprecation ="${compile.deprecation}"
- optimize ="${compile.optimize}">
+ optimize ="${compile.optimize}"
+ encoding ="ISO8859_1">
<classpath refid="test.classpath"/>
</javac>
<copy todir="${build.home}/tests" filtering="on">
@@ -248,6 +251,7 @@
doctitle ="&lt;h1&gt;${component.title}&lt;/h1&gt;"
windowtitle ="${component.title} (Version ${component.version})"
bottom ="Copyright (c) 1999-2005 - Apache Software Foundation"
+ encoding ="ISO8859_1"
>
<classpath refid="test.classpath"/>
<link href="${javadoc.j2sdk.link}"/>
......@@ -19,7 +19,7 @@
<property name="lib-build-top" value="${lib-build-dir}/${lib-name}-${lib-version}-src"/>
<target name="unpack" depends="untar"/>
<target name="unpack" depends="untar, patch"/>
<target name="build">
<ant antfile="build.xml" dir="${lib-build-top}" inheritAll="false">
......
--- commons-logging-1.1.1-src/build.xml 2007-11-22 10:27:52.000000000 +1100
+++ ../downloads/build.xml 2018-01-01 22:12:48.046871456 +1100
@@ -221,13 +221,14 @@
- Running this target will download all the necessary dependencies into the "lib" subdirectory.
-->
<property name="getlibs.base" value="http://repo1.maven.org/maven"/>
+ <property name="maven.central" value="http://central.maven.org/maven2"/>
<target name="getlibs">
<mkdir dir="lib"/>
- <get dest="lib/junit-3.8.1.jar" src="${getlibs.base}/junit/jars/junit-3.8.1.jar"/>
+ <get dest="lib/junit-3.8.1.jar" src="${maven.central}/junit/junit/3.8.1/junit-3.8.1.jar"/>
<get dest="lib/logkit-1.0.1.jar" src="${getlibs.base}/logkit/jars/logkit-1.0.1.jar"/>
<get dest="lib/avalon-framework-4.1.3.jar" src="${getlibs.base}/avalon-framework/jars/avalon-framework-4.1.3.jar"/>
<get dest="lib/log4j-1.2.12.jar" src="${getlibs.base}/log4j/jars/log4j-1.2.12.jar"/>
- <get dest="lib/servletapi-2.3.jar" src="${getlibs.base}/servletapi/jars/servletapi-2.3.jar"/>
+ <get dest="lib/servletapi-2.3.jar" src="${maven.central}/servletapi/servletapi/2.3/servletapi-2.3.jar"/>
</target>
<target name="init"
......@@ -58,7 +58,7 @@
<property name="jstl-version" value="1.2"/>
<property name="jstl-name" value="jstl"/>
<property name="jstl-url" value="${java-dev-url}/glassfish/org/glassfish/web/${jstl-name}-impl/${jstl-version}"/>
<property name="jstl-url" value="${maven-repo-url}/org/glassfish/web/${jstl-name}-impl/${jstl-version}"/>
<property name="jstl-jar" value="${jstl-name}-impl-${jstl-version}.jar"/>
<property name="oro-version" value="2.0.8"/>
......@@ -66,6 +66,11 @@
<property name="oro-url" value="${maven-repo-url}/${oro-name}/${oro-name}/${oro-version}"/>
<property name="oro-jar" value="${oro-name}-${oro-version}.jar"/>
<property name="incubator-version" value="3.0.0"/>
<property name="incubator-name" value="incubator"/>
<property name="incubator-url" value="https://maven.atlassian.com/maven-3rdparty/org/apache/activemq/activeio-core/${incubator-version}-${incubator-name}/"/>
<property name="incubator-jar" value="activeio-core-${incubator-version}-${incubator-name}.jar"/>
<import file="../common.xml"/>
<property name="dt-build" location="${lib-build-dir}/daytrader"/>
......@@ -130,6 +135,11 @@
<param name="target-url" value="${jasper-el-url}"/>
<param name="target-file" value="${jasper-el-jar}"/>
</antcall>
<antcall target="check-source">
<param name="target-dir" value="${lib-downloads}"/>
<param name="target-url" value="${incubator-url}"/>
<param name="target-file" value="${incubator-jar}"/>
</antcall>
</target>
<target name="unpack">
......@@ -243,18 +253,38 @@
<arg value="-Dfile=${tomcat-jar-loc}"/>
</exec>
<!-- install incubator -->
<property name="incubator-jar-loc" location="${lib-downloads}/${incubator-jar}"/>
<exec executable="${mvn}" dir="${dt-build}" failonerror="yes" failifexecutionfails="yes">
<env key="PATH" path="${env.PATH}:${toolsdir}/apache-maven-${mvn.version}/bin"/>
<arg value="install:install-file"/>
<arg value="-DgroupId=org.apache.activemq"/>
<arg value="-DartifactId=activeio-core"/>
<arg value="-Dversion=3.0.0-incubator"/>
<arg value="-Dpackaging=jar"/>
<arg value="-Dfile=${incubator-jar-loc}"/>
</exec>
<!-- build required plugins -->
<exec executable="${mvn}" dir="${lib-build-dir}/plugins/j2ee" failonerror="yes" failifexecutionfails="yes"/>
<exec executable="${mvn}" dir="${lib-build-dir}/plugins/client" failonerror="yes" failifexecutionfails="yes"/>
<exec executable="${mvn}" dir="${lib-build-dir}/plugins/cxf" failonerror="yes" failifexecutionfails="yes"/>
<exec executable="${mvn}" dir="${lib-build-dir}/plugins/axis" failonerror="yes" failifexecutionfails="yes"/>
<exec executable="${mvn}" dir="${lib-build-dir}/plugins/j2ee" failonerror="yes" failifexecutionfails="yes">
<env key="JAVA_HOME" path="${j16lib}"/>
</exec>
<exec executable="${mvn}" dir="${lib-build-dir}/plugins/client" failonerror="yes" failifexecutionfails="yes">
<env key="JAVA_HOME" path="${j16lib}"/>
</exec>
<exec executable="${mvn}" dir="${lib-build-dir}/plugins/cxf" failonerror="yes" failifexecutionfails="yes">
<env key="JAVA_HOME" path="${j16lib}"/>
</exec>
<exec executable="${mvn}" dir="${lib-build-dir}/plugins/axis" failonerror="yes" failifexecutionfails="yes">
<env key="JAVA_HOME" path="${j16lib}"/>
</exec>
<!-- build daytrader -->
<exec executable="${mvn}" dir="${dt-build}">
<env key="PATH" path="${env.PATH}:${toolsdir}/apache-maven-${mvn.version}/bin"/>
<env key="JAVA_HOME" path="${j16lib}"/>
<env key="PATH" path="${env.PATH}:${toolsdir}/apache-maven-${mvn.version}/bin:${JAVA_HOME}/bin"/>
<env key="GERONIMO_HOME" value="${ger-home}"/>
<!-- <env key="PATH" path="${env.PATH}:${mvn-home}"/> -->
<env key="JAVA_HOME" path="${java.home}"/>
<env key="MAVEN_OPTS" value="-Xms256m -Xmx512m"/>
<arg value="clean"/>
<arg value="install"/>
......
f67ef6ab1f83a302c333cbd0fecccc0e
7eb0e63ce8cc6d4e5791ce08d80d8de0
\ No newline at end of file
......@@ -20,3 +20,32 @@
log4j.appender.CONSOLE.Target=System.out
log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
log4j.appender.CONSOLE.layout.ConversionPattern=%d{ISO8601} %-5p [%c{1}] %m%n
--- plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFEndpoint.java 2018-01-02 15:54:45.000000000 +1100
+++ ../CXFEndpoint.java 2018-01-03 13:02:55.000000000 +1100
@@ -31,6 +31,8 @@
import javax.xml.ws.handler.Handler;
import javax.xml.ws.http.HTTPBinding;
import javax.xml.ws.soap.SOAPBinding;
+import javax.xml.ws.EndpointReference;
+import org.w3c.dom.Element;
import org.apache.cxf.Bus;
import org.apache.cxf.endpoint.Server;
@@ -262,4 +264,15 @@
this.server.stop();
}
}
+
+ @Override
+ public <T extends EndpointReference> T getEndpointReference(Class<T> clazz,
+ Element... referenceParameters){
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public EndpointReference getEndpointReference(Element... referenceParameters){
+ throw new UnsupportedOperationException();
+ }
}
......@@ -30,6 +30,7 @@
</fileset>
</copy>
<ant antfile="build.xml" inheritall="false" dir="${lib-build-top}">
<property name="j16lib" value="${j16lib}"/>
<target name="all"/>
<target name="buildjars"/>
</ant>
......
......@@ -12,7 +12,7 @@
<property name="lib-name" value="h2"/>
<property name="lib-version" value="1.2.123"/>
<property name="lib-url" value="http://repo2.maven.org/maven2/com/h2database/${lib-name}/${lib-version}/"/>
<property name="lib-url" value="http://repo2.maven.org/maven2/com/h2database/${lib-name}/${lib-version}"/>
<property name="lib-src" value="h2-${lib-version}.jar"/>
<import file="../common.xml"/>
......
......@@ -12,7 +12,7 @@
<property name="lib-name" value="janino"/>
<property name="lib-version" value="2.5.15"/>
<property name="lib-url" value="http://dist.codehaus.org/janino"/>
<property name="lib-url" value="http://pkgs.fedoraproject.org/repo/pkgs/janino/janino-2.5.15.zip/087b6db3eabb6175f228a58958f816aa"/>
<property name="lib-src" value="janino-${lib-version}.zip"/>
<import file="../common.xml"/>
......
......@@ -8,11 +8,12 @@
-->
<project name="junit" default="all" basedir="../..">
<description>junit library, required by pmd, hsqldb and derby</description>
<property name="sourceforge.dl.j.url" value="http://jaist.dl.sourceforge.net"/>
<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-url" value="${sourceforge.dl.j.url}/project/junit/junit/${lib-version}"/>
<property name="lib-src" value="junit${lib-version}.zip"/>
<import file="../common.xml"/>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment