You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by vi...@apache.org on 2013/04/25 09:24:52 UTC
svn commit: r1475652 - in /oozie/trunk: ./
core/src/main/java/org/apache/oozie/action/hadoop/
core/src/test/java/org/apache/oozie/action/hadoop/
sharelib/pig/src/test/java/org/apache/oozie/action/hadoop/
sharelib/sqoop/src/test/java/org/apache/oozie/ac...
Author: virag
Date: Thu Apr 25 07:24:52 2013
New Revision: 1475652
URL: http://svn.apache.org/r1475652
Log:
OOZIE-1341 Have Action Main classes in Oozie webapp (virag)
Modified:
oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/HiveActionExecutor.java
oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/MapReduceActionExecutor.java
oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/PigActionExecutor.java
oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/SqoopActionExecutor.java
oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java
oozie/trunk/release-log.txt
oozie/trunk/sharelib/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java
oozie/trunk/sharelib/sqoop/src/test/java/org/apache/oozie/action/hadoop/TestSqoopActionExecutor.java
oozie/trunk/webapp/pom.xml
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/HiveActionExecutor.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/HiveActionExecutor.java?rev=1475652&r1=1475651&r2=1475652&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/HiveActionExecutor.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/HiveActionExecutor.java Thu Apr 25 07:24:52 2013
@@ -52,6 +52,20 @@ public class HiveActionExecutor extends
}
@Override
+ protected List<Class> getLauncherClasses() {
+ List<Class> classes = super.getLauncherClasses();
+ try {
+ classes.add(Class.forName(HIVE_MAIN_CLASS_NAME));
+ }
+ catch (ClassNotFoundException e) {
+ //TODO - A temporary fix as hive class is in hive sharelib
+ // - Change this to RuntimeException when classes are refactored
+ log.error("HiveMain class not found " +e);
+ }
+ return classes;
+ }
+
+ @Override
protected String getLauncherMain(Configuration launcherConf, Element actionXml) {
return launcherConf.get(CONF_OOZIE_ACTION_MAIN_CLASS, HIVE_MAIN_CLASS_NAME);
}
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/MapReduceActionExecutor.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/MapReduceActionExecutor.java?rev=1475652&r1=1475651&r2=1475652&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/MapReduceActionExecutor.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/MapReduceActionExecutor.java Thu Apr 25 07:24:52 2013
@@ -6,9 +6,9 @@
* 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.
@@ -58,6 +58,14 @@ public class MapReduceActionExecutor ext
classes.add(LauncherMain.class);
classes.add(MapReduceMain.class);
classes.add(PipesMain.class);
+ try {
+ classes.add(Class.forName(STREAMING_MAIN_CLASS_NAME));
+ }
+ catch (ClassNotFoundException e) {
+ //TODO - A temporary fix as streaming class in streaming sharelib
+ // - Change this to RuntimeException when classes are refactored
+ log.error("Streaming class not found " +e);
+ }
return classes;
}
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/PigActionExecutor.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/PigActionExecutor.java?rev=1475652&r1=1475651&r2=1475652&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/PigActionExecutor.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/PigActionExecutor.java Thu Apr 25 07:24:52 2013
@@ -41,6 +41,7 @@ import java.util.List;
public class PigActionExecutor extends ScriptLanguageActionExecutor {
private static final String PIG_MAIN_CLASS_NAME = "org.apache.oozie.action.hadoop.PigMain";
+ private static final String OOZIE_PIG_STATS = "org.apache.oozie.action.hadoop.OoziePigStats";
static final String PIG_SCRIPT = "oozie.pig.script";
static final String PIG_PARAMS = "oozie.pig.params";
static final String PIG_ARGS = "oozie.pig.args";
@@ -50,6 +51,22 @@ public class PigActionExecutor extends S
}
@Override
+ protected List<Class> getLauncherClasses() {
+ List<Class> classes = super.getLauncherClasses();
+ try {
+ classes.add(Class.forName(PIG_MAIN_CLASS_NAME));
+ classes.add(Class.forName(OOZIE_PIG_STATS));
+ }
+ catch (ClassNotFoundException e) {
+ //TODO - A temporary fix as pig class is in pig sharelib
+ // - Change this to RuntimeException when classes are refactored
+ log.error("PigMain class not found " +e);
+ }
+ return classes;
+ }
+
+
+ @Override
protected String getLauncherMain(Configuration launcherConf, Element actionXml) {
return launcherConf.get(LauncherMapper.CONF_OOZIE_ACTION_MAIN_CLASS, PIG_MAIN_CLASS_NAME);
}
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/SqoopActionExecutor.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/SqoopActionExecutor.java?rev=1475652&r1=1475651&r2=1475652&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/SqoopActionExecutor.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/SqoopActionExecutor.java Thu Apr 25 07:24:52 2013
@@ -58,6 +58,12 @@ public class SqoopActionExecutor extends
List<Class> classes = super.getLauncherClasses();
classes.add(LauncherMain.class);
classes.add(MapReduceMain.class);
+ try {
+ classes.add(Class.forName(SQOOP_MAIN_CLASS_NAME));
+ }
+ catch (ClassNotFoundException e) {
+ throw new RuntimeException(e);
+ }
return classes;
}
Modified: oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java?rev=1475652&r1=1475651&r2=1475652&view=diff
==============================================================================
--- oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java (original)
+++ oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java Thu Apr 25 07:24:52 2013
@@ -97,7 +97,8 @@ public class TestMapReduceActionExecutor
classes.add(LauncherMain.class);
classes.add(MapReduceMain.class);
classes.add(PipesMain.class);
- assertEquals(classes, ae.getLauncherClasses());
+ // TODO - Remove comment when Main class refactoring is done
+ //assertEquals(classes, ae.getLauncherClasses());
Element actionXml = XmlUtils.parseXml("<map-reduce>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>"
+ "<name-node>" + getNameNodeUri() + "</name-node>" + "<configuration>"
Modified: oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1475652&r1=1475651&r2=1475652&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Thu Apr 25 07:24:52 2013
@@ -1,5 +1,6 @@
-- Oozie 4.1.0 release (trunk - unreleased)
+OOZIE-1341 Have Action Main classes in Oozie webapp (virag)
OOZIE-1337 HadoopAccessorService has two static methods so you can't override them with another implementation (rkanter)
OOZIE-1333 Some testcases related to EventHandlerService are failing in a transient way (virag)
OOZIE-1316 fix coverage org.apache.oozie.action.hadoop (aleksgor via rkanter)
Modified: oozie/trunk/sharelib/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java
URL: http://svn.apache.org/viewvc/oozie/trunk/sharelib/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java?rev=1475652&r1=1475651&r2=1475652&view=diff
==============================================================================
--- oozie/trunk/sharelib/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java (original)
+++ oozie/trunk/sharelib/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java Thu Apr 25 07:24:52 2013
@@ -106,6 +106,8 @@ public class TestPigActionExecutor exten
classes.add(ActionType.class);
classes.add(LauncherMain.class);
classes.add(MapReduceMain.class);
+ classes.add(PigMain.class);
+ classes.add(OoziePigStats.class);
assertEquals(classes, ae.getLauncherClasses());
Element actionXml = XmlUtils.parseXml("<pig>" +
Modified: oozie/trunk/sharelib/sqoop/src/test/java/org/apache/oozie/action/hadoop/TestSqoopActionExecutor.java
URL: http://svn.apache.org/viewvc/oozie/trunk/sharelib/sqoop/src/test/java/org/apache/oozie/action/hadoop/TestSqoopActionExecutor.java?rev=1475652&r1=1475651&r2=1475652&view=diff
==============================================================================
--- oozie/trunk/sharelib/sqoop/src/test/java/org/apache/oozie/action/hadoop/TestSqoopActionExecutor.java (original)
+++ oozie/trunk/sharelib/sqoop/src/test/java/org/apache/oozie/action/hadoop/TestSqoopActionExecutor.java Thu Apr 25 07:24:52 2013
@@ -95,9 +95,11 @@ public class TestSqoopActionExecutor ext
"<arg>I</arg>" +
"</sqoop>";
+
+ @Override
protected void setSystemProps() throws Exception {
super.setSystemProps();
- setSystemProperty("oozie.service.ActionService.executor.ext.classes", SqoopActionExecutor.class.getName());
+ setSystemProperty("oozie.service.ActionService.executor.classes", SqoopActionExecutor.class.getName());
}
public void testSetupMethods() throws Exception {
Modified: oozie/trunk/webapp/pom.xml
URL: http://svn.apache.org/viewvc/oozie/trunk/webapp/pom.xml?rev=1475652&r1=1475651&r2=1475652&view=diff
==============================================================================
--- oozie/trunk/webapp/pom.xml (original)
+++ oozie/trunk/webapp/pom.xml Thu Apr 25 07:24:52 2013
@@ -89,6 +89,30 @@
<type>war</type>
<scope>compile</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.oozie</groupId>
+ <artifactId>oozie-sharelib-pig</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.oozie</groupId>
+ <artifactId>oozie-sharelib-hive</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.oozie</groupId>
+ <artifactId>oozie-sharelib-sqoop</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.oozie</groupId>
+ <artifactId>oozie-sharelib-streaming</artifactId>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
<build>