more moving of things to core, as well as runtime path issues
Project: http://git-wip-us.apache.org/repos/asf/incubator-hdt/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hdt/commit/464b2d76
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hdt/tree/464b2d76
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hdt/diff/464b2d76
Branch: refs/heads/master
Commit: 464b2d761b0ae6488c966da79c4d77ad98a286f7
Parents: 7f3cfde
Author: adamb <ad...@apache.org>
Authored: Mon Jan 28 13:58:24 2013 -0600
Committer: adamb <ad...@apache.org>
Committed: Mon Jan 28 13:58:24 2013 -0600
----------------------------------------------------------------------
org.apache.hadoop.eclipse/.classpath | 2 +-
org.apache.hadoop.eclipse/META-INF/MANIFEST.MF | 3 +-
org.apache.hadoop.eclipse/build.properties | 3 +-
org.apache.hadoop.eclipse/hadoop-core-1.0.4.jar | Bin 3928530 -> 0 bytes
.../lib/hadoop-core-1.0.4.jar | Bin 0 -> 3928530 bytes
org.apache.hdt.core/.classpath | 1 -
org.apache.hdt.core/META-INF/MANIFEST.MF | 3 +-
.../hdt/core/cluster/IHadoopClusterListener.java | 27 ++++++++++++++
.../hdt/ui/cluster/IHadoopClusterListener.java | 28 ---------------
.../org/apache/hdt/ui/cluster/ServerRegistry.java | 1 +
.../src/org/apache/hdt/ui/views/ClusterView.java | 2 +-
11 files changed, 35 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-hdt/blob/464b2d76/org.apache.hadoop.eclipse/.classpath
----------------------------------------------------------------------
diff --git a/org.apache.hadoop.eclipse/.classpath b/org.apache.hadoop.eclipse/.classpath
index 8b07870..3354a37 100644
--- a/org.apache.hadoop.eclipse/.classpath
+++ b/org.apache.hadoop.eclipse/.classpath
@@ -3,6 +3,6 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="lib" path="hadoop-core-1.0.4.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/hadoop-core-1.0.4.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
http://git-wip-us.apache.org/repos/asf/incubator-hdt/blob/464b2d76/org.apache.hadoop.eclipse/META-INF/MANIFEST.MF
----------------------------------------------------------------------
diff --git a/org.apache.hadoop.eclipse/META-INF/MANIFEST.MF b/org.apache.hadoop.eclipse/META-INF/MANIFEST.MF
index e074ebe..eb241fd 100644
--- a/org.apache.hadoop.eclipse/META-INF/MANIFEST.MF
+++ b/org.apache.hadoop.eclipse/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: OSGi Hadoop Bungle
+Bundle-Name: OSGi Hadoop Bundle
Bundle-SymbolicName: org.apache.hadoop.eclipse
Bundle-Version: 0.0.0
Bundle-Vendor: Apache Software Foundation
@@ -103,3 +103,4 @@ Export-Package: org.apache.hadoop,
org.apache.hadoop.util,
org.apache.hadoop.util.bloom,
org.apache.hadoop.util.hash
+Bundle-ClassPath: lib/hadoop-core-1.0.4.jar
http://git-wip-us.apache.org/repos/asf/incubator-hdt/blob/464b2d76/org.apache.hadoop.eclipse/build.properties
----------------------------------------------------------------------
diff --git a/org.apache.hadoop.eclipse/build.properties b/org.apache.hadoop.eclipse/build.properties
index 34d2e4d..9b6f741 100644
--- a/org.apache.hadoop.eclipse/build.properties
+++ b/org.apache.hadoop.eclipse/build.properties
@@ -1,4 +1,3 @@
-source.. = src/
output.. = bin/
bin.includes = META-INF/,\
- .
+ lib/hadoop-core-1.0.4.jar
http://git-wip-us.apache.org/repos/asf/incubator-hdt/blob/464b2d76/org.apache.hadoop.eclipse/hadoop-core-1.0.4.jar
----------------------------------------------------------------------
diff --git a/org.apache.hadoop.eclipse/hadoop-core-1.0.4.jar b/org.apache.hadoop.eclipse/hadoop-core-1.0.4.jar
deleted file mode 100644
index deebcab..0000000
Binary files a/org.apache.hadoop.eclipse/hadoop-core-1.0.4.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-hdt/blob/464b2d76/org.apache.hadoop.eclipse/lib/hadoop-core-1.0.4.jar
----------------------------------------------------------------------
diff --git a/org.apache.hadoop.eclipse/lib/hadoop-core-1.0.4.jar b/org.apache.hadoop.eclipse/lib/hadoop-core-1.0.4.jar
new file mode 100644
index 0000000..deebcab
Binary files /dev/null and b/org.apache.hadoop.eclipse/lib/hadoop-core-1.0.4.jar differ
http://git-wip-us.apache.org/repos/asf/incubator-hdt/blob/464b2d76/org.apache.hdt.core/.classpath
----------------------------------------------------------------------
diff --git a/org.apache.hdt.core/.classpath b/org.apache.hdt.core/.classpath
index 355df07..ad32c83 100644
--- a/org.apache.hdt.core/.classpath
+++ b/org.apache.hdt.core/.classpath
@@ -3,6 +3,5 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="lib" path="/Users/amberry/tools/hadoop-1.0.4/hadoop-core-1.0.4.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
http://git-wip-us.apache.org/repos/asf/incubator-hdt/blob/464b2d76/org.apache.hdt.core/META-INF/MANIFEST.MF
----------------------------------------------------------------------
diff --git a/org.apache.hdt.core/META-INF/MANIFEST.MF b/org.apache.hdt.core/META-INF/MANIFEST.MF
index af22705..a9547a3 100644
--- a/org.apache.hdt.core/META-INF/MANIFEST.MF
+++ b/org.apache.hdt.core/META-INF/MANIFEST.MF
@@ -13,7 +13,8 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.swt,
org.eclipse.jface,
org.eclipse.ui,
- org.eclipse.jdt.ui
+ org.eclipse.jdt.ui,
+ org.apache.hadoop.eclipse
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Export-Package: org.apache.hdt.core,
http://git-wip-us.apache.org/repos/asf/incubator-hdt/blob/464b2d76/org.apache.hdt.core/src/org/apache/hdt/core/cluster/IHadoopClusterListener.java
----------------------------------------------------------------------
diff --git a/org.apache.hdt.core/src/org/apache/hdt/core/cluster/IHadoopClusterListener.java b/org.apache.hdt.core/src/org/apache/hdt/core/cluster/IHadoopClusterListener.java
new file mode 100644
index 0000000..8becbfc
--- /dev/null
+++ b/org.apache.hdt.core/src/org/apache/hdt/core/cluster/IHadoopClusterListener.java
@@ -0,0 +1,27 @@
+/**
+ * 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.
+ */
+
+package org.apache.hdt.core.cluster;
+
+
+/**
+ * Interface for monitoring server changes
+ */
+public interface IHadoopClusterListener {
+ void serverChanged(HadoopCluster location, int type);
+}
http://git-wip-us.apache.org/repos/asf/incubator-hdt/blob/464b2d76/org.apache.hdt.ui/src/org/apache/hdt/ui/cluster/IHadoopClusterListener.java
----------------------------------------------------------------------
diff --git a/org.apache.hdt.ui/src/org/apache/hdt/ui/cluster/IHadoopClusterListener.java b/org.apache.hdt.ui/src/org/apache/hdt/ui/cluster/IHadoopClusterListener.java
deleted file mode 100644
index 8d33cc8..0000000
--- a/org.apache.hdt.ui/src/org/apache/hdt/ui/cluster/IHadoopClusterListener.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * 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.
- */
-
-package org.apache.hdt.ui.cluster;
-
-import org.apache.hdt.core.cluster.HadoopCluster;
-
-/**
- * Interface for monitoring server changes
- */
-public interface IHadoopClusterListener {
- void serverChanged(HadoopCluster location, int type);
-}
http://git-wip-us.apache.org/repos/asf/incubator-hdt/blob/464b2d76/org.apache.hdt.ui/src/org/apache/hdt/ui/cluster/ServerRegistry.java
----------------------------------------------------------------------
diff --git a/org.apache.hdt.ui/src/org/apache/hdt/ui/cluster/ServerRegistry.java b/org.apache.hdt.ui/src/org/apache/hdt/ui/cluster/ServerRegistry.java
index 974315b..b1e172b 100644
--- a/org.apache.hdt.ui/src/org/apache/hdt/ui/cluster/ServerRegistry.java
+++ b/org.apache.hdt.ui/src/org/apache/hdt/ui/cluster/ServerRegistry.java
@@ -30,6 +30,7 @@ import java.util.TreeMap;
import org.apache.hadoop.conf.Configuration;
import org.apache.hdt.core.cluster.HadoopCluster;
+import org.apache.hdt.core.cluster.IHadoopClusterListener;
import org.apache.hdt.ui.Activator;
import org.eclipse.jface.dialogs.MessageDialog;
http://git-wip-us.apache.org/repos/asf/incubator-hdt/blob/464b2d76/org.apache.hdt.ui/src/org/apache/hdt/ui/views/ClusterView.java
----------------------------------------------------------------------
diff --git a/org.apache.hdt.ui/src/org/apache/hdt/ui/views/ClusterView.java b/org.apache.hdt.ui/src/org/apache/hdt/ui/views/ClusterView.java
index 0c53a19..711ccf3 100644
--- a/org.apache.hdt.ui/src/org/apache/hdt/ui/views/ClusterView.java
+++ b/org.apache.hdt.ui/src/org/apache/hdt/ui/views/ClusterView.java
@@ -22,12 +22,12 @@ import java.util.Collection;
import org.apache.hdt.core.cluster.HadoopCluster;
import org.apache.hdt.core.cluster.HadoopJob;
+import org.apache.hdt.core.cluster.IHadoopClusterListener;
import org.apache.hdt.core.cluster.IJobListener;
import org.apache.hdt.core.cluster.utils.JarModule;
import org.apache.hdt.ui.ImageLibrary;
import org.apache.hdt.ui.actions.EditLocationAction;
import org.apache.hdt.ui.actions.NewLocationAction;
-import org.apache.hdt.ui.cluster.IHadoopClusterListener;
import org.apache.hdt.ui.cluster.ServerRegistry;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IAction;