Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

HUE-424 - Hue Mavenization

* Changes to Java projects to build with Maven rather than Ant,
  thereby automatically picking up dependencies on Hadoop, Hive, etc.
  • Loading branch information...
commit 119616dc17a7ac400e5dc56151c8e79dc768f8fd 1 parent ca77ce1
Andrew Bayer abayer authored
Showing with 626 additions and 23 deletions.
  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  apps/beeswax/java/{ → src/main}/gen-java/com/cloudera/beeswax/api/BeeswaxException.java
  9. 0  apps/beeswax/java/{ → src/main}/gen-java/com/cloudera/beeswax/api/BeeswaxService.java
  10. 0  apps/beeswax/java/{ → src/main}/gen-java/com/cloudera/beeswax/api/ConfigVariable.java
  11. 0  apps/beeswax/java/{ → src/main}/gen-java/com/cloudera/beeswax/api/Query.java
  12. 0  apps/beeswax/java/{ → src/main}/gen-java/com/cloudera/beeswax/api/QueryExplanation.java
  13. 0  apps/beeswax/java/{ → src/main}/gen-java/com/cloudera/beeswax/api/QueryHandle.java
  14. 0  apps/beeswax/java/{ → src/main}/gen-java/com/cloudera/beeswax/api/QueryNotFoundException.java
  15. 0  apps/beeswax/java/{ → src/main}/gen-java/com/cloudera/beeswax/api/QueryState.java
  16. 0  apps/beeswax/java/{ → src/main}/gen-java/com/cloudera/beeswax/api/Results.java
  17. 0  apps/beeswax/java/{ → src/main}/gen-java/com/cloudera/beeswax/api/ResultsMetadata.java
  18. 0  apps/beeswax/java/src/{ → main/java}/com/cloudera/beeswax/BeeswaxServiceImpl.java
  19. 0  apps/beeswax/java/src/{ → main/java}/com/cloudera/beeswax/ConfigDescriptions.java
  20. 0  apps/beeswax/java/src/{ → main/java}/com/cloudera/beeswax/DummyHostnameVerifier.java
  21. 0  apps/beeswax/java/src/{ → main/java}/com/cloudera/beeswax/DummyX509TrustManager.java
  22. 0  apps/beeswax/java/src/{ → main/java}/com/cloudera/beeswax/LogContext.java
  23. 0  apps/beeswax/java/src/{ → main/java}/com/cloudera/beeswax/LogDivertAppender.java
  24. 0  apps/beeswax/java/src/{ → main/java}/com/cloudera/beeswax/NamingThreadFactory.java
  25. 0  apps/beeswax/java/src/{ → main/java}/com/cloudera/beeswax/Server.java
  26. 0  apps/beeswax/java/src/{ → main/java}/com/cloudera/beeswax/TeeOutputStream.java
  27. 0  apps/beeswax/java/{test → 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  desktop/libs/hadoop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/api/Block.java
  32. 0  desktop/libs/hadoop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/api/BlockData.java
  33. 0  desktop/libs/hadoop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/api/Constants.java
  34. 0  desktop/libs/hadoop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/api/ContentSummary.java
  35. 0  desktop/libs/hadoop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/api/DFSHealthReport.java
  36. 0  desktop/libs/hadoop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/api/Datanode.java
  37. 0  desktop/libs/hadoop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/api/DatanodeInfo.java
  38. 0  desktop/libs/hadoop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/api/DatanodeReportType.java
  39. 0  desktop/libs/hadoop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/api/DatanodeState.java
  40. 0  desktop/libs/hadoop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/api/HadoopServiceBase.java
  41. 0  desktop/libs/hadoop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/api/IOException.java
  42. 0  desktop/libs/hadoop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/api/MetricsContext.java
  43. 0  desktop/libs/hadoop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/api/MetricsRecord.java
  44. 0  desktop/libs/hadoop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/api/Namenode.java
  45. 0  desktop/libs/hadoop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/api/QuotaException.java
  46. 0  desktop/libs/hadoop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/api/RequestContext.java
  47. 0  desktop/libs/hadoop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/api/RuntimeInfo.java
  48. 0  desktop/libs/hadoop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/api/StackTraceElement.java
  49. 0  desktop/libs/hadoop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/api/Stat.java
  50. 0  desktop/libs/hadoop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/api/ThreadStackTrace.java
  51. 0  desktop/libs/hadoop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/api/ThriftDelegationToken.java
  52. 0  desktop/libs/hadoop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/api/UpgradeStatusReport.java
  53. 0  desktop/libs/hadoop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/api/VersionInfo.java
  54. 0  ...hadoop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/JobNotFoundException.java
  55. 0  ...libs/hadoop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/JobTrackerState.java
  56. 0  desktop/libs/hadoop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/Jobtracker.java
  57. 0  ...ava/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/TaskAttemptNotFoundException.java
  58. 0  ...adoop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/TaskNotFoundException.java
  59. 0  ...ava/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/TaskTrackerNotFoundException.java
  60. 0  .../hadoop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftClusterStatus.java
  61. 0  ...p/libs/hadoop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftCounter.java
  62. 0  ...s/hadoop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftCounterGroup.java
  63. 0  ...libs/hadoop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftGroupList.java
  64. 0  ...oop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftJobCounterRollups.java
  65. 0  ...top/libs/hadoop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftJobID.java
  66. 0  .../hadoop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftJobInProgress.java
  67. 0  ...p/libs/hadoop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftJobList.java
  68. 0  ...bs/hadoop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftJobPriority.java
  69. 0  ...ibs/hadoop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftJobProfile.java
  70. 0  ...s/hadoop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftJobQueueInfo.java
  71. 0  ...s/hadoop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftJobQueueList.java
  72. 0  .../libs/hadoop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftJobState.java
  73. 0  ...libs/hadoop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftJobStatus.java
  74. 0  .../hadoop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftTaskAttemptID.java
  75. 0  ...op/libs/hadoop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftTaskID.java
  76. 0  ...hadoop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftTaskInProgress.java
  77. 0  ...op/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftTaskInProgressList.java
  78. 0  ...libs/hadoop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftTaskPhase.java
  79. 0  ...hadoop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftTaskQueryState.java
  80. 0  ...libs/hadoop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftTaskState.java
  81. 0  ...ibs/hadoop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftTaskStatus.java
  82. 0  ...oop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftTaskTrackerStatus.java
  83. 0  ...java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftTaskTrackerStatusList.java
  84. 0  .../libs/hadoop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftTaskType.java
  85. 0  .../hadoop/java/{ → src/main}/gen-java/org/apache/hadoop/thriftfs/jobtracker/api/ThriftUserJobCounts.java
  86. 0  desktop/libs/hadoop/java/src/{ → main}/java/org/apache/hadoop/mapred/ThriftJobTrackerPlugin.java
  87. 0  desktop/libs/hadoop/java/src/{ → main}/java/org/apache/hadoop/thriftfs/DatanodePlugin.java
  88. 0  desktop/libs/hadoop/java/src/{ → main}/java/org/apache/hadoop/thriftfs/HadoopThriftAuthBridge.java
  89. 0  desktop/libs/hadoop/java/src/{ → main}/java/org/apache/hadoop/thriftfs/NamenodePlugin.java
  90. 0  desktop/libs/hadoop/java/src/{ → main}/java/org/apache/hadoop/thriftfs/SanerThreadPoolServer.java
  91. 0  desktop/libs/hadoop/java/src/{ → main}/java/org/apache/hadoop/thriftfs/ThriftHandlerBase.java
  92. 0  desktop/libs/hadoop/java/src/{ → main}/java/org/apache/hadoop/thriftfs/ThriftJobTrackerPlugin.java
  93. 0  desktop/libs/hadoop/java/src/{ → main}/java/org/apache/hadoop/thriftfs/ThriftPluginServer.java
  94. 0  desktop/libs/hadoop/java/src/{ → main}/java/org/apache/hadoop/thriftfs/ThriftServerContext.java
  95. 0  desktop/libs/hadoop/java/src/{ → main}/java/org/apache/hadoop/thriftfs/ThriftUtils.java
  96. 0  desktop/libs/hadoop/java/src/{java → main/resources}/thriftfs-default.xml
  97. 0  desktop/libs/hadoop/java/src/test/{ → java}/org/apache/hadoop/thriftfs/Helper.java
  98. 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  desktop/libs/hadoop/java/src/test/{ → java}/org/apache/hadoop/thriftfs/TestNamenodePlugin.java
  101. +1 −1  desktop/libs/hadoop/regenerate-thrift.sh
  102. +61 −0 desktop/libs/hadoop/static-group-mapping/pom.xml
  103. 0  .../hadoop/static-group-mapping/src/{ → main/java}/org/apache/hadoop/security/StaticUserGroupMapping.java
  104. +72 −0 desktop/libs/hadoop/sudo-shell/pom.xml
  105. 0  desktop/libs/hadoop/sudo-shell/src/{ → main/java}/com/cloudera/hue/SudoFsShell.java
  106. +153 −0 maven/pom.xml
3  .gitignore
View
@@ -62,3 +62,6 @@ app.reg
# logs
/logs
desktop/logs
+
+# Maven's target directory
+target
9 Makefile
View
@@ -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  Makefile.tarball
View
@@ -26,6 +26,7 @@ PROD_INCLUDES := \
Makefile* \
tools/app_reg \
tools/virtual-bootstrap \
+ maven \
VERSION_DATA
PROD_EXCLUDES := \
1  Makefile.vars
View
@@ -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 README.versions
View
@@ -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".
7 apps/beeswax/Makefile
View
@@ -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 apps/beeswax/java/pom.xml
View
@@ -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  ...va/com/cloudera/beeswax/api/BeeswaxException.java → ...va/com/cloudera/beeswax/api/BeeswaxException.java
View
File renamed without changes
0  ...java/com/cloudera/beeswax/api/BeeswaxService.java → ...java/com/cloudera/beeswax/api/BeeswaxService.java
View
File renamed without changes
0  ...java/com/cloudera/beeswax/api/ConfigVariable.java → ...java/com/cloudera/beeswax/api/ConfigVariable.java
View
File renamed without changes
0  ...java/gen-java/com/cloudera/beeswax/api/Query.java → ...main/gen-java/com/cloudera/beeswax/api/Query.java
View
File renamed without changes
0  ...va/com/cloudera/beeswax/api/QueryExplanation.java → ...va/com/cloudera/beeswax/api/QueryExplanation.java
View
File renamed without changes
0  ...en-java/com/cloudera/beeswax/api/QueryHandle.java → ...en-java/com/cloudera/beeswax/api/QueryHandle.java
View
File renamed without changes
0  .../cloudera/beeswax/api/QueryNotFoundException.java → .../cloudera/beeswax/api/QueryNotFoundException.java
View
File renamed without changes
0  ...gen-java/com/cloudera/beeswax/api/QueryState.java → ...gen-java/com/cloudera/beeswax/api/QueryState.java
View
File renamed without changes
0  ...va/gen-java/com/cloudera/beeswax/api/Results.java → ...in/gen-java/com/cloudera/beeswax/api/Results.java
View
File renamed without changes
0  ...ava/com/cloudera/beeswax/api/ResultsMetadata.java → ...ava/com/cloudera/beeswax/api/ResultsMetadata.java
View
File renamed without changes
0  .../src/com/cloudera/beeswax/BeeswaxServiceImpl.java → ...java/com/cloudera/beeswax/BeeswaxServiceImpl.java
View
File renamed without changes
0  .../src/com/cloudera/beeswax/ConfigDescriptions.java → ...java/com/cloudera/beeswax/ConfigDescriptions.java
View
File renamed without changes
0  ...c/com/cloudera/beeswax/DummyHostnameVerifier.java → ...a/com/cloudera/beeswax/DummyHostnameVerifier.java
View
File renamed without changes
0  ...c/com/cloudera/beeswax/DummyX509TrustManager.java → ...a/com/cloudera/beeswax/DummyX509TrustManager.java
View
File renamed without changes
0  ...wax/java/src/com/cloudera/beeswax/LogContext.java → ...rc/main/java/com/cloudera/beeswax/LogContext.java
View
File renamed without changes
0  ...a/src/com/cloudera/beeswax/LogDivertAppender.java → .../java/com/cloudera/beeswax/LogDivertAppender.java
View
File renamed without changes
0  ...src/com/cloudera/beeswax/NamingThreadFactory.java → ...ava/com/cloudera/beeswax/NamingThreadFactory.java
View
File renamed without changes
0  ...beeswax/java/src/com/cloudera/beeswax/Server.java → ...va/src/main/java/com/cloudera/beeswax/Server.java
View
File renamed without changes
0  ...ava/src/com/cloudera/beeswax/TeeOutputStream.java → ...in/java/com/cloudera/beeswax/TeeOutputStream.java
View
File renamed without changes
0  ...java/test/com/cloudera/beeswax/CubeSampleUDF.java → ...test/java/com/cloudera/beeswax/CubeSampleUDF.java
View
File renamed without changes
8 apps/beeswax/regenerate_thrift.sh
View
@@ -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
======================================================================
18 desktop/libs/hadoop/Makefile
View
@@ -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 desktop/libs/hadoop/java/pom.xml
View
@@ -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  ...en-java/org/apache/hadoop/thriftfs/api/Block.java → ...en-java/org/apache/hadoop/thriftfs/api/Block.java
View
File renamed without changes
0  ...ava/org/apache/hadoop/thriftfs/api/BlockData.java → ...ava/org/apache/hadoop/thriftfs/api/BlockData.java
View
File renamed without changes
0  ...ava/org/apache/hadoop/thriftfs/api/Constants.java → ...ava/org/apache/hadoop/thriftfs/api/Constants.java
View
File renamed without changes
0  ...rg/apache/hadoop/thriftfs/api/ContentSummary.java → ...rg/apache/hadoop/thriftfs/api/ContentSummary.java
View
File renamed without changes
0  ...g/apache/hadoop/thriftfs/api/DFSHealthReport.java → ...g/apache/hadoop/thriftfs/api/DFSHealthReport.java
View
File renamed without changes
0  ...java/org/apache/hadoop/thriftfs/api/Datanode.java → ...java/org/apache/hadoop/thriftfs/api/Datanode.java
View
File renamed without changes
0  .../org/apache/hadoop/thriftfs/api/DatanodeInfo.java → .../org/apache/hadoop/thriftfs/api/DatanodeInfo.java
View
File renamed without changes
0  ...pache/hadoop/thriftfs/api/DatanodeReportType.java → ...pache/hadoop/thriftfs/api/DatanodeReportType.java
View
File renamed without changes
0  ...org/apache/hadoop/thriftfs/api/DatanodeState.java → ...org/apache/hadoop/thriftfs/api/DatanodeState.java
View
File renamed without changes
0  ...apache/hadoop/thriftfs/api/HadoopServiceBase.java → ...apache/hadoop/thriftfs/api/HadoopServiceBase.java
View
File renamed without changes
0  ...a/org/apache/hadoop/thriftfs/api/IOException.java → ...a/org/apache/hadoop/thriftfs/api/IOException.java
View
File renamed without changes
0  ...rg/apache/hadoop/thriftfs/api/MetricsContext.java → ...rg/apache/hadoop/thriftfs/api/MetricsContext.java
View
File renamed without changes
0  ...org/apache/hadoop/thriftfs/api/MetricsRecord.java → ...org/apache/hadoop/thriftfs/api/MetricsRecord.java
View
File renamed without changes
0  ...java/org/apache/hadoop/thriftfs/api/Namenode.java → ...java/org/apache/hadoop/thriftfs/api/Namenode.java
View
File renamed without changes
0  ...rg/apache/hadoop/thriftfs/api/QuotaException.java → ...rg/apache/hadoop/thriftfs/api/QuotaException.java
View
File renamed without changes
0  ...rg/apache/hadoop/thriftfs/api/RequestContext.java → ...rg/apache/hadoop/thriftfs/api/RequestContext.java
View
File renamed without changes
0  ...a/org/apache/hadoop/thriftfs/api/RuntimeInfo.java → ...a/org/apache/hadoop/thriftfs/api/RuntimeInfo.java
View
File renamed without changes
0  ...apache/hadoop/thriftfs/api/StackTraceElement.java → ...apache/hadoop/thriftfs/api/StackTraceElement.java
View
File renamed without changes
0  ...gen-java/org/apache/hadoop/thriftfs/api/Stat.java → ...gen-java/org/apache/hadoop/thriftfs/api/Stat.java
View
File renamed without changes
0  .../apache/hadoop/thriftfs/api/ThreadStackTrace.java → .../apache/hadoop/thriftfs/api/ThreadStackTrace.java
View
File renamed without changes
0  ...he/hadoop/thriftfs/api/ThriftDelegationToken.java → ...he/hadoop/thriftfs/api/ThriftDelegationToken.java
View
File renamed without changes
0  ...ache/hadoop/thriftfs/api/UpgradeStatusReport.java → ...ache/hadoop/thriftfs/api/UpgradeStatusReport.java
View
File renamed without changes
0  ...a/org/apache/hadoop/thriftfs/api/VersionInfo.java → ...a/org/apache/hadoop/thriftfs/api/VersionInfo.java
View
File renamed without changes
0  ...thriftfs/jobtracker/api/JobNotFoundException.java → ...thriftfs/jobtracker/api/JobNotFoundException.java
View
File renamed without changes
0  ...doop/thriftfs/jobtracker/api/JobTrackerState.java → ...doop/thriftfs/jobtracker/api/JobTrackerState.java
View
File renamed without changes
0  ...he/hadoop/thriftfs/jobtracker/api/Jobtracker.java → ...he/hadoop/thriftfs/jobtracker/api/Jobtracker.java
View
File renamed without changes
0  .../jobtracker/api/TaskAttemptNotFoundException.java → .../jobtracker/api/TaskAttemptNotFoundException.java
View
File renamed without changes
0  ...hriftfs/jobtracker/api/TaskNotFoundException.java → ...hriftfs/jobtracker/api/TaskNotFoundException.java
View
File renamed without changes
0  .../jobtracker/api/TaskTrackerNotFoundException.java → .../jobtracker/api/TaskTrackerNotFoundException.java
View
File renamed without changes
0  .../thriftfs/jobtracker/api/ThriftClusterStatus.java → .../thriftfs/jobtracker/api/ThriftClusterStatus.java
View
File renamed without changes
0  ...hadoop/thriftfs/jobtracker/api/ThriftCounter.java → ...hadoop/thriftfs/jobtracker/api/ThriftCounter.java
View
File renamed without changes
0  ...p/thriftfs/jobtracker/api/ThriftCounterGroup.java → ...p/thriftfs/jobtracker/api/ThriftCounterGroup.java
View
File renamed without changes
0  ...doop/thriftfs/jobtracker/api/ThriftGroupList.java → ...doop/thriftfs/jobtracker/api/ThriftGroupList.java
View
File renamed without changes
0  ...iftfs/jobtracker/api/ThriftJobCounterRollups.java → ...iftfs/jobtracker/api/ThriftJobCounterRollups.java
View
File renamed without changes
0  ...e/hadoop/thriftfs/jobtracker/api/ThriftJobID.java → ...e/hadoop/thriftfs/jobtracker/api/ThriftJobID.java
View
File renamed without changes
0  .../thriftfs/jobtracker/api/ThriftJobInProgress.java → .../thriftfs/jobtracker/api/ThriftJobInProgress.java
View
File renamed without changes
0  ...hadoop/thriftfs/jobtracker/api/ThriftJobList.java → ...hadoop/thriftfs/jobtracker/api/ThriftJobList.java
View
File renamed without changes
0  ...op/thriftfs/jobtracker/api/ThriftJobPriority.java → ...op/thriftfs/jobtracker/api/ThriftJobPriority.java
View
File renamed without changes
0  ...oop/thriftfs/jobtracker/api/ThriftJobProfile.java → ...oop/thriftfs/jobtracker/api/ThriftJobProfile.java
View
File renamed without changes
0  ...p/thriftfs/jobtracker/api/ThriftJobQueueInfo.java → ...p/thriftfs/jobtracker/api/ThriftJobQueueInfo.java
View
File renamed without changes
0  ...p/thriftfs/jobtracker/api/ThriftJobQueueList.java → ...p/thriftfs/jobtracker/api/ThriftJobQueueList.java
View
File renamed without changes
0  ...adoop/thriftfs/jobtracker/api/ThriftJobState.java → ...adoop/thriftfs/jobtracker/api/ThriftJobState.java
View
File renamed without changes
0  ...doop/thriftfs/jobtracker/api/ThriftJobStatus.java → ...doop/thriftfs/jobtracker/api/ThriftJobStatus.java
View
File renamed without changes
0  .../thriftfs/jobtracker/api/ThriftTaskAttemptID.java → .../thriftfs/jobtracker/api/ThriftTaskAttemptID.java
View
File renamed without changes
0  .../hadoop/thriftfs/jobtracker/api/ThriftTaskID.java → .../hadoop/thriftfs/jobtracker/api/ThriftTaskID.java
View
File renamed without changes
0  ...thriftfs/jobtracker/api/ThriftTaskInProgress.java → ...thriftfs/jobtracker/api/ThriftTaskInProgress.java
View
File renamed without changes
0  ...ftfs/jobtracker/api/ThriftTaskInProgressList.java → ...ftfs/jobtracker/api/ThriftTaskInProgressList.java
View
File renamed without changes
0  ...doop/thriftfs/jobtracker/api/ThriftTaskPhase.java → ...doop/thriftfs/jobtracker/api/ThriftTaskPhase.java
View
File renamed without changes
0  ...thriftfs/jobtracker/api/ThriftTaskQueryState.java → ...thriftfs/jobtracker/api/ThriftTaskQueryState.java
View
File renamed without changes
0  ...doop/thriftfs/jobtracker/api/ThriftTaskState.java → ...doop/thriftfs/jobtracker/api/ThriftTaskState.java
View
File renamed without changes
0  ...oop/thriftfs/jobtracker/api/ThriftTaskStatus.java → ...oop/thriftfs/jobtracker/api/ThriftTaskStatus.java
View
File renamed without changes
0  ...iftfs/jobtracker/api/ThriftTaskTrackerStatus.java → ...iftfs/jobtracker/api/ThriftTaskTrackerStatus.java
View
File renamed without changes
0  ...s/jobtracker/api/ThriftTaskTrackerStatusList.java → ...s/jobtracker/api/ThriftTaskTrackerStatusList.java
View
File renamed without changes
0  ...adoop/thriftfs/jobtracker/api/ThriftTaskType.java → ...adoop/thriftfs/jobtracker/api/ThriftTaskType.java
View
File renamed without changes
0  .../thriftfs/jobtracker/api/ThriftUserJobCounts.java → .../thriftfs/jobtracker/api/ThriftUserJobCounts.java
View
File renamed without changes
0  .../apache/hadoop/mapred/ThriftJobTrackerPlugin.java → .../apache/hadoop/mapred/ThriftJobTrackerPlugin.java
View
File renamed without changes
0  ...va/org/apache/hadoop/thriftfs/DatanodePlugin.java → ...va/org/apache/hadoop/thriftfs/DatanodePlugin.java
View
File renamed without changes
0  ...pache/hadoop/thriftfs/HadoopThriftAuthBridge.java → ...pache/hadoop/thriftfs/HadoopThriftAuthBridge.java
View
File renamed without changes
0  ...va/org/apache/hadoop/thriftfs/NamenodePlugin.java → ...va/org/apache/hadoop/thriftfs/NamenodePlugin.java
View
File renamed without changes
0  ...apache/hadoop/thriftfs/SanerThreadPoolServer.java → ...apache/hadoop/thriftfs/SanerThreadPoolServer.java
View
File renamed without changes
0  ...org/apache/hadoop/thriftfs/ThriftHandlerBase.java → ...org/apache/hadoop/thriftfs/ThriftHandlerBase.java
View
File renamed without changes
0  ...pache/hadoop/thriftfs/ThriftJobTrackerPlugin.java → ...pache/hadoop/thriftfs/ThriftJobTrackerPlugin.java
View
File renamed without changes
0  ...rg/apache/hadoop/thriftfs/ThriftPluginServer.java → ...rg/apache/hadoop/thriftfs/ThriftPluginServer.java
View
File renamed without changes
0  ...g/apache/hadoop/thriftfs/ThriftServerContext.java → ...g/apache/hadoop/thriftfs/ThriftServerContext.java
View
File renamed without changes
0  .../java/org/apache/hadoop/thriftfs/ThriftUtils.java → .../java/org/apache/hadoop/thriftfs/ThriftUtils.java
View
File renamed without changes
0  ...op/libs/hadoop/java/src/java/thriftfs-default.xml → ...doop/java/src/main/resources/thriftfs-default.xml
View
File renamed without changes
0  ...a/src/test/org/apache/hadoop/thriftfs/Helper.java → .../test/java/org/apache/hadoop/thriftfs/Helper.java
View
File renamed without changes
0  ...e/hadoop/thriftfs/ManualThreadPoolServerTest.java → ...e/hadoop/thriftfs/ManualThreadPoolServerTest.java
View
File renamed without changes
8 ...rg/apache/hadoop/thriftfs/TestDatanodePlugin.java → ...rg/apache/hadoop/thriftfs/TestDatanodePlugin.java
View
@@ -98,7 +98,7 @@ public void testRead() throws Exception {
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 void testRead() throws Exception {
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  ...rg/apache/hadoop/thriftfs/TestNamenodePlugin.java → ...rg/apache/hadoop/thriftfs/TestNamenodePlugin.java
View
File renamed without changes
2  desktop/libs/hadoop/regenerate-thrift.sh
View
@@ -23,5 +23,5 @@ set -x
cd $(dirname $0)
for i in java/if/*.thrift; do
thrift -gen py:new_style $i
- thrift -o java -gen java $i
+ thrift -o java/src/main -gen java $i
done
61 desktop/libs/hadoop/static-group-mapping/pom.xml
View
@@ -0,0 +1,61 @@
+<?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>static-group-mapping</artifactId>
+ <packaging>jar</packaging>
+
+ <name>Hue Static Group Mapping</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>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
+
0  ...pache/hadoop/security/StaticUserGroupMapping.java → ...pache/hadoop/security/StaticUserGroupMapping.java
View
File renamed without changes
72 desktop/libs/hadoop/sudo-shell/pom.xml
View
@@ -0,0 +1,72 @@
+<?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>sudo-shell</artifactId>
+ <packaging>jar</packaging>
+
+ <name>Hue Sudo Shell</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>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <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>
+ <configuration>
+ <archive>
+ <manifest>
+ <mainClass>com.cloudera.hue.SudoFsShell</mainClass>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
+
0  .../sudo-shell/src/com/cloudera/hue/SudoFsShell.java → ...l/src/main/java/com/cloudera/hue/SudoFsShell.java
View
File renamed without changes
153 maven/pom.xml
View
@@ -0,0 +1,153 @@
+<?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</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>com.cloudera.hue</groupId>
+ <artifactId>hue-parent</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <name>Hue Maven Parent POM</name>
+
+ <licenses>
+ <license>
+ <name>Apache 2</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ <comments>A business-friendly OSS license</comments>
+ </license>
+ </licenses>
+
+
+ <properties>
+ <hadoop.version>0.20.2-CDH3B4-SNAPSHOT</hadoop.version>
+ <slf4j.version>1.6.1</slf4j.version>
+ <commons-logging.version>1.0.4</commons-logging.version>
+ <hive.version>0.6.0-CDH3B4-SNAPSHOT</hive.version>
+ </properties>
+
+ <organization>
+ <name>Cloudera</name>
+ <url>http://www.cloudera.com</url>
+ </organization>
+
+ <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>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop.hive</groupId>
+ <artifactId>hive-metastore</artifactId>
+ <version>${hive.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop.hive</groupId>
+ <artifactId>hive-exec</artifactId>
+ <version>${hive.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-test</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons-logging.version}</version>
+ <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>
+ <version>${commons-logging.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ <version>0.5.0-cdh</version>
+ </dependency>
+
+ </dependencies>
+ </dependencyManagement>
+
+ <repositories>
+ <repository>
+ <id>cloudera.repos</id>
+ <url>https://repository.cloudera.com/content/groups/public</url>
+ <name>Cloudera Public Repositories</name>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>cloudera.snapshots.repo</id>
+ <url>https://repository.cloudera.com/content/repositories/snapshots</url>
+ <name>Cloudera Snapshots Repository</name>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+
+</project>
Please sign in to comment.
Something went wrong with that request. Please try again.