hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject svn commit: r806259 - in /hadoop/common/branches/HADOOP-6194: ./ CHANGES.txt build.xml ivybuild.xml src/contrib/ec2/ src/docs/ src/java/ src/java/org/apache/hadoop/ipc/RPC.java src/test/core/
Date Thu, 20 Aug 2009 17:11:01 GMT
Author: stevel
Date: Thu Aug 20 17:11:00 2009
New Revision: 806259

URL: http://svn.apache.org/viewvc?rev=806259&view=rev
Log:
HADOOP-6194 service lifecycle base classes

Modified:
    hadoop/common/branches/HADOOP-6194/   (props changed)
    hadoop/common/branches/HADOOP-6194/CHANGES.txt   (props changed)
    hadoop/common/branches/HADOOP-6194/build.xml
    hadoop/common/branches/HADOOP-6194/ivybuild.xml
    hadoop/common/branches/HADOOP-6194/src/contrib/ec2/   (props changed)
    hadoop/common/branches/HADOOP-6194/src/docs/   (props changed)
    hadoop/common/branches/HADOOP-6194/src/java/   (props changed)
    hadoop/common/branches/HADOOP-6194/src/java/org/apache/hadoop/ipc/RPC.java
    hadoop/common/branches/HADOOP-6194/src/test/core/   (props changed)

Propchange: hadoop/common/branches/HADOOP-6194/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 20 17:11:00 2009
@@ -1 +1,2 @@
+/hadoop/common/trunk:804966-805825
 /hadoop/core/branches/branch-0.19/core:713112

Propchange: hadoop/common/branches/HADOOP-6194/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 20 17:11:00 2009
@@ -1,3 +1,4 @@
+/hadoop/common/trunk/CHANGES.txt:804966-805825
 /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/HADOOP-6194/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HADOOP-6194/build.xml?rev=806259&r1=806258&r2=806259&view=diff
==============================================================================
--- hadoop/common/branches/HADOOP-6194/build.xml (original)
+++ hadoop/common/branches/HADOOP-6194/build.xml Thu Aug 20 17:11:00 2009
@@ -17,7 +17,7 @@
    limitations under the License.
 -->
 
-<project name="Hadoop-Core" default="compile" 
+<project name="hadoop-core" default="compile" 
    xmlns:ivy="antlib:org.apache.ivy.ant"> 
 
   <!-- Load all the default properties, and any the user wants    -->

Modified: hadoop/common/branches/HADOOP-6194/ivybuild.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HADOOP-6194/ivybuild.xml?rev=806259&r1=806258&r2=806259&view=diff
==============================================================================
--- hadoop/common/branches/HADOOP-6194/ivybuild.xml (original)
+++ hadoop/common/branches/HADOOP-6194/ivybuild.xml Thu Aug 20 17:11:00 2009
@@ -26,7 +26,7 @@
 
   <!--Override point: allow for overridden in properties to be loaded-->
   <property file="build.properties" />
-
+  <property file="../build.properties" />
 
   <target name="ivy-init-properties" >
     <property name="ivy.dir" location="ivy" />
@@ -40,8 +40,11 @@
     <property name="build.ivy.lib.dir" location="${build.ivy.dir}/lib" />
     <property name="build.ivy.report.dir" location="${build.ivy.dir}/report" />
     <property name="build.ivy.maven.dir" location="${build.ivy.dir}/maven" />
-    <property name="build.ivy.maven.pom" location="${build.ivy.maven.dir}/hadoop-core-${hadoop.version}.pom"
/>
-    <property name="build.ivy.maven.jar" location="${build.ivy.maven.dir}/hadoop-core-${hadoop.version}.jar"
/>
+    <property name="module" value="common" />
+    <property name="build.ivy.maven.pom"
+      location="${build.ivy.maven.dir}/hadoop-${module}-${hadoop.version}.pom" />
+    <property name="build.ivy.maven.jar"
+      location="${build.ivy.maven.dir}/hadoop-${module}-${hadoop.version}.jar" />
 
     <!--this is the naming policy for artifacts we want pulled down-->
     <property name="ivy.artifact.retrieve.pattern"
@@ -50,7 +53,7 @@
     <property name="ivy.publish.pattern"
       value="hadoop-[revision]-core.[ext]"/>
     <property name="hadoop.jar"
-      location="${build.dir}/hadoop-${hadoop.version}-core.jar" />
+      location="${build.dir}/hadoop-${hadoop.version}-${module}.jar" />    
 
     <!--preset to build down; puts us in control of version naming-->
     <presetdef name="delegate">
@@ -258,8 +261,9 @@
       </exec>
     </presetdef>
     <property name="issue" value="HADOOP-6194"/>
+    <property name="hadoop.svn.host" value="svn.apache.org" />
     <property name="hadoop-svn"
-        value="https://svn.apache.org/repos/asf/hadoop/common"/>
+      value="https://${hadoop.svn.host}/repos/asf/hadoop/common"/>
     <property name="trunk"
         value="${hadoop-svn}/trunk"/>
     <property name="branch"
@@ -267,7 +271,8 @@
     <property name="patches.dir" location="../outgoing"/>
     <mkdir dir="${patches.dir}" />
     <property name="patch.version" value="1" />
-    <property name="patch.file" location="${patches.dir}/${issue}-${patch.version}.patch"
/>
+    <property name="patch.file" 
+      location="${patches.dir}/${issue}-${patch.version}.patch" />
   </target>
 
   <target name="svn-merge" depends="svn-init"

Propchange: hadoop/common/branches/HADOOP-6194/src/contrib/ec2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 20 17:11:00 2009
@@ -1,2 +1,3 @@
+/hadoop/common/trunk/src/contrib/ec2:804966-805825
 /hadoop/core/branches/branch-0.19/core/src/contrib/ec2:713112
 /hadoop/core/trunk/src/contrib/ec2:776175-784663

Propchange: hadoop/common/branches/HADOOP-6194/src/docs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 20 17:11:00 2009
@@ -1 +1,3 @@
+/hadoop/common/trunk/src/docs:804966-805825
+/hadoop/core/branches/HADOOP-4687/core/src/docs:776175-786719
 /hadoop/core/branches/branch-0.19/src/docs:713112

Propchange: hadoop/common/branches/HADOOP-6194/src/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 20 17:11:00 2009
@@ -1,2 +1,3 @@
+/hadoop/common/trunk/src/java:804966-805825
 /hadoop/core/branches/branch-0.19/core/src/java:713112
 /hadoop/core/trunk/src/core:776175-785643,785929-786278

Modified: hadoop/common/branches/HADOOP-6194/src/java/org/apache/hadoop/ipc/RPC.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HADOOP-6194/src/java/org/apache/hadoop/ipc/RPC.java?rev=806259&r1=806258&r2=806259&view=diff
==============================================================================
--- hadoop/common/branches/HADOOP-6194/src/java/org/apache/hadoop/ipc/RPC.java (original)
+++ hadoop/common/branches/HADOOP-6194/src/java/org/apache/hadoop/ipc/RPC.java Thu Aug 20
17:11:00 2009
@@ -305,7 +305,7 @@
    * @return the proxy
    * @throws IOException if the far end through a RemoteException
    */
-  static VersionedProtocol waitForProxy(
+  public static VersionedProtocol waitForProxy(
                       Class<? extends VersionedProtocol> protocol,
                                                long clientVersion,
                                                InetSocketAddress addr,

Propchange: hadoop/common/branches/HADOOP-6194/src/test/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 20 17:11:00 2009
@@ -1,2 +1,3 @@
+/hadoop/common/trunk/src/test/core:804966-805825
 /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