svn commit: r1423998 - in /oozie/trunk: core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java release-log.txt

[rk...@apache.org]

Author: rkanter
Date: Wed Dec 19 18:18:58 2012
New Revision: 1423998

URL: http://svn.apache.org/viewvc?rev=1423998&view=rev
Log:
OOZIE-1137 In light of federation use actionLibPath instead of appPath (vaidya via rkanter)

Modified:
    oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
    oozie/trunk/release-log.txt

Modified: oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java?rev=1423998&r1=1423997&r2=1423998&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java Wed Dec 19 18:18:58 2012
@@ -389,7 +389,7 @@ public class JavaActionExecutor extends 
         }
     }
 
-    protected void addShareLib(Path appPath, Configuration conf, String actionShareLibName)
+    protected void addShareLib(Configuration conf, String actionShareLibName)
     throws ActionExecutorException {
         if (actionShareLibName != null) {
             try {
@@ -398,11 +398,11 @@ public class JavaActionExecutor extends 
                     Path actionLibPath = new Path(systemLibPath, actionShareLibName);
                     String user = conf.get("user.name");
                     FileSystem fs =
-                        Services.get().get(HadoopAccessorService.class).createFileSystem(user, appPath.toUri(), conf);
+                        Services.get().get(HadoopAccessorService.class).createFileSystem(user, actionLibPath.toUri(), conf);
                     if (fs.exists(actionLibPath)) {
                         FileStatus[] files = fs.listStatus(actionLibPath);
                         for (FileStatus file : files) {
-                            addToCache(conf, appPath, file.getPath().toUri().getPath(), false);
+                            addToCache(conf, actionLibPath, file.getPath().toUri().getPath(), false);
                         }
                     }
                 }
@@ -482,19 +482,19 @@ public class JavaActionExecutor extends 
             }
         }
 
-        addAllShareLibs(appPath, conf, context, actionXml);
+        addAllShareLibs(conf, context, actionXml);
 	}
 
     // Adds action specific share libs and common share libs
-    private void addAllShareLibs(Path appPath, Configuration conf, Context context, Element actionXml)
+    private void addAllShareLibs(Configuration conf, Context context, Element actionXml)
             throws ActionExecutorException {
         // Add action specific share libs
-        addActionShareLib(appPath, conf, context, actionXml);
+        addActionShareLib(conf, context, actionXml);
         // Add common sharelibs for Oozie
-        addShareLib(appPath, conf, JavaActionExecutor.OOZIE_COMMON_LIBDIR);
+        addShareLib(conf, JavaActionExecutor.OOZIE_COMMON_LIBDIR);
     }
 
-    private void addActionShareLib(Path appPath, Configuration conf, Context context, Element actionXml) throws ActionExecutorException {
+    private void addActionShareLib(Configuration conf, Context context, Element actionXml) throws ActionExecutorException {
         XConfiguration wfJobConf = null;
         try {
             wfJobConf = new XConfiguration(new StringReader(context.getWorkflow().getConf()));
@@ -506,7 +506,7 @@ public class JavaActionExecutor extends 
         // Action sharelibs are only added if user has specified to use system libpath
         if (wfJobConf.getBoolean(OozieClient.USE_SYSTEM_LIBPATH, false)) {
             // add action specific sharelibs
-            addShareLib(appPath, conf, getShareLibName(context, actionXml, conf));
+            addShareLib(conf, getShareLibName(context, actionXml, conf));
         }
     }
 

Modified: oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1423998&r1=1423997&r2=1423998&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Wed Dec 19 18:18:58 2012
@@ -1,5 +1,6 @@
 -- Oozie 3.4.0 release (trunk - unreleased)
 
+OOZIE-1137 In light of federation use actionLibPath instead of appPath (vaidya via rkanter)
 OOZIE-1126 see if checkstyle works for oozie development. (jaoki via rkanter)
 OOZIE-1124 Split pig unit tests to a separate module (rohini via virag)
 OOZIE-1087 Remove requirement of hive-default.xml from Hive action (rkanter)