Added: hive/trunk/service/pom.xml URL: http://svn.apache.org/viewvc/hive/trunk/service/pom.xml?rev=1537576&view=auto ============================================================================== --- hive/trunk/service/pom.xml (added) +++ hive/trunk/service/pom.xml Thu Oct 31 18:27:31 2013 @@ -0,0 +1,161 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed 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 xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.hive</groupId> + <artifactId>hive</artifactId> + <version>0.13.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>hive-service</artifactId> + <packaging>jar</packaging> + <name>Hive Service</name> + + <properties> + <hive.path.to.root>..</hive.path.to.root> + </properties> + + <dependencies> + <!-- intra-project --> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-exec</artifactId> + <version>${project.version}</version> + </dependency> + <!-- inter-project --> + <dependency> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> + <version>${commons-cli.version}</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>${commons-logging.version}</version> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>${commons-io.version}</version> + </dependency> + <dependency> + <groupId>org.apache.thrift</groupId> + <artifactId>libfb303</artifactId> + <version>${libfb303.version}</version> + </dependency> + <dependency> + <groupId>org.apache.thrift</groupId> + <artifactId>libthrift</artifactId> + <version>${libthrift.version}</version> + </dependency> + <!-- intra-project --> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-exec</artifactId> + <version>${project.version}</version> + <scope>test</scope> + <classifier>tests</classifier> + </dependency> + <!-- test inter-project --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <version>${mockito-all.version}</version> + <scope>test</scope> + </dependency> + </dependencies> + + <profiles> + <profile> + <id>hadoop-1</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <dependencies> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-core</artifactId> + <version>${hadoop-20S.version}</version> + <optional>true</optional> + </dependency> + </dependencies> + </profile> + <profile> + <id>hadoop-2</id> + <dependencies> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <version>${hadoop-23.version}</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-mapreduce-client-core</artifactId> + <version>${hadoop-23.version}</version> + <optional>true</optional> + </dependency> + </dependencies> + </profile> + </profiles> + + <build> + <sourceDirectory>${basedir}/src/java</sourceDirectory> + <testSourceDirectory>${basedir}/src/test</testSourceDirectory> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>add-source</id> + <phase>generate-sources</phase> + <goals> + <goal>add-source</goal> + </goals> + <configuration> + <sources> + <source>src/model</source> + <source>src/gen/thrift/gen-javabean</source> + </sources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project>
Added: hive/trunk/shims/0.20/pom.xml URL: http://svn.apache.org/viewvc/hive/trunk/shims/0.20/pom.xml?rev=1537576&view=auto ============================================================================== --- hive/trunk/shims/0.20/pom.xml (added) +++ hive/trunk/shims/0.20/pom.xml Thu Oct 31 18:27:31 2013 @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed 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 xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.hive</groupId> + <artifactId>hive</artifactId> + <version>0.13.0-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + + <groupId>org.apache.hive.shims</groupId> + <artifactId>hive-shims-0.20</artifactId> + <packaging>jar</packaging> + <name>Hive Shims 0.20</name> + + <properties> + <hive.path.to.root>../..</hive.path.to.root> + </properties> + + <dependencies> + <!-- intra-project --> + <dependency> + <groupId>org.apache.hive.shims</groupId> + <artifactId>hive-shims-common</artifactId> + <version>${project.version}</version> + </dependency> + <!-- inter-project --> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-core</artifactId> + <version>${hadoop-20.version}</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-test</artifactId> + <version>${hadoop-20.version}</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-tools</artifactId> + <version>${hadoop-20.version}</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> + <version>${jetty.version}</version> + </dependency> + </dependencies> +</project> Added: hive/trunk/shims/0.20S/pom.xml URL: http://svn.apache.org/viewvc/hive/trunk/shims/0.20S/pom.xml?rev=1537576&view=auto ============================================================================== --- hive/trunk/shims/0.20S/pom.xml (added) +++ hive/trunk/shims/0.20S/pom.xml Thu Oct 31 18:27:31 2013 @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed 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 xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.hive</groupId> + <artifactId>hive</artifactId> + <version>0.13.0-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + + <groupId>org.apache.hive.shims</groupId> + <artifactId>hive-shims-0.20S</artifactId> + <packaging>jar</packaging> + <name>Hive Shims 0.20S</name> + + <properties> + <hive.path.to.root>../..</hive.path.to.root> + </properties> + + <dependencies> + <!-- intra-project --> + <dependency> + <groupId>org.apache.hive.shims</groupId> + <artifactId>hive-shims-common-secure</artifactId> + <version>${project.version}</version> + </dependency> + <!-- inter-project --> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-core</artifactId> + <version>${hadoop-20S.version}</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-test</artifactId> + <version>${hadoop-20S.version}</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> + <version>${jetty.version}</version> + </dependency> + </dependencies> +</project> Added: hive/trunk/shims/0.23/pom.xml URL: http://svn.apache.org/viewvc/hive/trunk/shims/0.23/pom.xml?rev=1537576&view=auto ============================================================================== --- hive/trunk/shims/0.23/pom.xml (added) +++ hive/trunk/shims/0.23/pom.xml Thu Oct 31 18:27:31 2013 @@ -0,0 +1,91 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed 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 xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.hive</groupId> + <artifactId>hive</artifactId> + <version>0.13.0-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + + <groupId>org.apache.hive.shims</groupId> + <artifactId>hive-shims-0.23</artifactId> + <packaging>jar</packaging> + <name>Hive Shims 0.23</name> + + <properties> + <hive.path.to.root>../..</hive.path.to.root> + </properties> + + <dependencies> + <!-- intra-project --> + <dependency> + <groupId>org.apache.hive.shims</groupId> + <artifactId>hive-shims-common-secure</artifactId> + <version>${project.version}</version> + </dependency> + <!-- inter-project --> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>${commons-lang.version}</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>${commons-logging.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <version>${hadoop-23.version}</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs</artifactId> + <version>${hadoop-23.version}</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs</artifactId> + <version>${hadoop-23.version}</version> + <type>test-jar</type> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-mapreduce-client-core</artifactId> + <version>${hadoop-23.version}</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-mapreduce-client-jobclient</artifactId> + <version>${hadoop-23.version}</version> + <type>test-jar</type> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> + <version>${jetty.version}</version> + </dependency> + </dependencies> +</project> Added: hive/trunk/shims/common-secure/pom.xml URL: http://svn.apache.org/viewvc/hive/trunk/shims/common-secure/pom.xml?rev=1537576&view=auto ============================================================================== --- hive/trunk/shims/common-secure/pom.xml (added) +++ hive/trunk/shims/common-secure/pom.xml Thu Oct 31 18:27:31 2013 @@ -0,0 +1,87 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed 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 xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.hive</groupId> + <artifactId>hive</artifactId> + <version>0.13.0-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + + <groupId>org.apache.hive.shims</groupId> + <artifactId>hive-shims-common-secure</artifactId> + <packaging>jar</packaging> + <name>Hive Shims Secure Common</name> + + <properties> + <hive.path.to.root>../..</hive.path.to.root> + </properties> + + <dependencies> + <!-- intra-project --> + <dependency> + <groupId>org.apache.hive.shims</groupId> + <artifactId>hive-shims-common</artifactId> + <version>${project.version}</version> + </dependency> + <!-- inter-project --> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>${commons-codec.version}</version> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>${commons-lang.version}</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>${commons-logging.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-core</artifactId> + <version>${hadoop-20S.version}</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-tools</artifactId> + <version>${hadoop-20S.version}</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.thrift</groupId> + <artifactId>libthrift</artifactId> + <version>${libthrift.version}</version> + </dependency> + <dependency> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + <version>${zookeeper.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-core</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> +</project> Added: hive/trunk/shims/common/pom.xml URL: http://svn.apache.org/viewvc/hive/trunk/shims/common/pom.xml?rev=1537576&view=auto ============================================================================== --- hive/trunk/shims/common/pom.xml (added) +++ hive/trunk/shims/common/pom.xml Thu Oct 31 18:27:31 2013 @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed 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 xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.hive</groupId> + <artifactId>hive</artifactId> + <version>0.13.0-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + + <groupId>org.apache.hive.shims</groupId> + <artifactId>hive-shims-common</artifactId> + <packaging>jar</packaging> + <name>Hive Shims Common</name> + + <properties> + <hive.path.to.root>../..</hive.path.to.root> + </properties> + + <dependencies> + <!-- inter-project --> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>${commons-logging.version}</version> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>${log4j.version}</version> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>${guava.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-core</artifactId> + <version>${hadoop-20.version}</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.thrift</groupId> + <artifactId>libthrift</artifactId> + <version>${libthrift.version}</version> + </dependency> + </dependencies> +</project> Added: hive/trunk/shims/pom.xml URL: http://svn.apache.org/viewvc/hive/trunk/shims/pom.xml?rev=1537576&view=auto ============================================================================== --- hive/trunk/shims/pom.xml (added) +++ hive/trunk/shims/pom.xml Thu Oct 31 18:27:31 2013 @@ -0,0 +1,112 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed 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 xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.hive</groupId> + <artifactId>hive</artifactId> + <version>0.13.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>hive-shims</artifactId> + <packaging>pom</packaging> + <name>Hive Shims</name> + + <properties> + <hive.path.to.root>..</hive.path.to.root> + </properties> + + <modules> + <module>common</module> + <module>0.20</module> + <module>common-secure</module> + <module>0.20S</module> + <module>0.23</module> + </modules> + + <dependencies> + <dependency> + <groupId>org.apache.hive.shims</groupId> + <artifactId>hive-shims-common</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hive.shims</groupId> + <artifactId>hive-shims-0.20</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hive.shims</groupId> + <artifactId>hive-shims-common-secure</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hive.shims</groupId> + <artifactId>hive-shims-0.20S</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hive.shims</groupId> + <artifactId>hive-shims-0.23</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>src/assembly/uberjar.xml</descriptor> + </descriptors> + </configuration> + <executions> + <execution> + <phase>compile</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>attach-artifacts</id> + <phase>package</phase> + <goals> + <goal>attach-artifact</goal> + </goals> + <configuration> + <artifacts> + <artifact> + <file>target/hive-shims-${project.version}-uberjar.jar</file> + <type>jar</type> + </artifact> + </artifacts> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> Modified: hive/trunk/shims/src/0.20S/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java URL: http://svn.apache.org/viewvc/hive/trunk/shims/src/0.20S/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java?rev=1537576&r1=1537575&r2=1537576&view=diff ============================================================================== --- hive/trunk/shims/src/0.20S/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java (original) +++ hive/trunk/shims/src/0.20S/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java Thu Oct 31 18:27:31 2013 @@ -153,7 +153,7 @@ public class Hadoop20SShims extends Hado /** * Returns a shim to wrap MiniMrCluster */ - public MiniMrShim getMiniMrCluster(Configuration conf, int numberOfTaskTrackers, + public MiniMrShim getMiniMrCluster(Configuration conf, int numberOfTaskTrackers, String nameNode, int numDir) throws IOException { return new MiniMrShim(conf, numberOfTaskTrackers, nameNode, numDir); } Modified: hive/trunk/shims/src/0.20S/java/org/apache/hadoop/mapred/WebHCatJTShim20S.java URL: http://svn.apache.org/viewvc/hive/trunk/shims/src/0.20S/java/org/apache/hadoop/mapred/WebHCatJTShim20S.java?rev=1537576&r1=1537575&r2=1537576&view=diff ============================================================================== --- hive/trunk/shims/src/0.20S/java/org/apache/hadoop/mapred/WebHCatJTShim20S.java (original) +++ hive/trunk/shims/src/0.20S/java/org/apache/hadoop/mapred/WebHCatJTShim20S.java Thu Oct 31 18:27:31 2013 @@ -30,7 +30,7 @@ import java.net.InetSocketAddress; import java.net.URI; /** - * This is in org.apache.hadoop.mapred package because it relies on + * This is in org.apache.hadoop.mapred package because it relies on * JobSubmissionProtocol which is package private */ public class WebHCatJTShim20S implements WebHCatJTShim { Modified: hive/trunk/shims/src/0.23/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java URL: http://svn.apache.org/viewvc/hive/trunk/shims/src/0.23/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java?rev=1537576&r1=1537575&r2=1537576&view=diff ============================================================================== --- hive/trunk/shims/src/0.23/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java (original) +++ hive/trunk/shims/src/0.23/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java Thu Oct 31 18:27:31 2013 @@ -171,7 +171,7 @@ public class Hadoop23Shims extends Hadoo /** * Returns a shim to wrap MiniMrCluster */ - public MiniMrShim getMiniMrCluster(Configuration conf, int numberOfTaskTrackers, + public MiniMrShim getMiniMrCluster(Configuration conf, int numberOfTaskTrackers, String nameNode, int numDir) throws IOException { return new MiniMrShim(conf, numberOfTaskTrackers, nameNode, numDir); } @@ -184,7 +184,7 @@ public class Hadoop23Shims extends Hadoo private final MiniMRCluster mr; private final Configuration conf; - public MiniMrShim(Configuration conf, int numberOfTaskTrackers, + public MiniMrShim(Configuration conf, int numberOfTaskTrackers, String nameNode, int numDir) throws IOException { this.conf = conf; @@ -203,7 +203,7 @@ public class Hadoop23Shims extends Hadoo if (StringUtils.isBlank(address)) { throw new IllegalArgumentException("Invalid YARN resource manager port."); } - + return Integer.parseInt(address); } Added: hive/trunk/shims/src/assembly/uberjar.xml URL: http://svn.apache.org/viewvc/hive/trunk/shims/src/assembly/uberjar.xml?rev=1537576&view=auto ============================================================================== --- hive/trunk/shims/src/assembly/uberjar.xml (added) +++ hive/trunk/shims/src/assembly/uberjar.xml Thu Oct 31 18:27:31 2013 @@ -0,0 +1,19 @@ +<assembly> + <id>uberjar</id> + <formats> + <format>jar</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <dependencySets> + <dependencySet> + <unpack>true</unpack> + <scope>compile</scope> + <useProjectArtifact>false</useProjectArtifact> + <useTransitiveDependencies>false</useTransitiveDependencies> + <excludes> + <exclude>org.slf4j:slf4j-api</exclude> + <exclude>org.slf4j:slf4j-log4j12</exclude> + </excludes> + </dependencySet> + </dependencySets> +</assembly> Modified: hive/trunk/shims/src/common-secure/test/org/apache/hadoop/hive/thrift/TestZooKeeperTokenStore.java URL: http://svn.apache.org/viewvc/hive/trunk/shims/src/common-secure/test/org/apache/hadoop/hive/thrift/TestZooKeeperTokenStore.java?rev=1537576&r1=1537575&r2=1537576&view=diff ============================================================================== --- hive/trunk/shims/src/common-secure/test/org/apache/hadoop/hive/thrift/TestZooKeeperTokenStore.java (original) +++ hive/trunk/shims/src/common-secure/test/org/apache/hadoop/hive/thrift/TestZooKeeperTokenStore.java Thu Oct 31 18:27:31 2013 @@ -43,16 +43,16 @@ public class TestZooKeeperTokenStore ext private ZooKeeperTokenStore ts; // connect timeout large enough for slower test environments private final int connectTimeoutMillis = 30000; - + @Override protected void setUp() throws Exception { - File zkDataDir = new File(System.getProperty("java.io.tmpdir")); + File zkDataDir = new File(System.getProperty("test.tmp.dir")); if (this.zkCluster != null) { throw new IOException("Cluster already running"); } this.zkCluster = new MiniZooKeeperCluster(); this.zkPort = this.zkCluster.startup(zkDataDir); - + this.zkClient = ZooKeeperTokenStore.createConnectedClient("localhost:" + zkPort, 3000, connectTimeoutMillis); } Modified: hive/trunk/shims/src/common/java/org/apache/hadoop/hive/io/HiveIOExceptionHandlerChain.java URL: http://svn.apache.org/viewvc/hive/trunk/shims/src/common/java/org/apache/hadoop/hive/io/HiveIOExceptionHandlerChain.java?rev=1537576&r1=1537575&r2=1537576&view=diff ============================================================================== --- hive/trunk/shims/src/common/java/org/apache/hadoop/hive/io/HiveIOExceptionHandlerChain.java (original) +++ hive/trunk/shims/src/common/java/org/apache/hadoop/hive/io/HiveIOExceptionHandlerChain.java Thu Oct 31 18:27:31 2013 @@ -34,7 +34,7 @@ import org.apache.hadoop.util.Reflection * exception to the caller. */ public class HiveIOExceptionHandlerChain { - + public static String HIVE_IO_EXCEPTION_HANDLE_CHAIN = "hive.io.exception.handlers"; @SuppressWarnings("unchecked") @@ -49,7 +49,7 @@ public class HiveIOExceptionHandlerChain for (String handlerStr : handlerArr) { if (!handlerStr.trim().equals("")) { try { - Class<? extends HiveIOExceptionHandler> handlerCls = + Class<? extends HiveIOExceptionHandler> handlerCls = (Class<? extends HiveIOExceptionHandler>) Class.forName(handlerStr); HiveIOExceptionHandler handler = ReflectionUtils.newInstance(handlerCls, null); handlerChain.add(handler); @@ -96,7 +96,7 @@ public class HiveIOExceptionHandlerChain //re-throw the exception as an IOException throw new IOException(e); } - + /** * This is to handle exception when doing next operations. Here we use a * HiveIOExceptionNextHandleResult to store the results of each handler. If @@ -117,7 +117,7 @@ public class HiveIOExceptionHandlerChain } } - //re-throw the exception as an IOException + //re-throw the exception as an IOException throw new IOException(e); } Modified: hive/trunk/shims/src/common/java/org/apache/hadoop/hive/io/HiveIOExceptionNextHandleResult.java URL: http://svn.apache.org/viewvc/hive/trunk/shims/src/common/java/org/apache/hadoop/hive/io/HiveIOExceptionNextHandleResult.java?rev=1537576&r1=1537575&r2=1537576&view=diff ============================================================================== --- hive/trunk/shims/src/common/java/org/apache/hadoop/hive/io/HiveIOExceptionNextHandleResult.java (original) +++ hive/trunk/shims/src/common/java/org/apache/hadoop/hive/io/HiveIOExceptionNextHandleResult.java Thu Oct 31 18:27:31 2013 @@ -46,7 +46,7 @@ public class HiveIOExceptionNextHandleRe public void setHandleResult(boolean handleResult) { this.handleResult = handleResult; } - + public void clear() { handled = false; handleResult = false; Modified: hive/trunk/shims/src/common/java/org/apache/hadoop/hive/shims/HiveEventCounter.java URL: http://svn.apache.org/viewvc/hive/trunk/shims/src/common/java/org/apache/hadoop/hive/shims/HiveEventCounter.java?rev=1537576&r1=1537575&r2=1537576&view=diff ============================================================================== --- hive/trunk/shims/src/common/java/org/apache/hadoop/hive/shims/HiveEventCounter.java (original) +++ hive/trunk/shims/src/common/java/org/apache/hadoop/hive/shims/HiveEventCounter.java Thu Oct 31 18:27:31 2013 @@ -27,9 +27,9 @@ import org.apache.log4j.spi.LoggingEvent import org.apache.log4j.spi.OptionHandler; public class HiveEventCounter implements Appender, OptionHandler { - + AppenderSkeleton hadoopEventCounter; - + public HiveEventCounter() { hadoopEventCounter = ShimLoader.getEventCounter(); } Modified: hive/trunk/shims/src/common/java/org/apache/hadoop/hive/shims/ShimLoader.java URL: http://svn.apache.org/viewvc/hive/trunk/shims/src/common/java/org/apache/hadoop/hive/shims/ShimLoader.java?rev=1537576&r1=1537575&r2=1537576&view=diff ============================================================================== --- hive/trunk/shims/src/common/java/org/apache/hadoop/hive/shims/ShimLoader.java (original) +++ hive/trunk/shims/src/common/java/org/apache/hadoop/hive/shims/ShimLoader.java Thu Oct 31 18:27:31 2013 @@ -58,13 +58,13 @@ public abstract class ShimLoader { JETTY_SHIM_CLASSES.put("0.20S", "org.apache.hadoop.hive.shims.Jetty20SShims"); JETTY_SHIM_CLASSES.put("0.23", "org.apache.hadoop.hive.shims.Jetty23Shims"); } - + /** * The names of the classes for shimming Hadoop's event counter */ private static final HashMap<String, String> EVENT_COUNTER_SHIM_CLASSES = new HashMap<String, String>(); - + static { EVENT_COUNTER_SHIM_CLASSES.put("0.20", "org.apache.hadoop.metrics.jvm.EventCounter"); EVENT_COUNTER_SHIM_CLASSES.put("0.20S", "org.apache.hadoop.log.metrics.EventCounter"); @@ -92,7 +92,7 @@ public abstract class ShimLoader { } return jettyShims; } - + public static synchronized AppenderSkeleton getEventCounter() { if (eventCounter == null) { eventCounter = loadShims(EVENT_COUNTER_SHIM_CLASSES, AppenderSkeleton.class); @@ -153,7 +153,7 @@ public abstract class ShimLoader { default: throw new IllegalArgumentException("Unrecognized Hadoop major version number: " + vers); } - + String majorVersion = parts[0] + "." + parts[1]; // If we are running a security release, we won't have UnixUserGroupInformation Modified: hive/trunk/shims/src/common/java/org/apache/hadoop/hive/thrift/HadoopThriftAuthBridge.java URL: http://svn.apache.org/viewvc/hive/trunk/shims/src/common/java/org/apache/hadoop/hive/thrift/HadoopThriftAuthBridge.java?rev=1537576&r1=1537575&r2=1537576&view=diff ============================================================================== --- hive/trunk/shims/src/common/java/org/apache/hadoop/hive/thrift/HadoopThriftAuthBridge.java (original) +++ hive/trunk/shims/src/common/java/org/apache/hadoop/hive/thrift/HadoopThriftAuthBridge.java Thu Oct 31 18:27:31 2013 @@ -43,7 +43,7 @@ import org.apache.thrift.transport.TTran throw new UnsupportedOperationException( "The current version of Hadoop does not support Authentication"); } - + public Server createServer(String keytabFile, String principalConf) throws TTransportException { throw new UnsupportedOperationException( @@ -92,7 +92,7 @@ import org.apache.thrift.transport.TTran public abstract void startDelegationTokenSecretManager(Configuration conf, Object hmsHandler) throws IOException; public abstract String getRemoteUser(); - public abstract String getDelegationToken(String owner, String renewer) + public abstract String getDelegationToken(String owner, String renewer) throws IOException, InterruptedException; public abstract long renewDelegationToken(String tokenStrForm) throws IOException; public abstract void cancelDelegationToken(String tokenStrForm) throws IOException; Added: hive/trunk/testutils/pom.xml URL: http://svn.apache.org/viewvc/hive/trunk/testutils/pom.xml?rev=1537576&view=auto ============================================================================== --- hive/trunk/testutils/pom.xml (added) +++ hive/trunk/testutils/pom.xml Thu Oct 31 18:27:31 2013 @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed 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 xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.hive</groupId> + <artifactId>hive</artifactId> + <version>0.13.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>hive-testutils</artifactId> + <packaging>jar</packaging> + <name>Hive TestUtils</name> + + <properties> + <hive.path.to.root>..</hive.path.to.root> + </properties> + + <dependencies> + <!-- inter-project --> + <dependency> + <groupId>com.google.code.tempus-fugit</groupId> + <artifactId>tempus-fugit</artifactId> + <version>${tempus-fugit.version}</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit.version}</version> + </dependency> + </dependencies> + + <build> + <sourceDirectory>${basedir}/src/java</sourceDirectory> + </build> + +</project>
