diff --git .gitignore .gitignore index e421e48..d7eb9a6 100644 --- .gitignore +++ .gitignore @@ -25,6 +25,3 @@ build-eclipse .git .svn .reviewboardrc -metastore_db -hive/external -ivy-*.jar diff --git ant/checkstyle.xml ant/checkstyle.xml index 1d75e5d..1f15b44 100644 --- ant/checkstyle.xml +++ ant/checkstyle.xml @@ -19,14 +19,15 @@ - + + + config="${path.to.basedir}/build-support/checkstyle/coding_style.xml"> diff --git ant/dependencies.xml ant/dependencies.xml deleted file mode 100644 index 376cf28..0000000 --- ant/dependencies.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git ant/deploy.xml ant/deploy.xml index 270a745..e0f5ea3 100644 --- ant/deploy.xml +++ ant/deploy.xml @@ -17,8 +17,7 @@ limitations under the License. --> - + @@ -54,11 +53,6 @@ file="${build.dir}/lib/.mvn-dependencies.complete"/> - diff --git build-common.xml build-common.xml index cab3f66..0e0af1c 100644 --- build-common.xml +++ build-common.xml @@ -17,14 +17,12 @@ limitations under the License. --> - - - + @@ -54,7 +52,7 @@ - + <_javac srcDir="${basedir}/src/main/java" destDir="${build.classes}" @@ -70,10 +68,11 @@ + <_junit srcDir="${basedir}/src/test/java"/> - + diff --git build.properties build.properties index 600ee51..d75f5de 100644 --- build.properties +++ build.properties @@ -33,11 +33,6 @@ clover.db.dir=${build.dir}/test/clover/db clover.report.dir=${build.dir}/test/clover/reports clover.pdf.report.dir=${build.dir}/test/clover/pdf/reports -ivysettings.xml=${path.to.basedir}/ivy/ivysettings.xml -ivy.xml=${basedir}/ivy.xml -pom.file=${build.dir}/ivy/${ant.project.name}-${hcatalog.version}.pom -ivy.cache.dir=${user.home}/.ivy2/cache - findbugs.out.dir=${test.dir}/findbugs findbugs.exclude.file=${basedir}/src/test/findbugsExcludeFile.xml findbugs.report.htmlfile=${findbugs.out.dir}/hcat-findbugs-report.html @@ -81,5 +76,5 @@ shims.23.hadoop.version=${hive.hadoop-0.23.version} mvn.deploy.repo.id=apache.snapshots.https mvn.deploy.repo.url=https://repository.apache.org/content/repositories/snapshots - +maven-ant-tasks.version=2.1.3 mvn.local.repo=${user.home}/.m2/repository diff --git build.xml build.xml index 86b1fd9..61ff391 100644 --- build.xml +++ build.xml @@ -18,7 +18,6 @@ --> @@ -38,19 +37,6 @@ - - - - - - - - - - - - - @@ -64,79 +50,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - + - - - - - - - - - <_junit srcDir="${basedir}/src/test"/> + + - + - - <_junit srcDir="${basedir}/src/test"/> + - + @@ -234,15 +110,7 @@ - <_findbugs outputDir="${findbugs.out.dir}" - outputFile="${findbugs.report.xmlfile}" - excludeFilter="${findbugs.exclude.file}" - findbugsReportXmlFile="${findbugs.report.xmlfile}" - findbugsReportHtmlFile="${findbugs.report.htmlfile}" - sourceDir="${src.dir}" - jarDir="${build.dir}/${ant.project.name}" - classPathRef="compile.classpath"/> - + @@ -258,13 +126,13 @@ - + - - + + - - - + description="Deploy artifacts to a Maven repository."> + + - - - - - - + @@ -346,24 +211,16 @@ - <_sign inputFile="${build.dir}/hcatalog/hcatalog-${hcatalog.version}.jar"/> - <_sign inputFile="${build.dir}/ivy/hcatalog-${hcatalog.version}.pom"/> - - - - - - - - <_sign inputFile="${build.dir}/hcatalog/hcatalog-core-${hcatalog.version}.jar"/> - <_sign inputFile="${build.dir}/ivy/hcatalog-core-${hcatalog.version}.pom"/> - - - - + <_sign inputFile="pom.xml"/> + + + + + + @@ -383,19 +240,6 @@ Distribution Section =============================================================================== --> - - - - - - - - - - - - - @@ -410,7 +254,7 @@ - + @@ -488,11 +332,17 @@ + - + + + + + + - + @@ -508,11 +358,10 @@ destfile="${build.dir}/${ant.project.name}-src-${hcatalog.version}.tar.gz"> + - - @@ -563,8 +412,6 @@ - - diff --git core/build.xml core/build.xml new file mode 100644 index 0000000..c5ad2c1 --- /dev/null +++ core/build.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_javac srcDir="${basedir}/src/main/java" + destDir="${build.classes}" + classPathRef="compile.class.path"/> + + + + diff --git core/pom.xml core/pom.xml new file mode 100644 index 0000000..d6e2358 --- /dev/null +++ core/pom.xml @@ -0,0 +1,83 @@ + + + + + + org.apache.hcatalog + hcatalog + 0.5.0-SNAPSHOT + ../pom.xml + + + 4.0.0 + org.apache.hcatalog + hcatalog-core + jar + 0.5.0-SNAPSHOT + hcatalog-core + http://maven.apache.org + + + + org.apache.hadoop + hadoop-tools + ${hadoop20.version} + compile + + + org.apache.hive + hive-builtins + ${hive.version} + compile + + + org.apache.hive + hive-cli + ${hive.version} + compile + + + org.apache.hive + hive-metastore + ${hive.version} + compile + + + org.apache.hive + hive-common + ${hive.version} + compile + + + org.apache.hive + hive-exec + ${hive.version} + compile + + + + + org.apache.pig + pig + ${pig.version} + test + + + diff --git hcatalog-pig-adapter/build.xml hcatalog-pig-adapter/build.xml index 355201b..bdd9605 100644 --- hcatalog-pig-adapter/build.xml +++ hcatalog-pig-adapter/build.xml @@ -29,7 +29,7 @@ - + @@ -38,7 +38,4 @@ - - - diff --git hcatalog-pig-adapter/pom.xml hcatalog-pig-adapter/pom.xml index 2b749a8..04d28b7 100644 --- hcatalog-pig-adapter/pom.xml +++ hcatalog-pig-adapter/pom.xml @@ -22,7 +22,7 @@ org.apache.hcatalog hcatalog - ${hcatalog.version} + 0.5.0-SNAPSHOT ../pom.xml @@ -30,7 +30,7 @@ org.apache.hcatalog hcatalog-pig-adapter jar - ${hcatalog.version} + 0.5.0-SNAPSHOT hcatalog-pig-adapter http://maven.apache.org @@ -47,19 +47,5 @@ ${pig.version} compile - - - - junit - junit - ${junit.version} - test - - - org.apache.hadoop - hadoop-test - ${hadoop20.version} - test - diff --git ivy.xml ivy.xml deleted file mode 100644 index c19972d..0000000 --- ivy.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - Apache HCatalog - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git ivy/ivysettings.xml ivy/ivysettings.xml deleted file mode 100644 index cfe292a..0000000 --- ivy/ivysettings.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git ivy/libraries.properties ivy/libraries.properties deleted file mode 100644 index 4c9c3b1..0000000 --- ivy/libraries.properties +++ /dev/null @@ -1,69 +0,0 @@ -# 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. - -#This properties file lists the versions of the various artifacts used by hadoop and components. -#It drives ivy and the generation of a maven POM - -activation.version=1.1 -activemq.version=5.5.0 -antlr.version=3.0.1 -asm-all.version=3.2 -commons-cli.version=1.2 -commons-codec.version=1.4 -commons-configuration.version=1.6 -commons-compress.version=1.4.1 -commons-dbcp.version=1.4 -commons-exec.version=1.1 -commons-httpclient.version=3.0.1 -commons-io.version=2.4 -commons-lang.version=2.4 -commons-logging.version=1.1.1 -commons-pool.version=1.5.4 -checkstyle.version=5.5 -datanucleus-connectionpool.version=2.0.3 -datanucleus-core.version=2.0.3 -datanucleus-enhancer.version=2.0.3 -datanucleus-rdbms.version=2.0.3 -derby.version=10.4.2.0 -fb303.version=0.7.0 -guava.version=11.0.2 -hadoop20.version=1.0.3 -hadoop23.version=0.23.3 -hbase.version=0.92.0 -hcatalog.version=0.5.0-SNAPSHOT -high-scale-lib.version=1.1.1 -hive.version=0.10.0-SNAPSHOT -ivy.version=2.2.0 -jackson.version=1.7.3 -javax-mgmt.version=1.1-rev-1 -jaxb-api.version=2.2.2 -jaxb-impl.version=2.2.3-1 -jdeb.version=0.8 -jdo.version=2.3-ec -jersey.version=1.9.1 -jettison.version=1.1 -jetty.version=6.1.26 -jetty.webhcat.version=7.6.0.v20120127 -jms.version=1.1 -junit.version=4.10 -log4j.version=1.2.16 -maven-ant-tasks.version=2.1.3 -oro.version=2.0.8 -pig.version=0.8.0 -rats-lib.version=0.5.1 -servlet-api.version=2.5 -slf4j.version=1.6.1 -stax-api.version=1.0-2 -wadl-resourcedoc-doclet.version=1.4 -xerces.version=2.9.1 -zookeeper.version=3.4.3 - diff --git pom.xml pom.xml index 52783ea..6ade4a6 100644 --- pom.xml +++ pom.xml @@ -2,39 +2,32 @@ 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"> + + 5.5.0 + 1.1 + 2.4 + 1.0.3 + 0.92.0 + 0.5.0-SNAPSHOT + 0.10.0-SNAPSHOT + 1.14 + 7.6.0.v20120127 + 1.1 + 0.8.0 + 1.6.1 + 3.4.3 + + org.apache apache 11 - - - - org.codehaus.mojo - properties-maven-plugin - 1.0-alpha-2 - - - initialize - - read-project-properties - - - - ivy/libraries.properties - - - - - - - - 4.0.0 org.apache.hcatalog hcatalog - ${hcatalog.version} + 0.5.0-SNAPSHOT pom @@ -66,4 +59,32 @@ + + + junit + junit + 4.10 + test + + + com.puppycrawl.tools + checkstyle + 5.5 + test + + + com.google.collections + google-collections + + + + + org.apache.hadoop + hadoop-test + ${hadoop20.version} + test + + + + diff --git server-extensions/build.xml server-extensions/build.xml index f753ce2..8351f27 100644 --- server-extensions/build.xml +++ server-extensions/build.xml @@ -29,7 +29,7 @@ - + @@ -37,8 +37,4 @@ - - - - diff --git server-extensions/pom.xml server-extensions/pom.xml index 3f6ee20..eaac449 100644 --- server-extensions/pom.xml +++ server-extensions/pom.xml @@ -22,7 +22,7 @@ org.apache.hcatalog hcatalog - ${hcatalog.version} + 0.5.0-SNAPSHOT ../pom.xml @@ -30,7 +30,7 @@ org.apache.hcatalog hcatalog-server-extensions jar - ${hcatalog.version} + 0.5.0-SNAPSHOT server-extensions http://maven.apache.org @@ -68,18 +68,6 @@ - junit - junit - ${junit.version} - test - - - org.apache.hadoop - hadoop-test - ${hadoop20.version} - test - - org.apache.pig pig ${pig.version} diff --git shims/build.xml shims/build.xml index 683495d..b13c7bd 100644 --- shims/build.xml +++ shims/build.xml @@ -1,40 +1,34 @@ - - - - - + - - - - - - - - - - - + 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. +--> - - - + + + + + + + - + - - <_javac srcDir="${shims.0.20.sources}" - destDir="${parent.build.dir}" - classPathRef="shims.0.20.hadoop.ivy.dir"/> - <_javac srcDir="${shims.0.23.sources}" - destDir="${parent.build.dir}" - classPathRef="shims.0.23.hadoop.ivy.dir"/> + <_javac srcDir="${basedir}/src/${hadoopversion}/java" + destDir="${path.to.basedir}/core/build/classes" + classPathRef="compile.class.path"/> diff --git shims/ivy.xml shims/ivy.xml deleted file mode 100644 index 29eb330..0000000 --- shims/ivy.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - Apache HCatalog - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git storage-handlers/build.xml storage-handlers/build.xml deleted file mode 100644 index 484989a..0000000 --- storage-handlers/build.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - Executing storage-handler "${target}" for hbase - - - - - - - - - - - Generating all handlers - - - - - - - Testing all handlers - - - - - - - Cleaning all handlers - - - - - - - Package all handlers - - - - - diff --git storage-handlers/hbase/build.xml storage-handlers/hbase/build.xml index cee25ec..558e9c8 100644 --- storage-handlers/hbase/build.xml +++ storage-handlers/hbase/build.xml @@ -19,7 +19,6 @@ @@ -43,11 +42,8 @@ - - - @@ -73,43 +69,20 @@ - - - - - - - - - - - - - - + + - + + - - - - - - - - - - - - @@ -128,7 +101,7 @@ source="${javac.version}" deprecation="${javac.deprecation}" includeantruntime="false"> - + @@ -139,7 +112,7 @@ - + - - - - - - - - - - - - - - - - + - - - - + + - - - - @@ -277,7 +217,6 @@ - diff --git storage-handlers/hbase/pom.xml storage-handlers/hbase/pom.xml index 73d97c9..6066b4b 100644 --- storage-handlers/hbase/pom.xml +++ storage-handlers/hbase/pom.xml @@ -5,7 +5,7 @@ org.apache.hcatalog hcatalog - ${hcatalog.version} + 0.5.0-SNAPSHOT ../../pom.xml @@ -13,15 +13,15 @@ org.apache.hcatalog hbase-storage-handler jar - ${hcatalog.version} + 0.5.0-SNAPSHOT hbase-storage-handler http://maven.apache.org - org.apache.hbase - hbase - ${hbase.version} + org.apache.hive + hive-hbase-handler + ${hive.version} compile @@ -51,18 +51,6 @@ test - junit - junit - ${junit.version} - test - - - org.apache.hadoop - hadoop-test - ${hadoop20.version} - test - - org.apache.hbase hbase ${hbase.version} diff --git webhcat/java-client/build.xml webhcat/java-client/build.xml index 0b06dbc..7c12468 100644 --- webhcat/java-client/build.xml +++ webhcat/java-client/build.xml @@ -28,17 +28,13 @@ - + - - - - diff --git webhcat/java-client/pom.xml webhcat/java-client/pom.xml index 82bba9a..882abd7 100644 --- webhcat/java-client/pom.xml +++ webhcat/java-client/pom.xml @@ -22,7 +22,7 @@ org.apache.hcatalog hcatalog - ${hcatalog.version} + 0.5.0-SNAPSHOT ../../pom.xml @@ -30,7 +30,7 @@ org.apache.hcatalog webhcat-java-client jar - ${hcatalog.version} + 0.5.0-SNAPSHOT webhcat-java-client http://maven.apache.org @@ -41,13 +41,5 @@ ${hcatalog.version} compile - - - - junit - junit - ${junit.version} - test - diff --git webhcat/svr/build.xml webhcat/svr/build.xml index 7057dbd..070d9be 100644 --- webhcat/svr/build.xml +++ webhcat/svr/build.xml @@ -28,7 +28,7 @@ - + @@ -37,7 +37,4 @@ - - - diff --git webhcat/svr/pom.xml webhcat/svr/pom.xml index 1bf6ef2..3ae03e7 100644 --- webhcat/svr/pom.xml +++ webhcat/svr/pom.xml @@ -22,7 +22,7 @@ org.apache.hcatalog hcatalog - ${hcatalog.version} + 0.5.0-SNAPSHOT ../../pom.xml @@ -30,12 +30,18 @@ org.apache.hcatalog webhcat jar - ${hcatalog.version} + 0.5.0-SNAPSHOT webhcat http://maven.apache.org + com.sun.jersey + jersey-servlet + ${jersey.version} + compile + + org.apache.commons commons-exec ${commons-exec.version} @@ -59,19 +65,5 @@ ${slf4j.version} compile - - - - junit - junit - ${junit.version} - test - - - org.apache.hadoop - hadoop-test - ${hadoop20.version} - test -