git commit: Missing files from the previous commit of HADOOP-11007
Repository: hadoop Updated Branches: refs/heads/branch-2.6 3f200fddf -> 0a36b6808 Missing files from the previous commit of HADOOP-11007 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0a36b680 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0a36b680 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0a36b680 Branch: refs/heads/branch-2.6 Commit: 0a36b6808fba84b4cc83d9e1c3a9a27b236c5054 Parents: 3f200fd Author: Kihwal Lee Authored: Tue Oct 7 16:30:53 2014 -0500 Committer: Kihwal Lee Committed: Tue Oct 7 16:32:55 2014 -0500 -- hadoop-tools/hadoop-ant/pom.xml | 56 + .../java/org/apache/hadoop/ant/DfsTask.java | 210 +++ .../ant/condition/DfsBaseConditional.java | 68 ++ .../apache/hadoop/ant/condition/DfsExists.java | 24 +++ .../apache/hadoop/ant/condition/DfsIsDir.java | 24 +++ .../apache/hadoop/ant/condition/DfsZeroLen.java | 24 +++ .../resources/org/apache/hadoop/ant/antlib.xml | 29 +++ 7 files changed, 435 insertions(+) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/0a36b680/hadoop-tools/hadoop-ant/pom.xml -- diff --git a/hadoop-tools/hadoop-ant/pom.xml b/hadoop-tools/hadoop-ant/pom.xml new file mode 100644 index 000..197b527 --- /dev/null +++ b/hadoop-tools/hadoop-ant/pom.xml @@ -0,0 +1,56 @@ + + +http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 + http://maven.apache.org/xsd/maven-4.0.0.xsd";> + 4.0.0 + +org.apache.hadoop +hadoop-project +3.0.0-SNAPSHOT +../../hadoop-project + + org.apache.hadoop + hadoop-ant + 3.0.0-SNAPSHOT + Apache Hadoop Ant Tasks + Apache Hadoop Ant Tasks + jar + + + + org.apache.ant + ant + provided + + + org.apache.hadoop + hadoop-annotations + provided + + + org.apache.hadoop + hadoop-common + provided + + + org.apache.hadoop + hadoop-hdfs + provided + + + + http://git-wip-us.apache.org/repos/asf/hadoop/blob/0a36b680/hadoop-tools/hadoop-ant/src/main/java/org/apache/hadoop/ant/DfsTask.java -- diff --git a/hadoop-tools/hadoop-ant/src/main/java/org/apache/hadoop/ant/DfsTask.java b/hadoop-tools/hadoop-ant/src/main/java/org/apache/hadoop/ant/DfsTask.java new file mode 100644 index 000..78cb360 --- /dev/null +++ b/hadoop-tools/hadoop-ant/src/main/java/org/apache/hadoop/ant/DfsTask.java @@ -0,0 +1,210 @@ +/** + * 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.hadoop.ant; + +import java.io.ByteArrayOutputStream; +import java.io.OutputStream; +import java.io.PrintStream; +import java.security.AccessController; +import java.security.PrivilegedAction; +import java.util.LinkedList; + +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.FsShell; +import org.apache.tools.ant.AntClassLoader; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Task; +import org.apache.hadoop.util.ToolRunner; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.hdfs.HdfsConfiguration; + +/** + * {@link org.apache.hadoop.fs.FsShell FsShell} wrapper for ant Task. + */ +@InterfaceAudience.Private +public class DfsTask extends Task { + + /** + * Default sink for {@link java.lang.System.out System.out} + * and {@link java.lang.System.err System.err}. + */ + private static final OutputStream nullOut = new OutputStream() { + public void write(int b){ /* ignore */ } + public String toString(){ return ""; } + }; + private static final FsShell shell = new FsShell(); + + protected AntClassLoader confloader; + protected OutputStream out = nullOut; + protected OutputStream err = nullOut; + + // set by ant + protected String cmd; + protected final Linked
git commit: Missing files from the previous commit of HADOOP-11007
Repository: hadoop Updated Branches: refs/heads/branch-2 7910c6d03 -> 318f0e1e0 Missing files from the previous commit of HADOOP-11007 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/318f0e1e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/318f0e1e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/318f0e1e Branch: refs/heads/branch-2 Commit: 318f0e1e0c5ceb0df500b88c973ce1ebb1710128 Parents: 7910c6d Author: Kihwal Lee Authored: Tue Oct 7 16:30:53 2014 -0500 Committer: Kihwal Lee Committed: Tue Oct 7 16:32:17 2014 -0500 -- hadoop-tools/hadoop-ant/pom.xml | 56 + .../java/org/apache/hadoop/ant/DfsTask.java | 210 +++ .../ant/condition/DfsBaseConditional.java | 68 ++ .../apache/hadoop/ant/condition/DfsExists.java | 24 +++ .../apache/hadoop/ant/condition/DfsIsDir.java | 24 +++ .../apache/hadoop/ant/condition/DfsZeroLen.java | 24 +++ .../resources/org/apache/hadoop/ant/antlib.xml | 29 +++ 7 files changed, 435 insertions(+) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/318f0e1e/hadoop-tools/hadoop-ant/pom.xml -- diff --git a/hadoop-tools/hadoop-ant/pom.xml b/hadoop-tools/hadoop-ant/pom.xml new file mode 100644 index 000..197b527 --- /dev/null +++ b/hadoop-tools/hadoop-ant/pom.xml @@ -0,0 +1,56 @@ + + +http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 + http://maven.apache.org/xsd/maven-4.0.0.xsd";> + 4.0.0 + +org.apache.hadoop +hadoop-project +3.0.0-SNAPSHOT +../../hadoop-project + + org.apache.hadoop + hadoop-ant + 3.0.0-SNAPSHOT + Apache Hadoop Ant Tasks + Apache Hadoop Ant Tasks + jar + + + + org.apache.ant + ant + provided + + + org.apache.hadoop + hadoop-annotations + provided + + + org.apache.hadoop + hadoop-common + provided + + + org.apache.hadoop + hadoop-hdfs + provided + + + + http://git-wip-us.apache.org/repos/asf/hadoop/blob/318f0e1e/hadoop-tools/hadoop-ant/src/main/java/org/apache/hadoop/ant/DfsTask.java -- diff --git a/hadoop-tools/hadoop-ant/src/main/java/org/apache/hadoop/ant/DfsTask.java b/hadoop-tools/hadoop-ant/src/main/java/org/apache/hadoop/ant/DfsTask.java new file mode 100644 index 000..78cb360 --- /dev/null +++ b/hadoop-tools/hadoop-ant/src/main/java/org/apache/hadoop/ant/DfsTask.java @@ -0,0 +1,210 @@ +/** + * 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.hadoop.ant; + +import java.io.ByteArrayOutputStream; +import java.io.OutputStream; +import java.io.PrintStream; +import java.security.AccessController; +import java.security.PrivilegedAction; +import java.util.LinkedList; + +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.FsShell; +import org.apache.tools.ant.AntClassLoader; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Task; +import org.apache.hadoop.util.ToolRunner; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.hdfs.HdfsConfiguration; + +/** + * {@link org.apache.hadoop.fs.FsShell FsShell} wrapper for ant Task. + */ +@InterfaceAudience.Private +public class DfsTask extends Task { + + /** + * Default sink for {@link java.lang.System.out System.out} + * and {@link java.lang.System.err System.err}. + */ + private static final OutputStream nullOut = new OutputStream() { + public void write(int b){ /* ignore */ } + public String toString(){ return ""; } + }; + private static final FsShell shell = new FsShell(); + + protected AntClassLoader confloader; + protected OutputStream out = nullOut; + protected OutputStream err = nullOut; + + // set by ant + protected String cmd; + protected final LinkedList
git commit: Missing files from the previous commit of HADOOP-11007
Repository: hadoop Updated Branches: refs/heads/trunk 99d7a452b -> c8617ff13 Missing files from the previous commit of HADOOP-11007 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c8617ff1 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c8617ff1 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c8617ff1 Branch: refs/heads/trunk Commit: c8617ff136aa492bfae63627dfa1492f5ad0be31 Parents: 99d7a45 Author: Kihwal Lee Authored: Tue Oct 7 16:30:53 2014 -0500 Committer: Kihwal Lee Committed: Tue Oct 7 16:30:53 2014 -0500 -- hadoop-tools/hadoop-ant/pom.xml | 56 + .../java/org/apache/hadoop/ant/DfsTask.java | 210 +++ .../ant/condition/DfsBaseConditional.java | 68 ++ .../apache/hadoop/ant/condition/DfsExists.java | 24 +++ .../apache/hadoop/ant/condition/DfsIsDir.java | 24 +++ .../apache/hadoop/ant/condition/DfsZeroLen.java | 24 +++ .../resources/org/apache/hadoop/ant/antlib.xml | 29 +++ 7 files changed, 435 insertions(+) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/c8617ff1/hadoop-tools/hadoop-ant/pom.xml -- diff --git a/hadoop-tools/hadoop-ant/pom.xml b/hadoop-tools/hadoop-ant/pom.xml new file mode 100644 index 000..197b527 --- /dev/null +++ b/hadoop-tools/hadoop-ant/pom.xml @@ -0,0 +1,56 @@ + + +http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 + http://maven.apache.org/xsd/maven-4.0.0.xsd";> + 4.0.0 + +org.apache.hadoop +hadoop-project +3.0.0-SNAPSHOT +../../hadoop-project + + org.apache.hadoop + hadoop-ant + 3.0.0-SNAPSHOT + Apache Hadoop Ant Tasks + Apache Hadoop Ant Tasks + jar + + + + org.apache.ant + ant + provided + + + org.apache.hadoop + hadoop-annotations + provided + + + org.apache.hadoop + hadoop-common + provided + + + org.apache.hadoop + hadoop-hdfs + provided + + + + http://git-wip-us.apache.org/repos/asf/hadoop/blob/c8617ff1/hadoop-tools/hadoop-ant/src/main/java/org/apache/hadoop/ant/DfsTask.java -- diff --git a/hadoop-tools/hadoop-ant/src/main/java/org/apache/hadoop/ant/DfsTask.java b/hadoop-tools/hadoop-ant/src/main/java/org/apache/hadoop/ant/DfsTask.java new file mode 100644 index 000..78cb360 --- /dev/null +++ b/hadoop-tools/hadoop-ant/src/main/java/org/apache/hadoop/ant/DfsTask.java @@ -0,0 +1,210 @@ +/** + * 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.hadoop.ant; + +import java.io.ByteArrayOutputStream; +import java.io.OutputStream; +import java.io.PrintStream; +import java.security.AccessController; +import java.security.PrivilegedAction; +import java.util.LinkedList; + +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.FsShell; +import org.apache.tools.ant.AntClassLoader; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Task; +import org.apache.hadoop.util.ToolRunner; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.hdfs.HdfsConfiguration; + +/** + * {@link org.apache.hadoop.fs.FsShell FsShell} wrapper for ant Task. + */ +@InterfaceAudience.Private +public class DfsTask extends Task { + + /** + * Default sink for {@link java.lang.System.out System.out} + * and {@link java.lang.System.err System.err}. + */ + private static final OutputStream nullOut = new OutputStream() { + public void write(int b){ /* ignore */ } + public String toString(){ return ""; } + }; + private static final FsShell shell = new FsShell(); + + protected AntClassLoader confloader; + protected OutputStream out = nullOut; + protected OutputStream err = nullOut; + + // set by ant + protected String cmd; + protected final LinkedList argv