You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by om...@apache.org on 2011/03/04 04:45:37 UTC
svn commit: r1077144 - in
/hadoop/common/branches/branch-0.20-security-patches: ./ ivy/ src/
src/contrib/vaidya/ src/test/ src/test/aop/build/
src/test/aop/org/apache/hadoop/fi/
Author: omalley
Date: Fri Mar 4 03:45:37 2011
New Revision: 1077144
URL: http://svn.apache.org/viewvc?rev=1077144&view=rev
Log:
commit 38c1c97824b38705a82973e45f171579e2d347e8
Author: Konstantin Boudnik <co...@goodenter-lm.local>
Date: Tue Feb 2 13:54:51 2010 -0800
Revert "HADOOP-6204 from https://issues.apache.org/jira/secure/attachment/12431062/HADOOP-6204-ydist.patch"
This reverts commit 57201b8a5f34da583ae266bb1c1508c74f2d5dee.
Removed:
hadoop/common/branches/branch-0.20-security-patches/src/test/aop/build/aop.xml
hadoop/common/branches/branch-0.20-security-patches/src/test/aop/org/apache/hadoop/fi/FiConfig.java
hadoop/common/branches/branch-0.20-security-patches/src/test/aop/org/apache/hadoop/fi/ProbabilityModel.java
hadoop/common/branches/branch-0.20-security-patches/src/test/fi-site.xml
Modified:
hadoop/common/branches/branch-0.20-security-patches/build.xml
hadoop/common/branches/branch-0.20-security-patches/ivy.xml
hadoop/common/branches/branch-0.20-security-patches/ivy/libraries.properties
hadoop/common/branches/branch-0.20-security-patches/src/contrib/vaidya/build.xml
hadoop/common/branches/branch-0.20-security-patches/src/saveVersion.sh
Modified: hadoop/common/branches/branch-0.20-security-patches/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/build.xml?rev=1077144&r1=1077143&r2=1077144&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/build.xml (original)
+++ hadoop/common/branches/branch-0.20-security-patches/build.xml Fri Mar 4 03:45:37 2011
@@ -301,7 +301,7 @@
</copy>
<exec executable="sh">
- <arg line="src/saveVersion.sh ${version} ${build.dir}"/>
+ <arg line="src/saveVersion.sh ${version}"/>
</exec>
<exec executable="sh">
@@ -309,8 +309,6 @@
</exec>
</target>
- <import file="${test.src.dir}/aop/build/aop.xml"/>
-
<!-- ====================================================== -->
<!-- Compile the Java files -->
<!-- ====================================================== -->
@@ -550,8 +548,6 @@
<tar compression="gzip" destfile="${build.classes}/bin.tgz">
<tarfileset dir="bin" mode="755"/>
</tar>
- <property name="jar.properties.list"
- value="commons-logging.properties, log4j.properties, hadoop-metrics.properties"/>
<jar jarfile="${build.dir}/${final.name}-core.jar"
basedir="${build.classes}">
<manifest>
@@ -561,8 +557,9 @@
<attribute name="Implementation-Vendor" value="Apache"/>
</section>
</manifest>
- <fileset dir="${conf.dir}" includes="${jar.properties.list}" />
- <fileset file="${jar.extra.properties.list}" />
+ <fileset file="${conf.dir}/commons-logging.properties"/>
+ <fileset file="${conf.dir}/log4j.properties"/>
+ <fileset file="${conf.dir}/hadoop-metrics.properties"/>
<zipfileset dir="${build.webapps}" prefix="webapps"/>
</jar>
</target>
@@ -719,76 +716,6 @@
</target>
<!-- ================================================================== -->
- <!-- Fault injection customization section.
- These targets ought to be copied over to other projects and modified
- as needed -->
- <!-- ================================================================== -->
- <target name="-classes-compilation" depends="compile-core-classes,
- compile-hdfs-classes, compile-mapred-classes, compile-core-test"/>
- <target name="run-test-core-fault-inject" depends="injectfaults"
- description="Run full set of the unit tests with fault injection">
- <macro-run-tests-fault-inject target.name="test-core"
- testcasesonly="false"/>
- </target>
-
- <target name="jar-test-fault-inject" depends="injectfaults"
- description="Make hadoop-test-fi.jar">
- <macro-jar-test-fault-inject
- target.name="jar-test"
- jar.final.name="test.final.name"
- jar.final.value="${test.final.name}-fi" />
- </target>
-
- <target name="jar-fault-inject" depends="injectfaults"
- description="Make hadoop-fi.jar">
- <macro-jar-fault-inject
- target.name="jar"
- jar.final.name="final.name"
- jar.final.value="${final.name}-fi" />
- </target>
-
- <!--This target is not included into the the top level list of target
- for it serves a special "regression" testing purpose of non-FI tests in
- FI environment -->
- <target name="run-fault-inject-with-testcaseonly" depends="injectfaults">
- <fail unless="testcase">Can't run this target without -Dtestcase setting!
- </fail>
- <macro-run-tests-fault-inject target.name="run-test-core"
- testcasesonly="true"/>
- </target>
- <!-- ================================================================== -->
- <!-- End of Fault injection customization section -->
- <!-- ================================================================== -->
-
- <condition property="tests.notestcase">
- <and>
- <isfalse value="${test.fault.inject}"/>
- <not>
- <isset property="testcase"/>
- </not>
- </and>
- </condition>
- <condition property="tests.notestcase.fi">
- <and>
- <not>
- <isset property="testcase" />
- </not>
- <istrue value="${test.fault.inject}" />
- </and>
- </condition>
- <condition property="tests.testcase">
- <and>
- <isfalse value="${test.fault.inject}" />
- <isset property="testcase" />
- </and>
- </condition>
- <condition property="tests.testcase.fi">
- <and>
- <istrue value="${test.fault.inject}" />
- <isset property="testcase" />
- </and>
- </condition>
- <!-- ================================================================== -->
<!-- Run unit tests -->
<!-- ================================================================== -->
<target name="test-core" depends="jar-test" description="Run core unit tests">
@@ -800,8 +727,6 @@
<mkdir dir="${test.log.dir}"/>
<copy file="${test.src.dir}/hadoop-policy.xml"
todir="${test.build.extraconf}" />
- <copy file="${test.src.dir}/fi-site.xml"
- todir="${test.build.extraconf}" />
<junit showoutput="${test.output}"
printsummary="${test.junit.printsummary}"
haltonfailure="${test.junit.haltonfailure}"
@@ -832,29 +757,13 @@
<propertyref name="compile.c++"/>
</syspropertyset>
<classpath refid="${test.classpath.id}"/>
- <syspropertyset id="FaultProbabilityProperties">
- <propertyref regex="fi.*"/>
- </syspropertyset>
<formatter type="${test.junit.output.format}" />
- <batchtest todir="${test.build.dir}" if="tests.notestcase">
+ <batchtest todir="${test.build.dir}" unless="testcase">
<fileset dir="${test.src.dir}"
- includes="**/${test.include}.java"
- excludes="**/${test.exclude}.java" />
- </batchtest>
- <batchtest todir="${test.build.dir}" if="tests.notestcase.fi">
- <fileset dir="${test.src.dir}/aop"
- includes="**/${test.include}.java"
- excludes="**/${test.exclude}.java" />
+ includes="**/${test.include}.java"
+ excludes="**/${test.exclude}.java" />
</batchtest>
- <batchtest todir="${test.build.dir}" if="tests.testcase">
- <fileset dir="${test.src.dir}" includes="**/${testcase}.java"/>
- </batchtest>
- <batchtest todir="${test.build.dir}" if="tests.testcase.fi">
- <fileset dir="${test.src.dir}/aop" includes="**/${testcase}.java"/>
- </batchtest>
- <!--The following batch is for very special occasions only when
- a non-FI tests are needed to be executed against FI-environment -->
- <batchtest todir="${test.build.dir}" if="tests.testcaseonly">
+ <batchtest todir="${test.build.dir}" if="testcase">
<fileset dir="${test.src.dir}" includes="**/${testcase}.java"/>
</batchtest>
</junit>
@@ -874,14 +783,7 @@
</subant>
</target>
- <target name="test" description="Run core, contrib, fault injection tests">
- <delete file="${test.build.dir}/testsfailed"/>
- <property name="continueOnFailure" value="true"/>
- <antcall target="test-core"/>
- <antcall target="test-contrib"/>
- <antcall target="run-test-core-fault-inject"/>
- <available file="${test.build.dir}/testsfailed" property="testsfailed"/>
- <fail if="testsfailed">Tests failed!</fail>
+ <target name="test" depends="test-core, test-contrib" description="Run core, contrib unit tests">
</target>
<!-- Run all unit tests, not just Test*, and use non-test configuration. -->
@@ -1381,7 +1283,7 @@
<!-- ================================================================== -->
<!-- Clean. Delete the build files, and their directories -->
<!-- ================================================================== -->
- <target name="clean" depends="clean-contrib, clean-fi" description="Clean. Delete the build files, and their directories">
+ <target name="clean" depends="clean-contrib" description="Clean. Delete the build files, and their directories">
<delete dir="${build.dir}"/>
<delete dir="${docs.src}/build"/>
<delete dir="${src.docs.cn}/build"/>
Modified: hadoop/common/branches/branch-0.20-security-patches/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/ivy.xml?rev=1077144&r1=1077143&r2=1077144&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/ivy.xml (original)
+++ hadoop/common/branches/branch-0.20-security-patches/ivy.xml Fri Mar 4 03:45:37 2011
@@ -260,17 +260,7 @@
name="jackson-mapper-asl"
rev="1.0.1"
conf="common->default"/>
- <dependency org="org.aspectj"
- name="aspectjrt"
- rev="${aspectj.version}"
- conf="common->default">
- </dependency>
- <dependency org="org.aspectj"
- name="aspectjtools"
- rev="${aspectj.version}"
- conf="common->default">
- </dependency>
- <dependency org="org.mockito"
+ <dependency org="org.mockito"
name="mockito-all"
rev="${mockito-all.version}"
conf="common->default">
Modified: hadoop/common/branches/branch-0.20-security-patches/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/ivy/libraries.properties?rev=1077144&r1=1077143&r2=1077144&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/ivy/libraries.properties (original)
+++ hadoop/common/branches/branch-0.20-security-patches/ivy/libraries.properties Fri Mar 4 03:45:37 2011
@@ -19,8 +19,6 @@ hadoop.version=0.20.0
#These are the versions of our dependencies (in alphabetical order)
apacheant.version=1.7.0
-aspectj.version=1.6.5
-
checkstyle.version=4.2
commons-cli.version=1.2
Modified: hadoop/common/branches/branch-0.20-security-patches/src/contrib/vaidya/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/contrib/vaidya/build.xml?rev=1077144&r1=1077143&r2=1077144&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/contrib/vaidya/build.xml (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/contrib/vaidya/build.xml Fri Mar 4 03:45:37 2011
@@ -20,6 +20,7 @@
<project name="vaidya" default="jar">
<import file="../build-contrib.xml" />
+ <import file="../../../build.xml" />
<target name="init">
<mkdir dir="${build.dir}" />
Modified: hadoop/common/branches/branch-0.20-security-patches/src/saveVersion.sh
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/saveVersion.sh?rev=1077144&r1=1077143&r2=1077144&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/saveVersion.sh (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/saveVersion.sh Fri Mar 4 03:45:37 2011
@@ -21,7 +21,6 @@
unset LANG
unset LC_CTYPE
version=$1
-build_dir=$2
user=`whoami`
date=`date`
if [ -d .git ]; then
@@ -33,7 +32,7 @@ else
revision=`svn info | sed -n -e 's/Last Changed Rev: \(.*\)/\1/p'`
url=`svn info | sed -n -e 's/URL: \(.*\)/\1/p'`
fi
-mkdir -p $build_dir/src/org/apache/hadoop
+mkdir -p build/src/org/apache/hadoop
cat << EOF | \
sed -e "s/VERSION/$version/" -e "s/USER/$user/" -e "s/DATE/$date/" \
-e "s|URL|$url|" -e "s/REV/$revision/" \