hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c..@apache.org
Subject svn commit: r947884 - in /hadoop/common/branches/branch-0.21: ./ ivy/ src/contrib/ec2/ src/docs/ src/java/ src/test/aop/build/ src/test/core/
Date Tue, 25 May 2010 01:03:34 GMT
Author: cos
Date: Tue May 25 01:03:33 2010
New Revision: 947884

URL: http://svn.apache.org/viewvc?rev=947884&view=rev
Log:
HADDOP-6771. svn merge -c 947882 from trunk

Added:
    hadoop/common/branches/branch-0.21/ivy/hadoop-core-instrumented-template.xml
      - copied unchanged from r947882, hadoop/common/trunk/ivy/hadoop-core-instrumented-template.xml
Removed:
    hadoop/common/branches/branch-0.21/ivy/hadoop-core-system-template.xml
    hadoop/common/branches/branch-0.21/ivy/hadoop-core-system.pom
    hadoop/common/branches/branch-0.21/ivy/hadoop-core-system.xml
Modified:
    hadoop/common/branches/branch-0.21/   (props changed)
    hadoop/common/branches/branch-0.21/CHANGES.txt   (contents, props changed)
    hadoop/common/branches/branch-0.21/build.xml
    hadoop/common/branches/branch-0.21/src/contrib/ec2/   (props changed)
    hadoop/common/branches/branch-0.21/src/docs/   (props changed)
    hadoop/common/branches/branch-0.21/src/java/   (props changed)
    hadoop/common/branches/branch-0.21/src/test/aop/build/aop.xml
    hadoop/common/branches/branch-0.21/src/test/core/   (props changed)

Propchange: hadoop/common/branches/branch-0.21/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 25 01:03:33 2010
@@ -1,2 +1,2 @@
-/hadoop/common/trunk:944521,945941-945953,947218,947222
+/hadoop/common/trunk:944521,945941-945953,947218,947222,947882
 /hadoop/core/branches/branch-0.19/core:713112

Modified: hadoop/common/branches/branch-0.21/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.21/CHANGES.txt?rev=947884&r1=947883&r2=947884&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.21/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.21/CHANGES.txt Tue May 25 01:03:33 2010
@@ -294,6 +294,9 @@ Release 0.21.0 - Unreleased
 
   IMPROVEMENTS
 
+    HADOOP-6771. Herriot's artifact id for Maven deployment should be set to
+    hadoop-core-instrumented (cos)
+
     HADOOP-6752. Remote cluster control functionality needs JavaDocs
     improvement (Balaji Rajagopalan via cos).
 

Propchange: hadoop/common/branches/branch-0.21/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 25 01:03:33 2010
@@ -1,4 +1,4 @@
-/hadoop/common/trunk/CHANGES.txt:944521,945941-945953,947218,947222
+/hadoop/common/trunk/CHANGES.txt:944521,945941-945953,947218,947222,947882
 /hadoop/core/branches/branch-0.18/CHANGES.txt:727226
 /hadoop/core/branches/branch-0.19/CHANGES.txt:713112
 /hadoop/core/trunk/CHANGES.txt:776175-785643,785929-786278

Modified: hadoop/common/branches/branch-0.21/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.21/build.xml?rev=947884&r1=947883&r2=947884&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.21/build.xml (original)
+++ hadoop/common/branches/branch-0.21/build.xml Tue May 25 01:03:33 2010
@@ -1217,7 +1217,8 @@
      </artifact:install>
   </target>
 
-  <target name="mvn-deploy" depends="mvn-taskdef, jar, jar-test, set-version"
+  <target name="mvn-deploy" depends="mvn-taskdef, jar, jar-test, set-version,
+    -mvn-system-deploy"
      description="To deploy hadoop core and test jar's to apache snapshot's repository">
      <artifact:pom file="${hadoop-core.pom}" id="hadoop.core"/>
      <artifact:pom file="${hadoop-core-test.pom}" id="hadoop.core.test"/>
@@ -1238,14 +1239,18 @@
   <target name="set-version">
     <delete file="${basedir}/ivy/hadoop-core.xml"/>
     <delete file="${basedir}/ivy/hadoop-core-test.xml"/>
+    <delete file="${basedir}/ivy/hadoop-core-${herriot.suffix}.xml"/>
     <copy file="${basedir}/ivy/hadoop-core-template.xml" tofile="${basedir}/ivy/hadoop-core.xml"/>
     <copy file="${basedir}/ivy/hadoop-core-test-template.xml" tofile="${basedir}/ivy/hadoop-core-test.xml"/>
+    <copy file="${basedir}/ivy/hadoop-core-${herriot.suffix}-template.xml"
+      tofile="${basedir}/ivy/hadoop-core-${herriot.suffix}.xml"/>
     <replaceregexp byline="true">
       <regexp pattern="@version"/>
       <substitution expression="${version}"/>
       <fileset dir="${basedir}/ivy">
         <include name="hadoop-core.xml"/>
         <include name="hadoop-core-test.xml"/>
+        <include name="hadoop-core-${herriot.suffix}.xml"/>
       </fileset>
     </replaceregexp>
   </target>
@@ -1281,6 +1286,7 @@
     <delete dir="${build.dir}"/>
     <delete file="${basedir}/ivy/hadoop-core.xml"/>
     <delete file="${basedir}/ivy/hadoop-core-test.xml"/>
+    <delete file="${basedir}/ivy/hadoop-core-${herriot.suffix}.xml"/>
     <delete dir="${docs.src}/build"/>
     <delete dir="${src.docs.cn}/build"/>
   </target>

Propchange: hadoop/common/branches/branch-0.21/src/contrib/ec2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 25 01:03:33 2010
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/contrib/ec2:944521,945941-945953,947218,947222
+/hadoop/common/trunk/src/contrib/ec2:944521,945941-945953,947218,947222,947882
 /hadoop/core/branches/branch-0.19/core/src/contrib/ec2:713112
 /hadoop/core/trunk/src/contrib/ec2:776175-784663

Propchange: hadoop/common/branches/branch-0.21/src/docs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 25 01:03:33 2010
@@ -1,2 +1,2 @@
-/hadoop/common/trunk/src/docs:944521,945941-945953,947218,947222
+/hadoop/common/trunk/src/docs:944521,945941-945953,947218,947222,947882
 /hadoop/core/branches/branch-0.19/src/docs:713112

Propchange: hadoop/common/branches/branch-0.21/src/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 25 01:03:33 2010
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/java:944521,945941-945953,947218,947222
+/hadoop/common/trunk/src/java:944521,945941-945953,947218,947222,947882
 /hadoop/core/branches/branch-0.19/core/src/java:713112
 /hadoop/core/trunk/src/core:776175-785643,785929-786278

Modified: hadoop/common/branches/branch-0.21/src/test/aop/build/aop.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.21/src/test/aop/build/aop.xml?rev=947884&r1=947883&r2=947884&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.21/src/test/aop/build/aop.xml (original)
+++ hadoop/common/branches/branch-0.21/src/test/aop/build/aop.xml Tue May 25 01:03:33 2010
@@ -28,12 +28,13 @@
 
   <!-- Properties specifically for system fault-injections and system tests -->
 
-  <property name="hadoop-core-system.pom"
-            location="${ivy.dir}/hadoop-core-system.xml" />
-  <property name="hadoop-core-system.jar"
-            location="${system-test-build-dir}/${final.name}-system.jar" />
-  <property name="hadoop-core-system-sources.jar"
-            location="${system-test-build-dir}/${final.name}-system-sources.jar" />
+  <property name="herriot.suffix" value="instrumented"/>
+  <property name="hadoop-core-instrumented.pom"
+            location="${ivy.dir}/hadoop-core-${herriot.suffix}.xml" />
+  <property name="hadoop-core-instrumented.jar"
+            location="${system-test-build-dir}/${final.name}-${herriot.suffix}.jar" />
+  <property name="hadoop-core-instrumented-sources.jar"
+            location="${system-test-build-dir}/${final.name}-${herriot.suffix}-sources.jar"
/>
 
   <!--All Fault Injection (FI) related targets are located in this session -->
     
@@ -128,9 +129,9 @@
     <macro-jar-fault-inject target.name="jar"
       build.dir="${system-test-build-dir}"
       jar.final.name="final.name"
-      jar.final.value="${final.name}-system">
+      jar.final.value="${final.name}-${herriot.suffix}">
     </macro-jar-fault-inject>
-    <jar jarfile="${system-test-build-dir}/${final.name}-system-sources.jar"
+    <jar jarfile="${system-test-build-dir}/${final.name}-${herriot.suffix}-sources.jar"
       update="yes">
       <fileset dir="${test.src.dir}/system/java" includes="org/apache/hadoop/**/*.java"/>
       <fileset dir="${test.src.dir}/system/aop" includes="org/apache/hadoop/**/*.aj"/>
@@ -248,14 +249,26 @@
     </exec>
   </target>
   <!-- End of cluster controller binary target -->
-  <!-- Maven -->
 
+  <!-- Maven -->
   <target name="-mvn-system-install" depends="mvn-taskdef, jar-system">
-    <artifact:pom file="${hadoop-core-system.pom}" id="hadoop.core.system"/>
-    <artifact:install file="${hadoop-core-system.jar}">
-       <pom refid="hadoop.core.system"/>
-       <attach file="${hadoop-core-system-sources.jar}" classifier="sources" />
+    <artifact:pom file="${hadoop-core-instrumented.pom}" id="hadoop.core.${herriot.suffix}"/>
+    <artifact:install file="${hadoop-core-instrumented.jar}">
+       <pom refid="hadoop.core.${herriot.suffix}"/>
+       <attach file="${hadoop-core-instrumented-sources.jar}" classifier="sources" />
     </artifact:install>
   </target>
 
+  <target name="-mvn-system-deploy" depends="mvn-taskdef, jar-system">
+     <artifact:pom file="${hadoop-core-instrumented.pom}" 
+                   id="hadoop.core.${herriot.suffix}"/>
+
+     <artifact:install-provider artifactId="wagon-http" version="1.0-beta-2"/>
+     <artifact:deploy file="${hadoop-core-instrumented.jar}">
+         <remoteRepository id="apache.snapshots.https" url="${asfrepo}"/>
+         <pom refid="hadoop.core.${herriot.suffix}"/>
+	       <attach file="${hadoop-core-instrumented-sources.jar}" classifier="sources"/>

+     </artifact:deploy>
+  </target>
+  <!-- End of Maven -->
 </project>

Propchange: hadoop/common/branches/branch-0.21/src/test/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 25 01:03:33 2010
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/test/core:944521,945941-945953,947218,947222
+/hadoop/common/trunk/src/test/core:944521,945941-945953,947218,947222,947882
 /hadoop/core/branches/branch-0.19/core/src/test/core:713112
 /hadoop/core/trunk/src/test/core:776175-785643,785929-786278



Mime
View raw message