Bläddra i källkod

HUE-424 - Hue Mavenization

* Changes to Java projects to build with Maven rather than Ant,
  thereby automatically picking up dependencies on Hadoop, Hive, etc.
Andrew Bayer 15 år sedan
förälder
incheckning
119616dc17
100 ändrade filer med 339 tillägg och 22 borttagningar
  1. 3 0
      .gitignore
  2. 8 1
      Makefile
  3. 1 0
      Makefile.tarball
  4. 1 0
      Makefile.vars
  5. 16 0
      README.versions
  6. 3 4
      apps/beeswax/Makefile
  7. 133 0
      apps/beeswax/java/pom.xml
  8. 0 0
      apps/beeswax/java/src/main/gen-java/com/cloudera/beeswax/api/BeeswaxException.java
  9. 0 0
      apps/beeswax/java/src/main/gen-java/com/cloudera/beeswax/api/BeeswaxService.java
  10. 0 0
      apps/beeswax/java/src/main/gen-java/com/cloudera/beeswax/api/ConfigVariable.java
  11. 0 0
      apps/beeswax/java/src/main/gen-java/com/cloudera/beeswax/api/Query.java
  12. 0 0
      apps/beeswax/java/src/main/gen-java/com/cloudera/beeswax/api/QueryExplanation.java
  13. 0 0
      apps/beeswax/java/src/main/gen-java/com/cloudera/beeswax/api/QueryHandle.java
  14. 0 0
      apps/beeswax/java/src/main/gen-java/com/cloudera/beeswax/api/QueryNotFoundException.java
  15. 0 0
      apps/beeswax/java/src/main/gen-java/com/cloudera/beeswax/api/QueryState.java
  16. 0 0
      apps/beeswax/java/src/main/gen-java/com/cloudera/beeswax/api/Results.java
  17. 0 0
      apps/beeswax/java/src/main/gen-java/com/cloudera/beeswax/api/ResultsMetadata.java
  18. 0 0
      apps/beeswax/java/src/main/java/com/cloudera/beeswax/BeeswaxServiceImpl.java
  19. 0 0
      apps/beeswax/java/src/main/java/com/cloudera/beeswax/ConfigDescriptions.java
  20. 0 0
      apps/beeswax/java/src/main/java/com/cloudera/beeswax/DummyHostnameVerifier.java
  21. 0 0
      apps/beeswax/java/src/main/java/com/cloudera/beeswax/DummyX509TrustManager.java
  22. 0 0
      apps/beeswax/java/src/main/java/com/cloudera/beeswax/LogContext.java
  23. 0 0
      apps/beeswax/java/src/main/java/com/cloudera/beeswax/LogDivertAppender.java
  24. 0 0
      apps/beeswax/java/src/main/java/com/cloudera/beeswax/NamingThreadFactory.java
  25. 0 0
      apps/beeswax/java/src/main/java/com/cloudera/beeswax/Server.java
  26. 0 0
      apps/beeswax/java/src/main/java/com/cloudera/beeswax/TeeOutputStream.java
  27. 0 0
      apps/beeswax/java/src/test/java/com/cloudera/beeswax/CubeSampleUDF.java
  28. 4 4
      apps/beeswax/regenerate_thrift.sh
  29. 9 9
      desktop/libs/hadoop/Makefile
  30. 157 0
      desktop/libs/hadoop/java/pom.xml
  31. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/api/Block.java
  32. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/api/BlockData.java
  33. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/api/Constants.java
  34. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/api/ContentSummary.java
  35. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/api/DFSHealthReport.java
  36. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/api/Datanode.java
  37. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/api/DatanodeInfo.java
  38. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/api/DatanodeReportType.java
  39. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/api/DatanodeState.java
  40. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/api/HadoopServiceBase.java
  41. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/api/IOException.java
  42. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/api/MetricsContext.java
  43. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/api/MetricsRecord.java
  44. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/api/Namenode.java
  45. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/api/QuotaException.java
  46. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/api/RequestContext.java
  47. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/api/RuntimeInfo.java
  48. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/api/StackTraceElement.java
  49. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/api/Stat.java
  50. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/api/ThreadStackTrace.java
  51. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/api/ThriftDelegationToken.java
  52. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/api/UpgradeStatusReport.java
  53. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/api/VersionInfo.java
  54. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/JobNotFoundException.java
  55. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/JobTrackerState.java
  56. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/Jobtracker.java
  57. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/TaskAttemptNotFoundException.java
  58. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/TaskNotFoundException.java
  59. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/TaskTrackerNotFoundException.java
  60. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftClusterStatus.java
  61. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftCounter.java
  62. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftCounterGroup.java
  63. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftGroupList.java
  64. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftJobCounterRollups.java
  65. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftJobID.java
  66. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftJobInProgress.java
  67. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftJobList.java
  68. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftJobPriority.java
  69. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftJobProfile.java
  70. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftJobQueueInfo.java
  71. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftJobQueueList.java
  72. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftJobState.java
  73. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftJobStatus.java
  74. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftTaskAttemptID.java
  75. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftTaskID.java
  76. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftTaskInProgress.java
  77. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftTaskInProgressList.java
  78. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftTaskPhase.java
  79. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftTaskQueryState.java
  80. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftTaskState.java
  81. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftTaskStatus.java
  82. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftTaskTrackerStatus.java
  83. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftTaskTrackerStatusList.java
  84. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftTaskType.java
  85. 0 0
      desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftUserJobCounts.java
  86. 0 0
      desktop/libs/hadoop/java/src/main/java/org/apache/hadoop/mapred/ThriftJobTrackerPlugin.java
  87. 0 0
      desktop/libs/hadoop/java/src/main/java/org/apache/hadoop/thriftfs/DatanodePlugin.java
  88. 0 0
      desktop/libs/hadoop/java/src/main/java/org/apache/hadoop/thriftfs/HadoopThriftAuthBridge.java
  89. 0 0
      desktop/libs/hadoop/java/src/main/java/org/apache/hadoop/thriftfs/NamenodePlugin.java
  90. 0 0
      desktop/libs/hadoop/java/src/main/java/org/apache/hadoop/thriftfs/SanerThreadPoolServer.java
  91. 0 0
      desktop/libs/hadoop/java/src/main/java/org/apache/hadoop/thriftfs/ThriftHandlerBase.java
  92. 0 0
      desktop/libs/hadoop/java/src/main/java/org/apache/hadoop/thriftfs/ThriftJobTrackerPlugin.java
  93. 0 0
      desktop/libs/hadoop/java/src/main/java/org/apache/hadoop/thriftfs/ThriftPluginServer.java
  94. 0 0
      desktop/libs/hadoop/java/src/main/java/org/apache/hadoop/thriftfs/ThriftServerContext.java
  95. 0 0
      desktop/libs/hadoop/java/src/main/java/org/apache/hadoop/thriftfs/ThriftUtils.java
  96. 0 0
      desktop/libs/hadoop/java/src/main/resources/thriftfs-default.xml
  97. 0 0
      desktop/libs/hadoop/java/src/test/java/org/apache/hadoop/thriftfs/Helper.java
  98. 0 0
      desktop/libs/hadoop/java/src/test/java/org/apache/hadoop/thriftfs/ManualThreadPoolServerTest.java
  99. 4 4
      desktop/libs/hadoop/java/src/test/java/org/apache/hadoop/thriftfs/TestDatanodePlugin.java
  100. 0 0
      desktop/libs/hadoop/java/src/test/java/org/apache/hadoop/thriftfs/TestNamenodePlugin.java

+ 3 - 0
.gitignore

@@ -62,3 +62,6 @@ app.reg
 # logs
 /logs
 desktop/logs
+
+# Maven's target directory
+target

+ 8 - 1
Makefile

@@ -130,13 +130,20 @@ docs:
 # Development use crepo to fetch thirdparty dependencies.
 
 .PHONY: crepo
-crepo: $(THIRDPARTY_JS_DIR)/manifest.json $(THIRDPARTY_JS_DIR)/*.hash
+crepo: $(THIRDPARTY_JS_DIR)/manifest.json $(THIRDPARTY_JS_DIR)/*.hash parent-pom
 	@echo "--- Synchronizing external dependencies with crepo"
 	@mkdir -p $(BLD_DIR)
 	@cd $(THIRDPARTY_JS_DIR) && $(CREPO) sync && \
 	  ($(CREPO) dump-refs > $(ROOT)/VERSION_DATA || true)
 # END DEV ONLY >>>>
 
+###################################
+# Install parent POM
+###################################
+parent-pom:
+	cd $(ROOT)/maven && mvn install
+
+.PHONY: parent-pom
 
 ###################################
 # virtual-env

+ 1 - 0
Makefile.tarball

@@ -26,6 +26,7 @@ PROD_INCLUDES := \
 	Makefile* \
 	tools/app_reg \
 	tools/virtual-bootstrap \
+    maven \
 	VERSION_DATA
 
 PROD_EXCLUDES := \

+ 1 - 0
Makefile.vars

@@ -68,6 +68,7 @@ ASPECTJ_DIR := $(THIRDPARTY_DIR)/java/aspectj-1.6.5/
 # This version is substituted through to the tarballs and packages.
 ##############################
 DESKTOP_VERSION := $(shell cd $(ROOT)/desktop/core && $(SYS_PYTHON) setup.py --version)
+MAVEN_VERSION = $(DESKTOP_VERSION)-SNAPSHOT
 
 ##############################
 # ENV_PYTHON is the Python installed in the virtual environment. App

+ 16 - 0
README.versions

@@ -0,0 +1,16 @@
+The version used in the Maven projects needs to be set by hand in the
+following files:
+- maven/pom.xml
+- apps/beeswax/java/pom.xml
+- desktop/libs/hadoop/java/pom.xml
+- desktop/libs/hadoop/static-group-mapping/pom.xml
+- desktop/libs/hadoop/sudo-shell/pom.xml
+
+In the case of maven/pom.xml, change the first <version> tag. In the
+other cases, change the <version> tag within the <parent> tag.
+
+In addition, when running a release, all of these will need to be
+changed to remove "-SNAPSHOT". This will eventually be automated via
+the Maven release plugin, but is by hand for the moment. For release
+builds, you will also need to change MAVEN_VERSION in Makefile.vars to
+not include "-SNAPSHOT".

+ 3 - 4
apps/beeswax/Makefile

@@ -28,7 +28,7 @@ include $(ROOT)/Makefile.sdk
 ###################################
 
 BEESWAX_ROOT := $(realpath .)
-BLD_DIR_BEESWAX=$(BEESWAX_ROOT)/build/java
+BLD_DIR_BEESWAX=$(BEESWAX_ROOT)/java/target
 BEESWAX_JAVA_LIB := $(BEESWAX_ROOT)/java-lib
 BEESWAX_HIVE_LIB := $(BEESWAX_ROOT)/hive/lib
 
@@ -52,10 +52,9 @@ BEESWAX_OPTS := -Dbuild.dir=$(BLD_DIR_BEESWAX) \
 	        -Dhive.lib=$(BEESWAX_HIVE_LIB)
 $(BEESWAX): $(shell find $(BEESWAX_JAVA_DIR))
 	@echo "--- Building Desktop beeswax"
-	cd $(BEESWAX_JAVA_DIR) && ant $(ANT_OPTS) $(BEESWAX_OPTS) jar test-jar
+	cd $(BEESWAX_JAVA_DIR) && mvn clean install -DskipTests
 	@mkdir -p $(BEESWAX_JAVA_LIB)
-	@cp $(BLD_DIR_BEESWAX)/jar/BeeswaxServer.jar $@
-	@cp $(BLD_DIR_BEESWAX)/jar/BeeswaxTest.jar $(BEESWAX_JAVA_LIB)/BeeswaxTest.jar
+	@cp $(BLD_DIR_BEESWAX)/beeswax-server-$(MAVEN_VERSION).jar $@
 
 else
 $(BEESWAX):

+ 133 - 0
apps/beeswax/java/pom.xml

@@ -0,0 +1,133 @@
+<?xml version="1.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.
+-->
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>com.cloudera.hue</groupId>
+    <artifactId>hue-parent</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+  </parent>
+
+  <groupId>com.cloudera.hue</groupId>
+  <artifactId>beeswax-server</artifactId>
+  <packaging>jar</packaging>
+
+  <name>Hue Beeswax Server</name>
+
+  <scm>
+   <connection>scm:git:git://github.com/cloudera/hue.git</connection>
+   <developerConnection>scm:git:git@github.com:cloudera/hue.git</developerConnection>
+   <url>https://github.com/cloudera/hue</url>
+  </scm>  
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop.hive</groupId>
+      <artifactId>hive-metastore</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop.hive</groupId>
+      <artifactId>hive-exec</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>add-gen-java</id>
+            <phase>process-sources</phase>
+            <goals>
+              <goal>add-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>${basedir}/src/main/gen-java</source>
+              </sources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.6</source>
+          <target>1.6</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>default-package</id>
+            <phase>package</phase>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+            <configuration>
+              <archive>
+                <manifest>
+                  <mainClass>com.cloudera.beeswax.Server</mainClass>
+                </manifest>
+              </archive>
+            </configuration>
+          </execution>
+          <execution>
+            <id>test-package</id>
+            <phase>package</phase>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
+      

+ 0 - 0
apps/beeswax/java/gen-java/com/cloudera/beeswax/api/BeeswaxException.java → apps/beeswax/java/src/main/gen-java/com/cloudera/beeswax/api/BeeswaxException.java


+ 0 - 0
apps/beeswax/java/gen-java/com/cloudera/beeswax/api/BeeswaxService.java → apps/beeswax/java/src/main/gen-java/com/cloudera/beeswax/api/BeeswaxService.java


+ 0 - 0
apps/beeswax/java/gen-java/com/cloudera/beeswax/api/ConfigVariable.java → apps/beeswax/java/src/main/gen-java/com/cloudera/beeswax/api/ConfigVariable.java


+ 0 - 0
apps/beeswax/java/gen-java/com/cloudera/beeswax/api/Query.java → apps/beeswax/java/src/main/gen-java/com/cloudera/beeswax/api/Query.java


+ 0 - 0
apps/beeswax/java/gen-java/com/cloudera/beeswax/api/QueryExplanation.java → apps/beeswax/java/src/main/gen-java/com/cloudera/beeswax/api/QueryExplanation.java


+ 0 - 0
apps/beeswax/java/gen-java/com/cloudera/beeswax/api/QueryHandle.java → apps/beeswax/java/src/main/gen-java/com/cloudera/beeswax/api/QueryHandle.java


+ 0 - 0
apps/beeswax/java/gen-java/com/cloudera/beeswax/api/QueryNotFoundException.java → apps/beeswax/java/src/main/gen-java/com/cloudera/beeswax/api/QueryNotFoundException.java


+ 0 - 0
apps/beeswax/java/gen-java/com/cloudera/beeswax/api/QueryState.java → apps/beeswax/java/src/main/gen-java/com/cloudera/beeswax/api/QueryState.java


+ 0 - 0
apps/beeswax/java/gen-java/com/cloudera/beeswax/api/Results.java → apps/beeswax/java/src/main/gen-java/com/cloudera/beeswax/api/Results.java


+ 0 - 0
apps/beeswax/java/gen-java/com/cloudera/beeswax/api/ResultsMetadata.java → apps/beeswax/java/src/main/gen-java/com/cloudera/beeswax/api/ResultsMetadata.java


+ 0 - 0
apps/beeswax/java/src/com/cloudera/beeswax/BeeswaxServiceImpl.java → apps/beeswax/java/src/main/java/com/cloudera/beeswax/BeeswaxServiceImpl.java


+ 0 - 0
apps/beeswax/java/src/com/cloudera/beeswax/ConfigDescriptions.java → apps/beeswax/java/src/main/java/com/cloudera/beeswax/ConfigDescriptions.java


+ 0 - 0
apps/beeswax/java/src/com/cloudera/beeswax/DummyHostnameVerifier.java → apps/beeswax/java/src/main/java/com/cloudera/beeswax/DummyHostnameVerifier.java


+ 0 - 0
apps/beeswax/java/src/com/cloudera/beeswax/DummyX509TrustManager.java → apps/beeswax/java/src/main/java/com/cloudera/beeswax/DummyX509TrustManager.java


+ 0 - 0
apps/beeswax/java/src/com/cloudera/beeswax/LogContext.java → apps/beeswax/java/src/main/java/com/cloudera/beeswax/LogContext.java


+ 0 - 0
apps/beeswax/java/src/com/cloudera/beeswax/LogDivertAppender.java → apps/beeswax/java/src/main/java/com/cloudera/beeswax/LogDivertAppender.java


+ 0 - 0
apps/beeswax/java/src/com/cloudera/beeswax/NamingThreadFactory.java → apps/beeswax/java/src/main/java/com/cloudera/beeswax/NamingThreadFactory.java


+ 0 - 0
apps/beeswax/java/src/com/cloudera/beeswax/Server.java → apps/beeswax/java/src/main/java/com/cloudera/beeswax/Server.java


+ 0 - 0
apps/beeswax/java/src/com/cloudera/beeswax/TeeOutputStream.java → apps/beeswax/java/src/main/java/com/cloudera/beeswax/TeeOutputStream.java


+ 0 - 0
apps/beeswax/java/test/com/cloudera/beeswax/CubeSampleUDF.java → apps/beeswax/java/src/test/java/com/cloudera/beeswax/CubeSampleUDF.java


+ 4 - 4
apps/beeswax/regenerate_thrift.sh

@@ -21,11 +21,11 @@ set -o xtrace
 cd $(dirname $0)
 
 thrift -I thrift/include -r --gen py:new_style -o ./ thrift/beeswax.thrift
-thrift -I thrift/include -r --gen java:hashcode -o java thrift/beeswax.thrift
+thrift -I thrift/include -r --gen java:hashcode -o java/src/main thrift/beeswax.thrift
 
 # We don't need to have generated code for the metastore, since that's
 # in one of the hive jars that we include
-rm -Rf java/gen-java/com/facebook java/gen-java/org/apache
+rm -Rf java/src/main/gen-java/com/facebook java/src/main/gen-java/org/apache
 
 cat <<EOF
 ======================================================================
@@ -34,9 +34,9 @@ NOTE:
 
 This script does *not* remove old generated files that may not be necessary anymore.
 You should probably do something like:
- > git rm -rf java/gen-java gen-py
+ > git rm -rf java/src/main/gen-java gen-py
  > ./regenerate_thrift.sh
- > git add java/gen-java gen-py
+ > git add java/src/main/gen-java gen-py
 
 ======================================================================
 

+ 9 - 9
desktop/libs/hadoop/Makefile

@@ -43,17 +43,17 @@ PLUGIN_DIR := $(realpath .)
 PLUGIN_JAVA_LIB := $(PLUGIN_DIR)/java-lib
 PLUGIN_JAVA_DIR := $(PLUGIN_DIR)/java
 PLUGIN := $(PLUGIN_JAVA_LIB)/hue-plugins-$(DESKTOP_VERSION).jar
-BLD_DIR_PLUGINS := $(PLUGIN_DIR)/build/java
+BLD_DIR_PLUGINS := $(PLUGIN_DIR)/java/target
 
 STATIC_GROUP_MAPPING_DIR := $(realpath .)/static-group-mapping
 STATIC_GROUP_MAPPING_SRC := $(STATIC_GROUP_MAPPING_DIR)/src
-STATIC_GROUP_MAPPING_BUILD := $(STATIC_GROUP_MAPPING_DIR)/build
+STATIC_GROUP_MAPPING_BUILD := $(STATIC_GROUP_MAPPING_DIR)/target
 STATIC_GROUP_MAPPING_LIB := $(STATIC_GROUP_MAPPING_DIR)/java-lib
 STATIC_GROUP_MAPPING := $(STATIC_GROUP_MAPPING_LIB)/static-group-mapping-$(DESKTOP_VERSION).jar
 
 SUDO_SHELL_DIR := $(realpath .)/sudo-shell
 SUDO_SHELL_SRC := $(SUDO_SHELL_DIR)/src
-SUDO_SHELL_BUILD := $(SUDO_SHELL_DIR)/build
+SUDO_SHELL_BUILD := $(SUDO_SHELL_DIR)/target
 SUDO_SHELL_LIB := $(SUDO_SHELL_DIR)/java-lib
 SUDO_SHELL := $(SUDO_SHELL_LIB)/sudo-shell-$(DESKTOP_VERSION).jar
 
@@ -71,8 +71,8 @@ PLUGIN_OPTS := -Dbuild.dir=$(BLD_DIR_PLUGINS) \
 $(PLUGIN): $(shell find $(PLUGIN_JAVA_DIR) )
 	mkdir -p $(PLUGIN_JAVA_LIB)
 	@echo "--- Building Hadoop plugins"
-	cd $(PLUGIN_JAVA_DIR) && ant $(ANT_OPTS) $(PLUGIN_OPTS) jar
-	cp $(BLD_DIR_PLUGINS)/$(notdir $(PLUGIN)) $(PLUGIN)
+	cd $(PLUGIN_JAVA_DIR) && mvn clean install -DskipTests
+	cp $(BLD_DIR_PLUGINS)/hue-plugins-$(MAVEN_VERSION).jar $(PLUGIN)
 else
 $(PLUGIN):
 	$(error Cannot build hadoop plugin without source)
@@ -87,8 +87,8 @@ STATIC_GROUP_MAPPING_OPTS := -Dbuild.dir=$(STATIC_GROUP_MAPPING_BUILD) \
 $(STATIC_GROUP_MAPPING): $(shell find $(STATIC_GROUP_MAPPING_SRC))
 	mkdir -p $(STATIC_GROUP_MAPPING_LIB)
 	@echo "--- Building static UserGroupMappingService"
-	cd $(STATIC_GROUP_MAPPING_DIR) && ant $(ANT_OPTS) $(STATIC_GROUP_MAPPING_OPTS) jar
-	cp $(STATIC_GROUP_MAPPING_BUILD)/$(notdir $(STATIC_GROUP_MAPPING)) $(STATIC_GROUP_MAPPING)
+	cd $(STATIC_GROUP_MAPPING_DIR) && mvn clean install -DskipTests
+	cp $(STATIC_GROUP_MAPPING_BUILD)/static-group-mapping-$(MAVEN_VERSION).jar $(STATIC_GROUP_MAPPING)
 else
 $(STATIC_GROUP_MAPPING):
 	$(error Cannot build static-group-mapping jar without source)
@@ -103,8 +103,8 @@ SUDO_SHELL_OPTS := -Dbuild.dir=$(SUDO_SHELL_BUILD) \
 $(SUDO_SHELL): $(shell find $(SUDO_SHELL_SRC))
 	mkdir -p $(SUDO_SHELL_LIB)
 	@echo "--- Building sudo fsshell tool"
-	cd $(SUDO_SHELL_DIR) && ant $(ANT_OPTS) $(SUDO_SHELL_OPTS) jar
-	cp $(SUDO_SHELL_BUILD)/$(notdir $(SUDO_SHELL)) $(SUDO_SHELL)
+	cd $(SUDO_SHELL_DIR) && mvn clean install -DskipTests
+	cp $(SUDO_SHELL_BUILD)/sudo-shell-$(MAVEN_VERSION).jar $(SUDO_SHELL)
 else
 $(SUDO_SHELL):
 	$(error cannot build sudo-shell jar without source)

+ 157 - 0
desktop/libs/hadoop/java/pom.xml

@@ -0,0 +1,157 @@
+<?xml version="1.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.
+-->
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>com.cloudera.hue</groupId>
+    <artifactId>hue-parent</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+  </parent>
+
+  <groupId>com.cloudera.hue</groupId>
+  <artifactId>hue-plugins</artifactId>
+  <packaging>jar</packaging>
+
+  <name>Hue Hadoop</name>
+  
+  <scm>
+   <connection>scm:git:git://github.com/cloudera/hue.git</connection>
+   <developerConnection>scm:git:git@github.com:cloudera/hue.git</developerConnection>
+   <url>https://github.com/cloudera/hue</url>
+  </scm>  
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>avalon-framework</groupId>
+          <artifactId>avalon-framework</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>logkit</groupId>
+          <artifactId>logkit</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>servlet-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.thrift</groupId>
+      <artifactId>libthrift</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>add-gen-java</id>
+            <phase>process-sources</phase>
+            <goals>
+              <goal>add-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>${basedir}/src/main/gen-java</source>
+              </sources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.6</source>
+          <target>1.6</target>
+        </configuration>
+        <executions>
+          <execution>
+            <id>default-testCompile</id>
+            <phase>test-compile</phase>
+            <configuration>
+              <testExcludes>
+                <exclude>**/ManualThreadPoolServerTest.java</exclude>
+              </testExcludes>
+            </configuration> 
+            <goals>
+              <goal>testCompile</goal>
+            </goals>
+          </execution>                  
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <artifactSet>
+                <includes>
+                  <include>org.apache.thrift:libthrift</include>
+                </includes>
+              </artifactSet>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
+      

+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/api/Block.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/api/Block.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/api/BlockData.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/api/BlockData.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/api/Constants.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/api/Constants.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/api/ContentSummary.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/api/ContentSummary.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/api/DFSHealthReport.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/api/DFSHealthReport.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/api/Datanode.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/api/Datanode.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/api/DatanodeInfo.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/api/DatanodeInfo.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/api/DatanodeReportType.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/api/DatanodeReportType.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/api/DatanodeState.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/api/DatanodeState.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/api/HadoopServiceBase.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/api/HadoopServiceBase.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/api/IOException.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/api/IOException.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/api/MetricsContext.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/api/MetricsContext.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/api/MetricsRecord.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/api/MetricsRecord.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/api/Namenode.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/api/Namenode.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/api/QuotaException.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/api/QuotaException.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/api/RequestContext.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/api/RequestContext.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/api/RuntimeInfo.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/api/RuntimeInfo.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/api/StackTraceElement.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/api/StackTraceElement.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/api/Stat.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/api/Stat.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/api/ThreadStackTrace.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/api/ThreadStackTrace.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/api/ThriftDelegationToken.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/api/ThriftDelegationToken.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/api/UpgradeStatusReport.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/api/UpgradeStatusReport.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/api/VersionInfo.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/api/VersionInfo.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/JobNotFoundException.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/JobNotFoundException.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/JobTrackerState.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/JobTrackerState.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/Jobtracker.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/Jobtracker.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/TaskAttemptNotFoundException.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/TaskAttemptNotFoundException.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/TaskNotFoundException.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/TaskNotFoundException.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/TaskTrackerNotFoundException.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/TaskTrackerNotFoundException.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftClusterStatus.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftClusterStatus.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftCounter.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftCounter.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftCounterGroup.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftCounterGroup.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftGroupList.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftGroupList.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftJobCounterRollups.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftJobCounterRollups.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftJobID.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftJobID.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftJobInProgress.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftJobInProgress.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftJobList.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftJobList.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftJobPriority.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftJobPriority.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftJobProfile.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftJobProfile.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftJobQueueInfo.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftJobQueueInfo.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftJobQueueList.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftJobQueueList.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftJobState.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftJobState.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftJobStatus.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftJobStatus.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftTaskAttemptID.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftTaskAttemptID.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftTaskID.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftTaskID.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftTaskInProgress.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftTaskInProgress.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftTaskInProgressList.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftTaskInProgressList.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftTaskPhase.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftTaskPhase.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftTaskQueryState.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftTaskQueryState.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftTaskState.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftTaskState.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftTaskStatus.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftTaskStatus.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftTaskTrackerStatus.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftTaskTrackerStatus.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftTaskTrackerStatusList.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftTaskTrackerStatusList.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftTaskType.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftTaskType.java


+ 0 - 0
desktop/libs/hadoop/java/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftUserJobCounts.java → desktop/libs/hadoop/java/src/main/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftUserJobCounts.java


+ 0 - 0
desktop/libs/hadoop/java/src/java/org/apache/hadoop/mapred/ThriftJobTrackerPlugin.java → desktop/libs/hadoop/java/src/main/java/org/apache/hadoop/mapred/ThriftJobTrackerPlugin.java


+ 0 - 0
desktop/libs/hadoop/java/src/java/org/apache/hadoop/thriftfs/DatanodePlugin.java → desktop/libs/hadoop/java/src/main/java/org/apache/hadoop/thriftfs/DatanodePlugin.java


+ 0 - 0
desktop/libs/hadoop/java/src/java/org/apache/hadoop/thriftfs/HadoopThriftAuthBridge.java → desktop/libs/hadoop/java/src/main/java/org/apache/hadoop/thriftfs/HadoopThriftAuthBridge.java


+ 0 - 0
desktop/libs/hadoop/java/src/java/org/apache/hadoop/thriftfs/NamenodePlugin.java → desktop/libs/hadoop/java/src/main/java/org/apache/hadoop/thriftfs/NamenodePlugin.java


+ 0 - 0
desktop/libs/hadoop/java/src/java/org/apache/hadoop/thriftfs/SanerThreadPoolServer.java → desktop/libs/hadoop/java/src/main/java/org/apache/hadoop/thriftfs/SanerThreadPoolServer.java


+ 0 - 0
desktop/libs/hadoop/java/src/java/org/apache/hadoop/thriftfs/ThriftHandlerBase.java → desktop/libs/hadoop/java/src/main/java/org/apache/hadoop/thriftfs/ThriftHandlerBase.java


+ 0 - 0
desktop/libs/hadoop/java/src/java/org/apache/hadoop/thriftfs/ThriftJobTrackerPlugin.java → desktop/libs/hadoop/java/src/main/java/org/apache/hadoop/thriftfs/ThriftJobTrackerPlugin.java


+ 0 - 0
desktop/libs/hadoop/java/src/java/org/apache/hadoop/thriftfs/ThriftPluginServer.java → desktop/libs/hadoop/java/src/main/java/org/apache/hadoop/thriftfs/ThriftPluginServer.java


+ 0 - 0
desktop/libs/hadoop/java/src/java/org/apache/hadoop/thriftfs/ThriftServerContext.java → desktop/libs/hadoop/java/src/main/java/org/apache/hadoop/thriftfs/ThriftServerContext.java


+ 0 - 0
desktop/libs/hadoop/java/src/java/org/apache/hadoop/thriftfs/ThriftUtils.java → desktop/libs/hadoop/java/src/main/java/org/apache/hadoop/thriftfs/ThriftUtils.java


+ 0 - 0
desktop/libs/hadoop/java/src/java/thriftfs-default.xml → desktop/libs/hadoop/java/src/main/resources/thriftfs-default.xml


+ 0 - 0
desktop/libs/hadoop/java/src/test/org/apache/hadoop/thriftfs/Helper.java → desktop/libs/hadoop/java/src/test/java/org/apache/hadoop/thriftfs/Helper.java


+ 0 - 0
desktop/libs/hadoop/java/src/test/org/apache/hadoop/thriftfs/ManualThreadPoolServerTest.java → desktop/libs/hadoop/java/src/test/java/org/apache/hadoop/thriftfs/ManualThreadPoolServerTest.java


+ 4 - 4
desktop/libs/hadoop/java/src/test/org/apache/hadoop/thriftfs/TestDatanodePlugin.java → desktop/libs/hadoop/java/src/test/java/org/apache/hadoop/thriftfs/TestDatanodePlugin.java

@@ -98,7 +98,7 @@ public class TestDatanodePlugin  {
     BlockData blockData = datanode.readBlock(ctx, b, 0, 32);
     LOG.debug("Read block: " + blockData);
     assertEquals("0000 - Thirty-two bytes in a row",
-        new String(blockData.data));
+                 new String(blockData.getData()));
 
     createFile(BLOCK_SIZE + 32);
     blocks = namenode.getBlocks(ctx, testFile, 0, BLOCK_SIZE + 32);
@@ -111,20 +111,20 @@ public class TestDatanodePlugin  {
 
     blockData = datanode.readBlock(ctx, b, 0, BLOCK_SIZE);
     assertEquals(BLOCK_SIZE, blockData.length);
-    String data = new String(blockData.data);
+    String data = new String(blockData.getData());
     assertTrue(data.startsWith("0000 - Thirty-two bytes in a row"));
     assertTrue(data.endsWith("0255 - Thirty-two bytes in a row"));
 
     blockData = datanode.readBlock(ctx, b, 32, 32);
     assertEquals(32, blockData.length);
     assertEquals("0001 - Thirty-two bytes in a row",
-        new String(blockData.data));
+                 new String(blockData.getData()));
 
     b = blocks.get(1);
     blockData = datanode.readBlock(ctx, b, 0, 32);
     assertEquals(32, blockData.length);
     assertEquals("0256 - Thirty-two bytes in a row",
-        new String(blockData.data));
+                 new String(blockData.getData()));
   }
 
   private void createFile(int length) throws Exception {

+ 0 - 0
desktop/libs/hadoop/java/src/test/org/apache/hadoop/thriftfs/TestNamenodePlugin.java → desktop/libs/hadoop/java/src/test/java/org/apache/hadoop/thriftfs/TestNamenodePlugin.java


Vissa filer visades inte eftersom för många filer har ändrats