hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c..@apache.org
Subject svn commit: r947882 - in /hadoop/common/trunk: CHANGES.txt build.xml ivy/hadoop-core-instrumented-template.xml ivy/hadoop-core-system-template.xml ivy/hadoop-core-system.pom ivy/hadoop-core-system.xml src/test/aop/build/aop.xml
Date Tue, 25 May 2010 01:00:14 GMT
Author: cos
Date: Tue May 25 01:00:14 2010
New Revision: 947882

URL: http://svn.apache.org/viewvc?rev=947882&view=rev
Log:
HADOOP-6771. Herriot's artifact id for Maven deployment should be set to
hadoop-core-instrumented. Contributed by Konstantin Boudnik.

Added:
    hadoop/common/trunk/ivy/hadoop-core-instrumented-template.xml
Removed:
    hadoop/common/trunk/ivy/hadoop-core-system-template.xml
    hadoop/common/trunk/ivy/hadoop-core-system.pom
    hadoop/common/trunk/ivy/hadoop-core-system.xml
Modified:
    hadoop/common/trunk/CHANGES.txt
    hadoop/common/trunk/build.xml
    hadoop/common/trunk/src/test/aop/build/aop.xml

Modified: hadoop/common/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/CHANGES.txt?rev=947882&r1=947881&r2=947882&view=diff
==============================================================================
--- hadoop/common/trunk/CHANGES.txt (original)
+++ hadoop/common/trunk/CHANGES.txt Tue May 25 01:00:14 2010
@@ -336,6 +336,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).
 

Modified: hadoop/common/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/build.xml?rev=947882&r1=947881&r2=947882&view=diff
==============================================================================
--- hadoop/common/trunk/build.xml (original)
+++ hadoop/common/trunk/build.xml Tue May 25 01:00:14 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>

Added: hadoop/common/trunk/ivy/hadoop-core-instrumented-template.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/ivy/hadoop-core-instrumented-template.xml?rev=947882&view=auto
==============================================================================
--- hadoop/common/trunk/ivy/hadoop-core-instrumented-template.xml (added)
+++ hadoop/common/trunk/ivy/hadoop-core-instrumented-template.xml Tue May 25 01:00:14 2010
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.hadoop</groupId>
+  <artifactId>hadoop-core-instrumented</artifactId>
+  <packaging>jar</packaging>
+  <version>@version</version>
+  <dependencies>
+   <dependency>
+      <groupId>commons-cli</groupId>
+      <artifactId>commons-cli</artifactId>
+      <version>1.2</version>
+    </dependency>
+   <dependency>
+      <groupId>xmlenc</groupId>
+      <artifactId>xmlenc</artifactId>
+      <version>0.52</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-httpclient</groupId>
+      <artifactId>commons-httpclient</artifactId>
+      <version>3.0.1</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>1.4</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-net</groupId>
+      <artifactId>commons-net</artifactId>
+      <version>1.4.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jetty</artifactId>
+      <version>6.1.14</version>
+    </dependency>
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jetty-util</artifactId>
+      <version>6.1.14</version>
+    </dependency>
+    <dependency>
+      <groupId>tomcat</groupId>
+      <artifactId>jasper-runtime</artifactId>
+      <version>5.5.12</version>
+    </dependency>
+    <dependency>
+      <groupId>tomcat</groupId>
+      <artifactId>jasper-compiler</artifactId>
+      <version>5.5.12</version>
+    </dependency>
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jsp-api-2.1</artifactId>
+      <version>6.1.14</version>
+    </dependency>
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jsp-2.1</artifactId>
+      <version>6.1.14</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-el</groupId>
+      <artifactId>commons-el</artifactId>
+      <version>1.0</version>
+    </dependency>
+    <dependency>
+      <groupId>net.java.dev.jets3t</groupId>
+      <artifactId>jets3t</artifactId>
+      <version>0.7.1</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-net</groupId>
+      <artifactId>commons-net</artifactId>
+      <version>1.4.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>servlet-api-2.5</artifactId>
+      <version>6.1.14</version>
+    </dependency>
+    <dependency>
+      <groupId>net.sf.kosmosfs</groupId>
+      <artifactId>kfs</artifactId>
+      <version>0.3</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.5</version>
+    </dependency>
+    <dependency>
+      <groupId>hsqldb</groupId>
+      <artifactId>hsqldb</artifactId>
+      <version>1.8.0.10</version>
+    </dependency>
+    <dependency>
+      <groupId>oro</groupId>
+      <artifactId>oro</artifactId>
+      <version>2.0.8</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>avro</artifactId>
+      <version>1.3.0</version>
+    </dependency>
+  </dependencies>
+</project>

Modified: hadoop/common/trunk/src/test/aop/build/aop.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/test/aop/build/aop.xml?rev=947882&r1=947881&r2=947882&view=diff
==============================================================================
--- hadoop/common/trunk/src/test/aop/build/aop.xml (original)
+++ hadoop/common/trunk/src/test/aop/build/aop.xml Tue May 25 01:00:14 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>



Mime
View raw message