You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hdt.apache.org by ad...@apache.org on 2013/04/13 19:58:45 UTC
[1/5] git commit: findLaunchConfiguration is no longer called in the
JavaLaunchShortcut chain,
so switched to createConfiguration to correctly bring up the RunOnHadoopWizard
Updated Branches:
refs/heads/hadoop-2 be54915bd -> 1c9333b0c
findLaunchConfiguration is no longer called in the JavaLaunchShortcut
chain, so switched to createConfiguration to correctly bring up the
RunOnHadoopWizard
Project: http://git-wip-us.apache.org/repos/asf/incubator-hdt/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hdt/commit/1d8a2c9c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hdt/tree/1d8a2c9c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hdt/diff/1d8a2c9c
Branch: refs/heads/hadoop-2
Commit: 1d8a2c9c49c04da19992c8d006faf62a6bdd455a
Parents: be54915
Author: adamb <ad...@apache.org>
Authored: Fri Apr 12 13:44:39 2013 -0500
Committer: adamb <ad...@apache.org>
Committed: Fri Apr 12 13:44:39 2013 -0500
----------------------------------------------------------------------
.../launch/HadoopApplicationLaunchShortcut.java | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-hdt/blob/1d8a2c9c/org.apache.hdt.debug.core/src/org/apache/hdt/debug/core/launch/HadoopApplicationLaunchShortcut.java
----------------------------------------------------------------------
diff --git a/org.apache.hdt.debug.core/src/org/apache/hdt/debug/core/launch/HadoopApplicationLaunchShortcut.java b/org.apache.hdt.debug.core/src/org/apache/hdt/debug/core/launch/HadoopApplicationLaunchShortcut.java
index 0377571..bcf84e2 100644
--- a/org.apache.hdt.debug.core/src/org/apache/hdt/debug/core/launch/HadoopApplicationLaunchShortcut.java
+++ b/org.apache.hdt.debug.core/src/org/apache/hdt/debug/core/launch/HadoopApplicationLaunchShortcut.java
@@ -58,13 +58,9 @@ public class HadoopApplicationLaunchShortcut extends
/* @inheritDoc */
@Override
- protected ILaunchConfiguration findLaunchConfiguration(IType type,
- ILaunchConfigurationType configType) {
+ protected ILaunchConfiguration createConfiguration(IType type) {
- // Find an existing or create a launch configuration (Standard way)
- ILaunchConfiguration iConf =
- super.findLaunchConfiguration(type, configType);
- if (iConf == null) iConf = super.createConfiguration(type);
+ ILaunchConfiguration iConf = super.createConfiguration(type);
ILaunchConfigurationWorkingCopy iConfWC;
try {
/*
[3/5] git commit: need eclipse.ui.ide to make the programmatic action
handlers work
Posted by ad...@apache.org.
need eclipse.ui.ide to make the programmatic action handlers work
Project: http://git-wip-us.apache.org/repos/asf/incubator-hdt/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hdt/commit/766daf47
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hdt/tree/766daf47
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hdt/diff/766daf47
Branch: refs/heads/hadoop-2
Commit: 766daf4768a7d84c1614f7124d1dfa78c698e58a
Parents: 9dd95b2
Author: adamb <ad...@apache.org>
Authored: Fri Apr 12 13:58:23 2013 -0500
Committer: adamb <ad...@apache.org>
Committed: Fri Apr 12 13:58:23 2013 -0500
----------------------------------------------------------------------
org.apache.hdt.dfs.ui/META-INF/MANIFEST.MF | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-hdt/blob/766daf47/org.apache.hdt.dfs.ui/META-INF/MANIFEST.MF
----------------------------------------------------------------------
diff --git a/org.apache.hdt.dfs.ui/META-INF/MANIFEST.MF b/org.apache.hdt.dfs.ui/META-INF/MANIFEST.MF
index beb3b81..f4b1368 100644
--- a/org.apache.hdt.dfs.ui/META-INF/MANIFEST.MF
+++ b/org.apache.hdt.dfs.ui/META-INF/MANIFEST.MF
@@ -12,7 +12,8 @@ Require-Bundle: org.eclipse.ui,
org.apache.hdt.dfs.core,
org.eclipse.core.resources,
org.eclipse.ui.navigator,
- org.apache.hdt.ui
+ org.apache.hdt.ui,
+ org.eclipse.ui.ide
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.ui
[4/5] git commit: bin should never have been here
Posted by ad...@apache.org.
bin should never have been here
Project: http://git-wip-us.apache.org/repos/asf/incubator-hdt/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hdt/commit/d15590c5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hdt/tree/d15590c5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hdt/diff/d15590c5
Branch: refs/heads/hadoop-2
Commit: d15590c5c2ec820f65eb73276660a36401c3a552
Parents: 766daf4
Author: adamb <ad...@apache.org>
Authored: Fri Apr 12 14:00:04 2013 -0500
Committer: adamb <ad...@apache.org>
Committed: Fri Apr 12 14:00:04 2013 -0500
----------------------------------------------------------------------
.../bin/org/apache/hdt/dfs/ui/Activator.class | Bin 890 -> 0 bytes
1 files changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-hdt/blob/d15590c5/org.apache.hdt.dfs.ui/bin/org/apache/hdt/dfs/ui/Activator.class
----------------------------------------------------------------------
diff --git a/org.apache.hdt.dfs.ui/bin/org/apache/hdt/dfs/ui/Activator.class b/org.apache.hdt.dfs.ui/bin/org/apache/hdt/dfs/ui/Activator.class
deleted file mode 100644
index cacc268..0000000
Binary files a/org.apache.hdt.dfs.ui/bin/org/apache/hdt/dfs/ui/Activator.class and /dev/null differ
[5/5] git commit: Hadoop and dependency jars are all added from the
hadoop bundle rather than the location
Posted by ad...@apache.org.
Hadoop and dependency jars are all added from the hadoop bundle rather
than the location
Project: http://git-wip-us.apache.org/repos/asf/incubator-hdt/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hdt/commit/1c9333b0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hdt/tree/1c9333b0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hdt/diff/1c9333b0
Branch: refs/heads/hadoop-2
Commit: 1c9333b0c67ad0ee530e8c10c9a1aa3bc73b7fb8
Parents: d15590c
Author: adamb <ad...@apache.org>
Authored: Sat Apr 13 12:24:15 2013 -0500
Committer: adamb <ad...@apache.org>
Committed: Sat Apr 13 12:24:15 2013 -0500
----------------------------------------------------------------------
.../apache/hdt/core/natures/MapReduceNature.java | 53 +++++++--------
1 files changed, 24 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-hdt/blob/1c9333b0/org.apache.hdt.core/src/org/apache/hdt/core/natures/MapReduceNature.java
----------------------------------------------------------------------
diff --git a/org.apache.hdt.core/src/org/apache/hdt/core/natures/MapReduceNature.java b/org.apache.hdt.core/src/org/apache/hdt/core/natures/MapReduceNature.java
index ef9587e..b8999c8 100644
--- a/org.apache.hdt.core/src/org/apache/hdt/core/natures/MapReduceNature.java
+++ b/org.apache.hdt.core/src/org/apache/hdt/core/natures/MapReduceNature.java
@@ -20,6 +20,8 @@ package org.apache.hdt.core.natures;
import java.io.File;
import java.io.FileFilter;
+import java.io.IOException;
+import java.net.URISyntaxException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Iterator;
@@ -29,12 +31,15 @@ import java.util.logging.Logger;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IProjectNature;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.QualifiedName;
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
+import org.osgi.framework.Bundle;
import org.apache.hdt.core.Activator;
@@ -62,37 +67,27 @@ public class MapReduceNature implements IProjectNature {
String path =
project.getPersistentProperty(new QualifiedName(Activator.PLUGIN_ID,
"hadoop.runtime.path"));
+
+ Bundle hadoopBundle = Platform.getBundle("org.apache.hadoop.eclipse");
+ URL jarLib = hadoopBundle.getEntry("lib/");
+
+ File jarDir = null;
+ try {
+ jarDir = new File(FileLocator.resolve(jarLib).toURI());
+ } catch (URISyntaxException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ } catch (IOException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ }
+
+ File[] jars = jarDir.listFiles();
- File dir = new File(path);
final ArrayList<File> coreJars = new ArrayList<File>();
- dir.listFiles(new FileFilter() {
- public boolean accept(File pathname) {
- String fileName = pathname.getName();
-
- // get the hadoop core jar without touching test or examples
- // older version of hadoop don't use the word "core" -- eyhung
- if ((fileName.indexOf("hadoop") != -1) && (fileName.endsWith("jar"))
- && (fileName.indexOf("test") == -1)
- && (fileName.indexOf("examples") == -1)) {
- coreJars.add(pathname);
- }
-
- return false; // we don't care what this returns
- }
- });
- File dir2 = new File(path + File.separatorChar + "lib");
- if (dir2.exists() && dir2.isDirectory()) {
- dir2.listFiles(new FileFilter() {
- public boolean accept(File pathname) {
- if ((!pathname.isDirectory())
- && (pathname.getName().endsWith("jar"))) {
- coreJars.add(pathname);
- }
-
- return false; // we don't care what this returns
- }
- });
- }
+ for (File file : jars) {
+ coreJars.add(file);
+ }
// Add Hadoop libraries onto classpath
IJavaProject javaProject = JavaCore.create(getProject());
[2/5] git commit: rolled out HDT-20,
as the giant list of jars is actually needed
Posted by ad...@apache.org.
rolled out HDT-20, as the giant list of jars is actually needed
Project: http://git-wip-us.apache.org/repos/asf/incubator-hdt/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hdt/commit/9dd95b2d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hdt/tree/9dd95b2d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hdt/diff/9dd95b2d
Branch: refs/heads/hadoop-2
Commit: 9dd95b2daf88713fe627395d55e61150c55df1da
Parents: 1d8a2c9
Author: adamb <ad...@apache.org>
Authored: Fri Apr 12 13:53:45 2013 -0500
Committer: adamb <ad...@apache.org>
Committed: Fri Apr 12 13:53:45 2013 -0500
----------------------------------------------------------------------
.../apache/hdt/core/natures/MapReduceNature.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-hdt/blob/9dd95b2d/org.apache.hdt.core/src/org/apache/hdt/core/natures/MapReduceNature.java
----------------------------------------------------------------------
diff --git a/org.apache.hdt.core/src/org/apache/hdt/core/natures/MapReduceNature.java b/org.apache.hdt.core/src/org/apache/hdt/core/natures/MapReduceNature.java
index fd702d2..ef9587e 100644
--- a/org.apache.hdt.core/src/org/apache/hdt/core/natures/MapReduceNature.java
+++ b/org.apache.hdt.core/src/org/apache/hdt/core/natures/MapReduceNature.java
@@ -71,7 +71,7 @@ public class MapReduceNature implements IProjectNature {
// get the hadoop core jar without touching test or examples
// older version of hadoop don't use the word "core" -- eyhung
- if ((fileName.indexOf("hadoop-core") != -1) && (fileName.endsWith("jar"))
+ if ((fileName.indexOf("hadoop") != -1) && (fileName.endsWith("jar"))
&& (fileName.indexOf("test") == -1)
&& (fileName.indexOf("examples") == -1)) {
coreJars.add(pathname);
@@ -80,6 +80,19 @@ public class MapReduceNature implements IProjectNature {
return false; // we don't care what this returns
}
});
+ File dir2 = new File(path + File.separatorChar + "lib");
+ if (dir2.exists() && dir2.isDirectory()) {
+ dir2.listFiles(new FileFilter() {
+ public boolean accept(File pathname) {
+ if ((!pathname.isDirectory())
+ && (pathname.getName().endsWith("jar"))) {
+ coreJars.add(pathname);
+ }
+
+ return false; // we don't care what this returns
+ }
+ });
+ }
// Add Hadoop libraries onto classpath
IJavaProject javaProject = JavaCore.create(getProject());