Skip to content

Commit 4a4f16e

Browse files
author
Brock Noland
committed
HIVE-5610 - Merge maven branch into trunk (patch)
git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1537576 13f79535-47bb-0310-9956-ffa450edef68
1 parent b75ae01 commit 4a4f16e

File tree

941 files changed

+9798
-3677
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

941 files changed

+9798
-3677
lines changed

‎ant/pom.xml

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Licensed under the Apache License, Version 2.0 (the "License");
4+
you may not use this file except in compliance with the License.
5+
You may obtain a copy of the License at
6+
7+
http://www.apache.org/licenses/LICENSE-2.0
8+
9+
Unless required by applicable law or agreed to in writing, software
10+
distributed under the License is distributed on an "AS IS" BASIS,
11+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
See the License for the specific language governing permissions and
13+
limitations under the License.
14+
-->
15+
<project xmlns="http://maven.apache.org/POM/4.0.0"
16+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
17+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
18+
<modelVersion>4.0.0</modelVersion>
19+
<parent>
20+
<groupId>org.apache.hive</groupId>
21+
<artifactId>hive</artifactId>
22+
<version>0.13.0-SNAPSHOT</version>
23+
<relativePath>../pom.xml</relativePath>
24+
</parent>
25+
26+
<artifactId>hive-ant</artifactId>
27+
<packaging>jar</packaging>
28+
<name>Hive Ant Utilities</name>
29+
30+
<properties>
31+
<hive.path.to.root>..</hive.path.to.root>
32+
</properties>
33+
34+
<dependencies>
35+
<!-- inter-project -->
36+
<dependency>
37+
<groupId>commons-lang</groupId>
38+
<artifactId>commons-lang</artifactId>
39+
<version>${commons-lang.version}</version>
40+
</dependency>
41+
<dependency>
42+
<groupId>org.apache.ant</groupId>
43+
<artifactId>ant</artifactId>
44+
<version>${ant.version}</version>
45+
</dependency>
46+
<dependency>
47+
<groupId>org.apache.velocity</groupId>
48+
<artifactId>velocity</artifactId>
49+
<version>${velocity.version}</version>
50+
</dependency>
51+
</dependencies>
52+
53+
<build>
54+
<sourceDirectory>${basedir}/src</sourceDirectory>
55+
</build>
56+
57+
</project>

‎ant/src/org/apache/hadoop/hive/ant/GenVectorCode.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ static String joinPath(String...parts) {
460460
public void init(String templateBaseDir, String buildDir) {
461461
File generationDirectory = new File(templateBaseDir);
462462

463-
String buildPath = joinPath(buildDir, "ql", "gen", "vector");
463+
String buildPath = joinPath(buildDir, "generated-sources", "java");
464464

465465
File exprOutput = new File(joinPath(buildPath, "org", "apache", "hadoop",
466466
"hive", "ql", "exec", "vector", "expressions", "gen"));
@@ -478,7 +478,7 @@ public void init(String templateBaseDir, String buildDir) {
478478

479479
File testCodeOutput =
480480
new File(
481-
joinPath(buildDir, "ql", "test", "src", "org",
481+
joinPath(buildDir, "generated-test-sources", "java", "org",
482482
"apache", "hadoop", "hive", "ql", "exec", "vector",
483483
"expressions", "gen"));
484484
testCodeGen = new GenVectorTestCode(testCodeOutput.getAbsolutePath(),

‎beeline/pom.xml

Lines changed: 141 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,141 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Licensed under the Apache License, Version 2.0 (the "License");
4+
you may not use this file except in compliance with the License.
5+
You may obtain a copy of the License at
6+
7+
http://www.apache.org/licenses/LICENSE-2.0
8+
9+
Unless required by applicable law or agreed to in writing, software
10+
distributed under the License is distributed on an "AS IS" BASIS,
11+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
See the License for the specific language governing permissions and
13+
limitations under the License.
14+
-->
15+
<project xmlns="http://maven.apache.org/POM/4.0.0"
16+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
17+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
18+
<modelVersion>4.0.0</modelVersion>
19+
<parent>
20+
<groupId>org.apache.hive</groupId>
21+
<artifactId>hive</artifactId>
22+
<version>0.13.0-SNAPSHOT</version>
23+
<relativePath>../pom.xml</relativePath>
24+
</parent>
25+
26+
<artifactId>hive-beeline</artifactId>
27+
<packaging>jar</packaging>
28+
<name>Hive Beeline</name>
29+
30+
<properties>
31+
<hive.path.to.root>..</hive.path.to.root>
32+
</properties>
33+
34+
<dependencies>
35+
<!-- intra-project -->
36+
<dependency>
37+
<groupId>org.apache.hive</groupId>
38+
<artifactId>hive-common</artifactId>
39+
<version>${project.version}</version>
40+
</dependency>
41+
<dependency>
42+
<groupId>org.apache.hive</groupId>
43+
<artifactId>hive-metastore</artifactId>
44+
<version>${project.version}</version>
45+
</dependency>
46+
<dependency>
47+
<groupId>org.apache.hive</groupId>
48+
<artifactId>hive-shims</artifactId>
49+
<version>${project.version}</version>
50+
<classifier>uberjar</classifier>
51+
<scope>runtime</scope>
52+
</dependency>
53+
<!-- inter-project -->
54+
<dependency>
55+
<groupId>commons-lang</groupId>
56+
<artifactId>commons-lang</artifactId>
57+
<version>${commons-lang.version}</version>
58+
</dependency>
59+
<dependency>
60+
<groupId>commons-logging</groupId>
61+
<artifactId>commons-logging</artifactId>
62+
<version>${commons-logging.version}</version>
63+
</dependency>
64+
<dependency>
65+
<groupId>commons-io</groupId>
66+
<artifactId>commons-io</artifactId>
67+
<version>${commons-io.version}</version>
68+
</dependency>
69+
<dependency>
70+
<groupId>jline</groupId>
71+
<artifactId>jline</artifactId>
72+
<version>${jline.version}</version>
73+
</dependency>
74+
<dependency>
75+
<groupId>org.apache.thrift</groupId>
76+
<artifactId>libthrift</artifactId>
77+
<version>${libthrift.version}</version>
78+
</dependency>
79+
<!-- test intra-project -->
80+
<dependency>
81+
<groupId>org.apache.hive</groupId>
82+
<artifactId>hive-jdbc</artifactId>
83+
<version>${project.version}</version>
84+
<scope>test</scope>
85+
</dependency>
86+
<dependency>
87+
<groupId>org.apache.hive</groupId>
88+
<artifactId>hive-exec</artifactId>
89+
<version>${project.version}</version>
90+
<classifier>tests</classifier>
91+
<scope>test</scope>
92+
</dependency>
93+
<dependency>
94+
<groupId>org.apache.hive</groupId>
95+
<artifactId>hive-service</artifactId>
96+
<version>${project.version}</version>
97+
<scope>test</scope>
98+
</dependency>
99+
<!-- test inter-project -->
100+
<dependency>
101+
<groupId>junit</groupId>
102+
<artifactId>junit</artifactId>
103+
<version>${junit.version}</version>
104+
<scope>test</scope>
105+
</dependency>
106+
</dependencies>
107+
108+
<profiles>
109+
<profile>
110+
<id>hadoop-1</id>
111+
<activation>
112+
<activeByDefault>true</activeByDefault>
113+
</activation>
114+
<dependencies>
115+
<dependency>
116+
<groupId>org.apache.hadoop</groupId>
117+
<artifactId>hadoop-core</artifactId>
118+
<version>${hadoop-20S.version}</version>
119+
<optional>true</optional>
120+
</dependency>
121+
</dependencies>
122+
</profile>
123+
<profile>
124+
<id>hadoop-2</id>
125+
<dependencies>
126+
<dependency>
127+
<groupId>org.apache.hadoop</groupId>
128+
<artifactId>hadoop-common</artifactId>
129+
<version>${hadoop-23.version}</version>
130+
<optional>true</optional>
131+
</dependency>
132+
</dependencies>
133+
</profile>
134+
</profiles>
135+
136+
<build>
137+
<sourceDirectory>${basedir}/src/java</sourceDirectory>
138+
<testSourceDirectory>${basedir}/src/test</testSourceDirectory>
139+
</build>
140+
141+
</project>

‎beeline/src/java/org/apache/hive/beeline/BeeLine.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
*/
9696
public class BeeLine {
9797
private static final ResourceBundle resourceBundle =
98-
ResourceBundle.getBundle(BeeLine.class.getName());
98+
ResourceBundle.getBundle(BeeLine.class.getSimpleName());
9999
private final BeeLineSignalHandler signalHandler = null;
100100
private static final String separator = System.getProperty("line.separator");
101101
private boolean exit = false;

‎beeline/src/java/org/apache/hive/beeline/BeeLine.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,12 +105,12 @@ code: code
105105
invalid-connections: Invalid connection: {0}
106106

107107
script-closed: Script closed. Enter "run {0}" to replay it.
108-
script-already-running: Script ({0}) is already running. Enter "script" with no arguments to stop it.
108+
script-already-running: Script ({0}) is already running. Enter "script" with no arguments to stop it.
109109
script-started: Saving command script to "{0}". Enter "script" with no arguments to stop it.
110110

111111

112112
record-closed: Recording stopped.
113-
record-already-running: Output already being saved to ({0}). Enter "record" with no arguments to stop it.
113+
record-already-running: Output already being saved to ({0}). Enter "record" with no arguments to stop it.
114114
record-started: Saving all output to "{0}". Enter "record" with no arguments to stop it.
115115

116116
autoloading-known-drivers: No known driver to handle "{0}". Searching for known drivers...
@@ -126,7 +126,7 @@ abort-on-error: Aborting command set because "force" is false and \
126126

127127
multiple-matches: Ambiguous command: {0}
128128

129-
really-drop-all: Really drop every table in the database? (y/n)\
129+
really-drop-all: Really drop every table in the database? (y/n)\
130130
abort-drop-all: Aborting drop all tables.
131131

132132
drivers-found-count: 0#No driver classes found|1#{0} driver class found|1<{0} driver classes found

‎beeline/src/test/org/apache/hive/beeline/src/test/TestSchemaTool.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* limitations under the License.
1717
*/
1818

19-
package org.apache.hive.beeline.src.test;
19+
package org.apache.hive.beeline;
2020

2121
import java.io.BufferedWriter;
2222
import java.io.File;
@@ -48,7 +48,7 @@ protected void setUp() throws Exception {
4848
System.setProperty(HiveConf.ConfVars.METASTORECONNECTURLKEY.varname,
4949
"jdbc:derby:" + testMetastoreDB + ";create=true");
5050
hiveConf = new HiveConf(this.getClass());
51-
schemaTool = new HiveSchemaTool(System.getProperty("hive.home"), hiveConf, "derby");
51+
schemaTool = new HiveSchemaTool(System.getProperty("test.tmp.dir"), hiveConf, "derby");
5252
System.setProperty("beeLine.system.exit", "true");
5353
}
5454

0 commit comments

Comments
 (0)