incubator-hcatalog-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tra...@apache.org
Subject svn commit: r1409488 - in /incubator/hcatalog/trunk: ./ ant/ core/ core/src/ core/src/main/ core/src/main/java/ core/src/test/ core/src/test/java/ core/src/test/java/org/ hcatalog-pig-adapter/ ivy/ server-extensions/ shims/ src/java/ src/test/org/ stor...
Date Wed, 14 Nov 2012 22:39:58 GMT
Author: travis
Date: Wed Nov 14 22:39:55 2012
New Revision: 1409488

URL: http://svn.apache.org/viewvc?rev=1409488&view=rev
Log:
HCATALOG-518 Refactor hcatalog-core as subproject

Added:
    incubator/hcatalog/trunk/core/
    incubator/hcatalog/trunk/core/build.xml
    incubator/hcatalog/trunk/core/pom.xml
    incubator/hcatalog/trunk/core/src/
    incubator/hcatalog/trunk/core/src/main/
    incubator/hcatalog/trunk/core/src/main/java/
      - copied from r1409469, incubator/hcatalog/trunk/src/java/
    incubator/hcatalog/trunk/core/src/test/
    incubator/hcatalog/trunk/core/src/test/java/
    incubator/hcatalog/trunk/core/src/test/java/org/
      - copied from r1409469, incubator/hcatalog/trunk/src/test/org/
Removed:
    incubator/hcatalog/trunk/ant/dependencies.xml
    incubator/hcatalog/trunk/ivy/
    incubator/hcatalog/trunk/ivy.xml
    incubator/hcatalog/trunk/shims/ivy.xml
    incubator/hcatalog/trunk/src/java/
    incubator/hcatalog/trunk/src/test/org/
    incubator/hcatalog/trunk/storage-handlers/build.xml
Modified:
    incubator/hcatalog/trunk/.gitignore
    incubator/hcatalog/trunk/CHANGES.txt
    incubator/hcatalog/trunk/ant/checkstyle.xml
    incubator/hcatalog/trunk/ant/deploy.xml
    incubator/hcatalog/trunk/build-common.xml
    incubator/hcatalog/trunk/build.properties
    incubator/hcatalog/trunk/build.xml
    incubator/hcatalog/trunk/hcatalog-pig-adapter/build.xml
    incubator/hcatalog/trunk/hcatalog-pig-adapter/pom.xml
    incubator/hcatalog/trunk/pom.xml
    incubator/hcatalog/trunk/server-extensions/build.xml
    incubator/hcatalog/trunk/server-extensions/pom.xml
    incubator/hcatalog/trunk/shims/build.xml
    incubator/hcatalog/trunk/storage-handlers/hbase/build.xml
    incubator/hcatalog/trunk/storage-handlers/hbase/pom.xml
    incubator/hcatalog/trunk/webhcat/java-client/build.xml
    incubator/hcatalog/trunk/webhcat/java-client/pom.xml
    incubator/hcatalog/trunk/webhcat/svr/build.xml
    incubator/hcatalog/trunk/webhcat/svr/pom.xml

Modified: incubator/hcatalog/trunk/.gitignore
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/.gitignore?rev=1409488&r1=1409487&r2=1409488&view=diff
==============================================================================
--- incubator/hcatalog/trunk/.gitignore (original)
+++ incubator/hcatalog/trunk/.gitignore Wed Nov 14 22:39:55 2012
@@ -25,6 +25,3 @@ build-eclipse
 .git
 .svn
 .reviewboardrc
-metastore_db
-hive/external
-ivy-*.jar

Modified: incubator/hcatalog/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/CHANGES.txt?rev=1409488&r1=1409487&r2=1409488&view=diff
==============================================================================
--- incubator/hcatalog/trunk/CHANGES.txt (original)
+++ incubator/hcatalog/trunk/CHANGES.txt Wed Nov 14 22:39:55 2012
@@ -44,6 +44,8 @@ Trunk (unreleased changes)
   HCAT-427 Document storage-based authorization (lefty via gates)
 
   IMPROVEMENTS
+  HCAT-518 Refactor hcatalog-core as subproject (traviscrawford and toffer)
+
   HCAT-548 Move topic creation in NotificationListener to a separate method (amalakar via avandana)
 
   HCAT-538 HCatalogStorer fails for 100GB of data with dynamic partitioning, number of partition is 300 (amalakar via toffer)

Modified: incubator/hcatalog/trunk/ant/checkstyle.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/ant/checkstyle.xml?rev=1409488&r1=1409487&r2=1409488&view=diff
==============================================================================
--- incubator/hcatalog/trunk/ant/checkstyle.xml (original)
+++ incubator/hcatalog/trunk/ant/checkstyle.xml Wed Nov 14 22:39:55 2012
@@ -19,14 +19,15 @@
 
 <project xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
 
-  <target name="checkstyle-init" depends="ivy-retrieve">
+  <target name="checkstyle-init">
     <taskdef resource="checkstyletask.properties" classpathref="test.class.path"/>
     <mkdir dir="${build.dir}/checkstyle"/>
   </target>
 
   <target name="checkstyle" depends="checkstyle-init" description="run checkstyle">
+    <echo message="${ant.project.name}"/>
     <checkstyle classpathref="test.class.path"
-                config="${basedir}/build-support/checkstyle/coding_style.xml">
+                config="${path.to.basedir}/build-support/checkstyle/coding_style.xml">
       <fileset dir="${basedir}" includes="**/*.java"/>
       <formatter type="plain"/>
       <formatter type="xml" toFile="${build.dir}/checkstyle/checkstyle_result.xml"/>

Modified: incubator/hcatalog/trunk/ant/deploy.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/ant/deploy.xml?rev=1409488&r1=1409487&r2=1409488&view=diff
==============================================================================
--- incubator/hcatalog/trunk/ant/deploy.xml (original)
+++ incubator/hcatalog/trunk/ant/deploy.xml Wed Nov 14 22:39:55 2012
@@ -17,8 +17,7 @@
    limitations under the License.
 -->
 
-<project xmlns:ivy="antlib:org.apache.ivy.ant"
-         xmlns:artifact="artifact:org.apache.maven.artifact.ant">
+<project xmlns:artifact="artifact:org.apache.maven.artifact.ant">
 
     <macrodef name="_sign">
         <attribute name="inputFile"/>
@@ -54,11 +53,6 @@
                    file="${build.dir}/lib/.mvn-dependencies.complete"/>
     </target>
 
-    <!-- Only resolve dependencies if not already copied to lib dir. We copy
-    dependencies into the build dir rather than directly using files from the
-    local maven repo to match how ivy dependencies work. This is necessary for
-    targets like javadoc that need a comprehensive set of all dependencies
-    that would otherwise be unavailable at the top-level build file. -->
     <target name="mvn-dependencies"
             depends="mvn-init,_check-mvn-dependencies"
             unless="mvn-dependencies.complete">

Modified: incubator/hcatalog/trunk/build-common.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/build-common.xml?rev=1409488&r1=1409487&r2=1409488&view=diff
==============================================================================
--- incubator/hcatalog/trunk/build-common.xml (original)
+++ incubator/hcatalog/trunk/build-common.xml Wed Nov 14 22:39:55 2012
@@ -17,14 +17,12 @@
    limitations under the License.
 -->
 
-<project name="build-common-new" default="jar"
-         xmlns:ivy="antlib:org.apache.ivy.ant"
+<project name="build-common" default="jar"
          xmlns:artifact="artifact:org.apache.maven.artifact.ant">
 
   <loadproperties srcfile="${path.to.basedir}/build.properties"/>
-  <loadproperties srcfile="${path.to.basedir}/ivy/libraries.properties"/>
 
-  <import file="${path.to.basedir}/ant/dependencies.xml"/>
+  <import file="${path.to.basedir}/ant/checkstyle.xml"/>
   <import file="${path.to.basedir}/ant/deploy.xml"/>
   <import file="${path.to.basedir}/ant/findbugs.xml"/>
   <import file="${path.to.basedir}/ant/test.xml"/>
@@ -54,7 +52,7 @@
     <delete dir="${build.dir}"/>
   </target>
 
-  <target name="compile" depends="ivy-retrieve">
+  <target name="compile">
     <echo message="${ant.project.name}"/>
     <_javac srcDir="${basedir}/src/main/java"
             destDir="${build.classes}"
@@ -70,10 +68,11 @@
 
   <target name="test" depends="jar, compile-test">
     <echo message="${ant.project.name}"/>
+    <ant target="checkstyle"/>
     <_junit srcDir="${basedir}/src/test/java"/>
   </target>
 
-  <target name="jar" depends="compile,mvn-init">
+  <target name="jar" depends="mvn-dependencies,compile,mvn-init">
     <echo message="${ant.project.name}"/>
     <jar jarfile="${build.dir}/${jar.name}" basedir="${build.classes}">
       <metainf dir="${path.to.basedir}" includes="**/LICENSE.txt,**/NOTICE.txt"/>

Modified: incubator/hcatalog/trunk/build.properties
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/build.properties?rev=1409488&r1=1409487&r2=1409488&view=diff
==============================================================================
--- incubator/hcatalog/trunk/build.properties (original)
+++ incubator/hcatalog/trunk/build.properties Wed Nov 14 22:39:55 2012
@@ -33,11 +33,6 @@ clover.db.dir=${build.dir}/test/clover/d
 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.
 
 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

Modified: incubator/hcatalog/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/build.xml?rev=1409488&r1=1409487&r2=1409488&view=diff
==============================================================================
--- incubator/hcatalog/trunk/build.xml (original)
+++ incubator/hcatalog/trunk/build.xml Wed Nov 14 22:39:55 2012
@@ -18,7 +18,6 @@
 -->
 
 <project name="hcatalog" default="jar"
-         xmlns:ivy="antlib:org.apache.ivy.ant"
          xmlns:artifact="artifact:org.apache.maven.artifact.ant">
 
     <property name="path.to.basedir" location="${basedir}"/>
@@ -38,19 +37,6 @@
     <!-- e2e test properties -->
     <property name="test.e2e.dir" value="${basedir}/src/test/e2e/hcatalog"/>
 
-    <!-- ivy properties set here -->
-    <property name="ivy.dir" location="ivy"/>
-    <loadproperties srcfile="${ivy.dir}/libraries.properties"/>
-    <property name="ivy.jar" location="${ivy.dir}/ivy-${ivy.version}.jar"/>
-    <property name="ivy_repo_url" value="${mvnrepo}/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar"/>
-
-    <property name="ivysettings.xml" location="${ivy.dir}/ivysettings.xml"/>
-    <property name="build.ivy.dir" location="${build.dir}/ivy"/>
-    <property name="pom.file" location="${build.ivy.dir}/${ant.project.name}-${hcatalog.version}.pom"/>
-    <property name="build.ivy.lib.dir" location="${build.ivy.dir}/lib"/>
-    <property name="ivy.lib.dir" location="${build.ivy.lib.dir}/${ant.project.name}"/>
-    <property name="build.ivy.report.dir" location="${build.ivy.dir}/report"/>
-
     <!-- packaging properties -->
     <property name="package.prefix" value="/usr"/>
     <property name="package.conf.dir" value="/etc/hcatalog"/>
@@ -64,79 +50,8 @@
     <!-- rats properties -->
     <property name="rat.reporting.classname" value="rat.Report"/>
 
-    <path id="compile.classpath">
-        <fileset dir="${build.dir}/ivy/lib/default">
-            <include name="**/*.jar"/>
-        </fileset>
-    </path>
-
-    <path id="test.class.path">
-        <pathelement location="${test.classes}"/>
-        <pathelement location="${build.classes}"/>
-        <pathelement location="conf"/>
-        <fileset dir="${build.dir}/ivy/lib/test">
-            <include name="**/*.jar"/>
-        </fileset>
-        <pathelement location="${basedir}/hcatalog-pig-adapter/build/hcatalog-pig-adapter-${hcatalog.version}.jar"/>
-    </path>
-
-    <!-- Classpath that includes all sub packages, used for things like Java docs -->
-    <path id="uber.classpath">
-        <fileset dir="${basedir}">
-            <include name="**/build/ivy/lib/default/*.jar"/>
-        </fileset>
-    </path>
-
-    <!-- This is a little janky because hcatalog-core.jar is not yet a submodule. -->
-    <target name="ivy-report" depends="ivy-retrieve">
-        <antcall target="_ivy-report"/>
-        <ant target="_ivy-report" dir="hcatalog-pig-adapter" inheritAll="false" useNativeBasedir="true"/>
-        <ant target="ivy-report" dir="storage-handlers" inheritAll="false" useNativeBasedir="true"/>
-    </target>
-
-    <target name="ivy-download" unless="offline">
-        <echo message="${ant.project.name}"/>
-        <get src="${ivy_repo_url}" dest="${ivy.jar}" usetimestamp="true" skipexisting="true"/>
-        <typedef uri="antlib:org.apache.ivy.ant" onerror="fail" loaderRef="ivyLoader">
-            <classpath>
-                <pathelement location="${ivy.jar}"/>
-            </classpath>
-        </typedef>
-    </target>
-
-    <target name="ivy-init" depends="ivy-download,_ivy-init">
-        <!-- HCatalog started as a single source tree that produced multiple artifacts.
-        Currently its going through a transition to subprojects. During this transition
-        we jank together pom files for artifacts produced in the existing source tree until
-        they are correctly generated from per-subproject ivy.xml files. -->
-        <copy file="${pom.file}" tofile="${build.ivy.dir}/hcatalog-core-${hcatalog.version}.pom"
-              overwrite="true"/>
-        <replace file="${build.ivy.dir}/hcatalog-core-${hcatalog.version}.pom"
-                 token="artifactId>hcatalog"
-                 value="artifactId>hcatalog-core"/>
-    </target>
-
-    <target name="init" depends="ivy-retrieve,mvn-init">
+    <target name="init">
         <mkdir dir="${dist.dir}"/>
-        <mkdir dir="${build.classes}"/>
-        <mkdir dir="${test.classes}"/>
-    </target>
-
-    <!--
-    ================================================================================
-    Main Build and Jar Section
-    ================================================================================
-    -->
-    <!-- Build HCatalog src files -->
-    <target name="compile-src" depends="init">
-        <javac encoding="${build.encoding}" srcdir="${src.dir}" excludes="${excludes}"
-               includes="**/*.java" destdir="${build.classes}" debug="${javac.debug}"
-               optimize="${javac.optimize}" target="${javac.version}"
-               source="${javac.version}" deprecation="${javac.deprecation}"
-               includeantruntime="false">
-            <compilerarg line="${javac.args}"/>
-            <classpath refid="compile.classpath"/>
-        </javac>
     </target>
 
     <!--
@@ -144,34 +59,13 @@
     Build all jars
     ================================================================================
     -->
-    <target name="jar" depends="checkstyle,compile-src" description="build all jars">
-
-        <!-- Shims are bundled inside the hcatalog-core jar and must be compiled first.
-        This is a candidate for cleanup using maven profiles in the future.
-        -->
-        <ant target="jar" dir="shims" inheritAll="false"/>
-
-        <!-- Build and install the hcatalog-core jar, as its not yet a subproject. -->
-        <jar jarfile="${build.dir}/${ant.project.name}/${hcatalog.core.jar}"
-             basedir="${build.classes}"/>
-        <artifact:install file="${build.dir}/${ant.project.name}/${hcatalog.core.jar}">
-            <artifact:pom file="${build.ivy.dir}/hcatalog-core-${hcatalog.version}.pom"/>
-            <artifact:localRepository path="${mvn.local.repo}}" />
-        </artifact:install>
-
+    <target name="jar" depends="init" description="build all jars">
+        <ant target="jar" dir="core" inheritAll="false"/>
         <ant target="jar" dir="hcatalog-pig-adapter" inheritAll="false"/>
         <ant target="jar" dir="server-extensions" inheritAll="false"/>
         <ant target="jar" dir="webhcat/svr" inheritAll="false"/>
         <ant target="jar" dir="webhcat/java-client" inheritAll="false"/>
-        <ant target="jar" dir="storage-handlers" inheritAll="false"/>
-
-        <!-- Build hcatalog.jar, bundling the pig adapter. Our intention is to stop producing this
-             fat jar after some migration period. -->
-        <jar jarfile="${build.dir}/${ant.project.name}/${hcatalog.jar}">
-            <zipfileset src="${build.dir}/${ant.project.name}/${hcatalog.core.jar}"/>
-            <zipfileset src="hcatalog-pig-adapter/build/hcatalog-pig-adapter-${hcatalog.version}.jar"/>
-            <zipfileset src="server-extensions/build/hcatalog-server-extensions-${hcatalog.version}.jar"/>
-        </jar>
+        <ant target="jar" dir="storage-handlers/hbase" inheritAll="false"/>
     </target>
 
     <!--
@@ -179,44 +73,26 @@
     Test Section
     ================================================================================
     -->
-    <!-- Build HCatalog test files -->
-    <target name="compile-test" depends="jar">
-        <javac
-                encoding="${build.encoding}"
-                srcdir="${test.src.dir}"
-                excludes="${test.excludes}"
-                includes="**/*.java"
-                destdir="${test.classes}"
-                debug="${javac.debug}"
-                optimize="${javac.optimize}"
-                target="${javac.version}"
-                source="${javac.version}"
-                deprecation="${javac.deprecation}"
-                includeantruntime="false">
-            <compilerarg line="${javac.args}"/>
-            <classpath refid="test.class.path"/>
-        </javac>
-    </target>
 
-    <target name="test" depends="compile-test" description="run unit tests">
-        <_junit srcDir="${basedir}/src/test"/>
+    <target name="test" depends="jar" description="run unit tests">
+        <ant target="test" dir="core" inheritAll="false"/>
         <ant target="test" dir="hcatalog-pig-adapter" inheritAll="false"/>
         <ant target="test" dir="server-extensions" inheritAll="false"/>
         <ant target="test" dir="webhcat/svr" inheritAll="false"/>
         <ant target="test" dir="webhcat/java-client" inheritAll="false"/>
-        <ant target="test" dir="storage-handlers" inheritAll="false" useNativeBasedir="true"/>
+        <ant target="test" dir="storage-handlers/hbase" inheritAll="false"/>
     </target>
 
-    <target name="test-with-clover" depends="clover-init, compile-test"
+    <target name="test-with-clover" depends="clover-init"
             description="run unit tests and generate code coverage reports">
-        <_junit srcDir="${basedir}/src/test"/>
+        <ant target="_test-with-clover" dir="core" inheritAll="false"/>
         <ant target="_test-with-clover" dir="hcatalog-pig-adapter" inheritAll="false"/>
         <ant target="_test-with-clover" dir="server-extensions" inheritAll="false"/>
         <ant target="_test-with-clover" dir="webhcat/svr" inheritAll="false"/>
         <ant target="_test-with-clover" dir="webhcat/java-client" inheritAll="false"/>
         <!-- storage-handlers do not have coverage as they have not
              yet been migrated to the new build files. -->
-        <ant target="test" dir="storage-handlers" inheritAll="false" useNativeBasedir="true"/>
+        <ant target="test" dir="storage-handlers/hbase" inheritAll="false"/>
     </target>
 
 
@@ -234,15 +110,7 @@
         <property name="findbugs.report.xmlfile"
                   value="${findbugs.out.dir}/hcat-findbugs-report.xml"/>
 
-        <_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"/>
-
+        <ant target="findbugs" dir="core" inheritAll="false"/>
         <ant target="findbugs" dir="hcatalog-pig-adapter" inheritAll="false"/>
         <ant target="findbugs" dir="server-extensions" inheritAll="false"/>
         <ant target="findbugs" dir="webhcat/svr" inheritAll="false"/>
@@ -258,13 +126,13 @@
     <target name="clean" description="Cleanup all build artifacts">
         <echo message="${ant.project.name}"/>
         <delete dir="${build.dir}"/>
-        <delete dir="${test.warehouse.dir}"/>
+        <ant target="clean" dir="core" inheritAll="false"/>
         <ant target="clean" dir="hcatalog-pig-adapter" inheritAll="false"/>
         <ant target="clean" dir="server-extensions" inheritAll="false"/>
         <ant target="clean" dir="webhcat/svr" inheritAll="false"/>
         <ant target="clean" dir="webhcat/java-client" inheritAll="false"/>
-        <ant target="clean" dir="storage-handlers" inheritAll="false" useNativeBasedir="true"/>
-        <ant target="clean" dir="shims" inheritAll="false" useNativeBasedir="true"/>
+        <ant target="clean" dir="storage-handlers/hbase" inheritAll="false"/>
+        <ant target="clean" dir="shims" inheritAll="false"/>
     </target>
 
     <!--
@@ -298,15 +166,18 @@
                  windowtitle="HCatalog ${hcatalog.version} API"
                  doctitle="HCatalog ${hcatalog.version} API"
                  failonerror="true">
-            <packageset dir="${src.dir}"/>
+            <packageset dir="core/src/main/java"/>
             <packageset dir="hcatalog-pig-adapter/src/main/java"/>
             <packageset dir="server-extensions/src/main/java"/>
+            <packageset dir="storage-handlers/hbase/src/gen-java"/>
+            <packageset dir="storage-handlers/hbase/src/java"/>
             <packageset dir="webhcat/svr/src/main/java"/>
             <packageset dir="webhcat/java-client/src/main/java"/>
             <classpath>
-                <path refid="uber.classpath"/>
+                <fileset dir="core/build/lib/compile"/>
                 <fileset dir="hcatalog-pig-adapter/build/lib/compile"/>
                 <fileset dir="server-extensions/build/lib/compile"/>
+                <fileset dir="storage-handlers/hbase/build/lib/compile"/>
                 <fileset dir="webhcat/svr/build/lib/compile"/>
             </classpath>
             <group title="hcatalog" packages="org.apache.hcatalog.*"/>
@@ -320,18 +191,12 @@
     -->
 
     <target name="mvn-deploy" depends="mvn-init"
-        description="Deploy artifacts to a Maven repository.">
-
-        <artifact:deploy file="${build.dir}/hcatalog/hcatalog-${hcatalog.version}.jar">
-            <artifact:pom file="${build.dir}/ivy/hcatalog-${hcatalog.version}.pom"/>
+            description="Deploy artifacts to a Maven repository.">
+        <artifact:deploy file="pom.xml">
+            <artifact:pom file="pom.xml"/>
             <remoteRepository id="${mvn.deploy.repo.id}" url="${mvn.deploy.repo.url}"/>
         </artifact:deploy>
-
-        <artifact:deploy file="${build.dir}/hcatalog/hcatalog-core-${hcatalog.version}.jar">
-            <artifact:pom file="${build.dir}/ivy/hcatalog-core-${hcatalog.version}.pom"/>
-            <remoteRepository id="${mvn.deploy.repo.id}" url="${mvn.deploy.repo.url}"/>
-        </artifact:deploy>
-
+        <ant target="mvn-deploy" dir="core" inheritAll="false" useNativeBasedir="true"/>
         <ant target="mvn-deploy" dir="hcatalog-pig-adapter" inheritAll="false" useNativeBasedir="true"/>
         <ant target="mvn-deploy" dir="server-extensions" inheritAll="false" useNativeBasedir="true"/>
         <ant target="mvn-deploy" dir="webhcat/java-client" inheritAll="false" useNativeBasedir="true"/>
@@ -346,24 +211,16 @@
             <handler classname="org.apache.tools.ant.input.SecureInputHandler"/>
         </input>
 
-        <_sign inputFile="${build.dir}/hcatalog/hcatalog-${hcatalog.version}.jar"/>
-        <_sign inputFile="${build.dir}/ivy/hcatalog-${hcatalog.version}.pom"/>
-        <artifact:deploy file="${build.dir}/hcatalog/hcatalog-${hcatalog.version}.jar">
-            <artifact:pom file="${build.dir}/ivy/hcatalog-${hcatalog.version}.pom"/>
-            <attach file="${build.dir}/hcatalog/hcatalog-${hcatalog.version}.jar.asc" type="jar.asc"/>
-            <attach file="${build.dir}/ivy/hcatalog-${hcatalog.version}.pom" type="pom.asc"/>
-            <remoteRepository id="${mvn.deploy.repo.id}" url="${mvn.deploy.repo.url}"/>
-        </artifact:deploy>
-
-        <_sign inputFile="${build.dir}/hcatalog/hcatalog-core-${hcatalog.version}.jar"/>
-        <_sign inputFile="${build.dir}/ivy/hcatalog-core-${hcatalog.version}.pom"/>
-        <artifact:deploy file="${build.dir}/hcatalog/hcatalog-core-${hcatalog.version}.jar">
-            <artifact:pom file="${build.dir}/ivy/hcatalog-core-${hcatalog.version}.pom"/>
-            <attach file="${build.dir}/hcatalog/hcatalog-core-${hcatalog.version}.jar.asc" type="jar.asc"/>
-            <attach file="${build.dir}/ivy/hcatalog-core-${hcatalog.version}.pom.asc" type="pom.asc"/>
+        <_sign inputFile="pom.xml"/>
+        <artifact:deploy file="pom.xml">
+            <artifact:pom file="pom.xml"/>
+            <attach file="pom.xml.asc" type="pom.asc"/>
             <remoteRepository id="${mvn.deploy.repo.id}" url="${mvn.deploy.repo.url}"/>
         </artifact:deploy>
 
+        <ant target="mvn-deploy-signed" dir="core" inheritAll="false" useNativeBasedir="true">
+            <property name="gpg.passphrase" value="${gpg.passphrase}"/>
+        </ant>
         <ant target="mvn-deploy-signed" dir="hcatalog-pig-adapter" inheritAll="false" useNativeBasedir="true">
             <property name="gpg.passphrase" value="${gpg.passphrase}"/>
         </ant>
@@ -383,19 +240,6 @@
     Distribution Section
     ===============================================================================
     -->
-    <target name="package-storage-handlers">
-        <property name="handlers.dir" value="${dist.dir}/share/hcatalog/storage-handlers"/>
-        <mkdir dir="${handlers.dir}"/>
-        <ant target="package" dir="storage-handlers" inheritAll="false" useNativeBasedir="true">
-            <property name="dist.handlers.dir" value="${handlers.dir}"/>
-        </ant>
-        <copy todir="${dist.dir}/share/${ant.project.name}/lib" includeEmptyDirs="false" flatten="true">
-            <fileset dir="${dist.dir}/share/${ant.project.name}/storage-handlers">
-                <include name="*/lib/*"/>
-            </fileset>
-        </copy>
-    </target>
-
     <target name="package" depends="jar, docs" description="Create an HCatalog release">
         <mkdir dir="${dist.dir}"/>
         <mkdir dir="${dist.dir}/share/${ant.project.name}/lib"/>
@@ -410,7 +254,7 @@
         <mkdir dir="${dist.dir}/share/doc/${ant.project.name}/license"/>
 
         <copy todir="${dist.dir}/share/${ant.project.name}" includeEmptyDirs="false">
-            <fileset dir="${build.dir}/${ant.project.name}/">
+            <fileset dir="core/build">
                 <include name="hcatalog-*.jar"/>
             </fileset>
             <fileset dir="hcatalog-pig-adapter/build">
@@ -488,11 +332,17 @@
             <fileset dir="${dist.dir}/bin"/>
             <fileset dir="${dist.dir}/sbin"/>
         </chmod>
+
         <!--package storage-handlers -->
-        <antcall target="package-storage-handlers"/>
+
+        <property name="handlers.dir" value="${dist.dir}/share/hcatalog/storage-handlers"/>
+        <mkdir dir="${handlers.dir}"/>
+        <ant target="package" dir="storage-handlers/hbase" inheritAll="false">
+            <property name="dist.handlers.dir" value="${handlers.dir}"/>
+        </ant>
     </target>
 
-    <target name="releaseaudit" depends="ivy-retrieve" description="Release Audit activities">
+    <target name="releaseaudit" description="Release Audit activities">
         <java classname="${rat.reporting.classname}" fork="true">
             <classpath refid="releaseaudit.classpath"/>
             <arg value="${basedir}/src"/>
@@ -508,11 +358,10 @@
              destfile="${build.dir}/${ant.project.name}-src-${hcatalog.version}.tar.gz">
             <tarfileset dir="${basedir}" mode="644" prefix="${ant.project.name}-src-${hcatalog.version}">
                 <include name="conf/**"/>
+                <include name="core/**"/>
                 <include name="hcatalog-pig-adapter/**"/>
                 <include name="server-extensions/**"/>
                 <include name="webhcat/**"/>
-                <include name="ivy/**"/>
-                <exclude name="ivy/*.jar"/>
                 <include name="license/**"/>
                 <include name="shims/**"/>
                 <include name="src/**"/>
@@ -563,8 +412,6 @@
         <ant dir="${test.e2e.dir}" target="deploy"/>
     </target>
 
-    <import file="ant/checkstyle.xml"/>
-    <import file="ant/dependencies.xml"/>
     <import file="ant/deploy.xml"/>
     <import file="ant/findbugs.xml"/>
     <import file="ant/test.xml"/>

Added: incubator/hcatalog/trunk/core/build.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/core/build.xml?rev=1409488&view=auto
==============================================================================
--- incubator/hcatalog/trunk/core/build.xml (added)
+++ incubator/hcatalog/trunk/core/build.xml Wed Nov 14 22:39:55 2012
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+   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 name="hcatalog-core">
+  <property name="path.to.basedir" value="${basedir}/.."/>
+  <property name="pom.file" location="pom.xml"/>
+
+  <import file="../build-common.xml"/>
+
+  <path id="compile.class.path">
+    <fileset dir="${build.dir}/lib/compile"/>
+  </path>
+
+  <path id="test.class.path">
+    <fileset dir="${build.dir}/lib/test"/>
+    <dirset dir="${basedir}/build/classes"/>
+    <dirset dir="${basedir}/build/test/classes"/>
+    <!-- TODO: break circular dependency -->
+    <fileset dir="${path.to.basedir}/hcatalog-pig-adapter/build/lib/test"/>
+    <dirset dir="${path.to.basedir}/hcatalog-pig-adapter/build/classes"/>
+  </path>
+
+  <path id="findbugs.class.path">
+    <fileset dir="${build.dir}/lib/compile"/>
+  </path>
+
+  <target name="compile">
+    <echo message="${ant.project.name}"/>
+    <_javac srcDir="${basedir}/src/main/java"
+            destDir="${build.classes}"
+            classPathRef="compile.class.path"/>
+    <ant target="jar" dir="${path.to.basedir}/shims" inheritAll="false"/>
+  </target>
+
+</project>

Added: incubator/hcatalog/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/core/pom.xml?rev=1409488&view=auto
==============================================================================
--- incubator/hcatalog/trunk/core/pom.xml (added)
+++ incubator/hcatalog/trunk/core/pom.xml Wed Nov 14 22:39:55 2012
@@ -0,0 +1,83 @@
+<!--
+    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 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/maven-v4_0_0.xsd">
+
+    <parent>
+        <groupId>org.apache.hcatalog</groupId>
+        <artifactId>hcatalog</artifactId>
+        <version>0.5.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.hcatalog</groupId>
+    <artifactId>hcatalog-core</artifactId>
+    <packaging>jar</packaging>
+    <version>0.5.0-SNAPSHOT</version>
+    <name>hcatalog-core</name>
+    <url>http://maven.apache.org</url>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-tools</artifactId>
+            <version>${hadoop20.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.hive</groupId>
+            <artifactId>hive-builtins</artifactId>
+            <version>${hive.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.hive</groupId>
+            <artifactId>hive-cli</artifactId>
+            <version>${hive.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.hive</groupId>
+            <artifactId>hive-metastore</artifactId>
+            <version>${hive.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.hive</groupId>
+            <artifactId>hive-common</artifactId>
+            <version>${hive.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.hive</groupId>
+            <artifactId>hive-exec</artifactId>
+            <version>${hive.version}</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <!-- test scope -->
+        <dependency>
+            <groupId>org.apache.pig</groupId>
+            <artifactId>pig</artifactId>
+            <version>${pig.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>

Modified: incubator/hcatalog/trunk/hcatalog-pig-adapter/build.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/hcatalog-pig-adapter/build.xml?rev=1409488&r1=1409487&r2=1409488&view=diff
==============================================================================
--- incubator/hcatalog/trunk/hcatalog-pig-adapter/build.xml (original)
+++ incubator/hcatalog/trunk/hcatalog-pig-adapter/build.xml Wed Nov 14 22:39:55 2012
@@ -29,7 +29,7 @@
 
   <path id="test.class.path">
     <fileset dir="${build.dir}/lib/test"/>
-    <dirset dir="${basedir}/../build/test/classes"/>
+    <dirset dir="${path.to.basedir}/core/build/test/classes"/>
     <dirset dir="${basedir}/build/classes"/>
     <dirset dir="${basedir}/build/test/classes"/>
   </path>
@@ -38,7 +38,4 @@
     <fileset dir="${build.dir}/lib/compile"/>
   </path>
 
-  <!-- Use Maven (instead of Ivy) for dependencies. -->
-  <target name="ivy-retrieve" depends="mvn-dependencies"/>
-
 </project>

Modified: incubator/hcatalog/trunk/hcatalog-pig-adapter/pom.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/hcatalog-pig-adapter/pom.xml?rev=1409488&r1=1409487&r2=1409488&view=diff
==============================================================================
--- incubator/hcatalog/trunk/hcatalog-pig-adapter/pom.xml (original)
+++ incubator/hcatalog/trunk/hcatalog-pig-adapter/pom.xml Wed Nov 14 22:39:55 2012
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.hcatalog</groupId>
         <artifactId>hcatalog</artifactId>
-        <version>${hcatalog.version}</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -30,7 +30,7 @@
     <groupId>org.apache.hcatalog</groupId>
     <artifactId>hcatalog-pig-adapter</artifactId>
     <packaging>jar</packaging>
-    <version>${hcatalog.version}</version>
+    <version>0.5.0-SNAPSHOT</version>
     <name>hcatalog-pig-adapter</name>
     <url>http://maven.apache.org</url>
 
@@ -47,19 +47,5 @@
             <version>${pig.version}</version>
             <scope>compile</scope>
         </dependency>
-
-        <!-- test scope -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-test</artifactId>
-            <version>${hadoop20.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>

Modified: incubator/hcatalog/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/pom.xml?rev=1409488&r1=1409487&r2=1409488&view=diff
==============================================================================
--- incubator/hcatalog/trunk/pom.xml (original)
+++ incubator/hcatalog/trunk/pom.xml Wed Nov 14 22:39:55 2012
@@ -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">
 
+  <properties>
+      <activemq.version>5.5.0</activemq.version>
+      <commons-exec.version>1.1</commons-exec.version>
+      <commons-io.version>2.4</commons-io.version>
+      <hadoop20.version>1.0.3</hadoop20.version>
+      <hbase.version>0.92.0</hbase.version>
+      <hcatalog.version>0.5.0-SNAPSHOT</hcatalog.version>
+      <hive.version>0.10.0-SNAPSHOT</hive.version>
+      <jersey.version>1.14</jersey.version>
+      <jetty.webhcat.version>7.6.0.v20120127</jetty.webhcat.version>
+      <jms.version>1.1</jms.version>
+      <pig.version>0.8.0</pig.version>
+      <slf4j.version>1.6.1</slf4j.version>
+      <zookeeper.version>3.4.3</zookeeper.version>
+  </properties>
+
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
     <version>11</version>
   </parent>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>properties-maven-plugin</artifactId>
-        <version>1.0-alpha-2</version>
-        <executions>
-          <execution>
-            <phase>initialize</phase>
-            <goals>
-              <goal>read-project-properties</goal>
-            </goals>
-            <configuration>
-              <files>
-                <file>ivy/libraries.properties</file>
-              </files>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.hcatalog</groupId>
   <artifactId>hcatalog</artifactId>
-  <version>${hcatalog.version}</version>
+  <version>0.5.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <repositories>
@@ -66,4 +59,32 @@
 
   </repositories>
 
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.10</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+          <groupId>com.puppycrawl.tools</groupId>
+          <artifactId>checkstyle</artifactId>
+          <version>5.5</version>
+          <scope>test</scope>
+          <exclusions>
+            <exclusion>
+              <groupId>com.google.collections</groupId>
+              <artifactId>google-collections</artifactId>
+            </exclusion>
+          </exclusions>
+      </dependency>
+        <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-test</artifactId>
+            <version>${hadoop20.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
 </project>

Modified: incubator/hcatalog/trunk/server-extensions/build.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/server-extensions/build.xml?rev=1409488&r1=1409487&r2=1409488&view=diff
==============================================================================
--- incubator/hcatalog/trunk/server-extensions/build.xml (original)
+++ incubator/hcatalog/trunk/server-extensions/build.xml Wed Nov 14 22:39:55 2012
@@ -29,7 +29,7 @@
 
     <path id="test.class.path">
         <fileset dir="${build.dir}/lib/test"/>
-        <dirset dir="${basedir}/../build/test/classes"/>
+        <dirset dir="${path.to.basedir}/core/build/test/classes"/>
         <dirset dir="${build.dir}/classes"/>
         <dirset dir="${build.dir}/test/classes"/>
     </path>
@@ -37,8 +37,4 @@
     <path id="findbugs.class.path">
         <fileset dir="${build.dir}/lib/compile"/>
     </path>
-
-    <!-- Use Maven (instead of Ivy) for dependencies. -->
-    <target name="ivy-retrieve" depends="mvn-dependencies"/>
-
 </project>

Modified: incubator/hcatalog/trunk/server-extensions/pom.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/server-extensions/pom.xml?rev=1409488&r1=1409487&r2=1409488&view=diff
==============================================================================
--- incubator/hcatalog/trunk/server-extensions/pom.xml (original)
+++ incubator/hcatalog/trunk/server-extensions/pom.xml Wed Nov 14 22:39:55 2012
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.hcatalog</groupId>
         <artifactId>hcatalog</artifactId>
-        <version>${hcatalog.version}</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -30,7 +30,7 @@
     <groupId>org.apache.hcatalog</groupId>
     <artifactId>hcatalog-server-extensions</artifactId>
     <packaging>jar</packaging>
-    <version>${hcatalog.version}</version>
+    <version>0.5.0-SNAPSHOT</version>
     <name>server-extensions</name>
     <url>http://maven.apache.org</url>
 
@@ -68,18 +68,6 @@
 
         <!-- test scope -->
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-test</artifactId>
-            <version>${hadoop20.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>org.apache.pig</groupId>
             <artifactId>pig</artifactId>
             <version>${pig.version}</version>

Modified: incubator/hcatalog/trunk/shims/build.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/shims/build.xml?rev=1409488&r1=1409487&r2=1409488&view=diff
==============================================================================
--- incubator/hcatalog/trunk/shims/build.xml (original)
+++ incubator/hcatalog/trunk/shims/build.xml Wed Nov 14 22:39:55 2012
@@ -1,40 +1,34 @@
 <?xml version="1.0"?>
-<project xmlns:ivy="antlib:org.apache.ivy.ant" name="shims" default="jar">
+
+<!--
+  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 name="shims" default="jar">
   <property name="path.to.basedir" value="${basedir}/.."/>
   <import file="../build-common.xml"/>
 
-  <property name="ivy.dir" location="${path.to.basedir}/ivy" />
-  <loadproperties srcfile="${ivy.dir}/libraries.properties"/>
-
-  <property name="parent.build.dir" location="${path.to.basedir}/build/classes"/>
-  <property name="build.ivy.dir" location="${build.dir}/ivy" />
-  <property name="build.ivy.lib.dir" location="${build.ivy.dir}/lib" />
-
-  <!-- sources and hadoop version for each shim -->
-  <property name="shims.include" value="20,23"/>
-  <property name="shims.0.20.sources" value="${basedir}/src/20/java" />
-  <property name="shims.0.23.sources" value="${basedir}/src/23/java" />
-  <path id="shims.0.20.hadoop.ivy.dir">
-    <fileset dir="${build.ivy.lib.dir}/hadoop20" includes="*.jar"/>
-    <fileset dir="${parent.build.dir}" includes="**/*"/>
-  </path>
-  <path id="shims.0.23.hadoop.ivy.dir">
-    <fileset dir="${build.ivy.lib.dir}/hadoop23" includes="*.jar"/>
-    <fileset dir="${parent.build.dir}" includes="**/*"/>
+  <path id="compile.class.path">
+    <fileset dir="${path.to.basedir}/core/build/lib/compile"/>
   </path>
 
-  <target name="jar" depends="compile">
-    <!-- Classes are added to hcatalog jar -->
-  </target>
-
-  <target name="compile" depends="ivy-retrieve">
+  <target name="jar">
     <echo message="Project: ${ant.project.name}"/>
-    <!-- TODO use for loop -->
-    <_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"/>
   </target>
 </project>

Modified: incubator/hcatalog/trunk/storage-handlers/hbase/build.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/storage-handlers/hbase/build.xml?rev=1409488&r1=1409487&r2=1409488&view=diff
==============================================================================
--- incubator/hcatalog/trunk/storage-handlers/hbase/build.xml (original)
+++ incubator/hcatalog/trunk/storage-handlers/hbase/build.xml Wed Nov 14 22:39:55 2012
@@ -19,7 +19,6 @@
 
 
 <project name="hbase-storage-handler" default="jar"
-         xmlns:ivy="antlib:org.apache.ivy.ant"
          xmlns:artifact="artifact:org.apache.maven.artifact.ant">
 
     <property name="path.to.basedir" location="${basedir}/../.."/>
@@ -43,11 +42,8 @@
     <property name="lib.dir" value="${basedir}/lib/" />
     <property name="src.dir"  location="${basedir}/src/java"/>
     <property name="resources.dir"  location="${basedir}/src/resources"/>
-    <property name="docs.src" value="${basedir}/src/docs"/>
     <property name="build.dir" value="${basedir}/build"/>
     <property name="build.classes" value="${build.dir}/classes" />
-    <property name="build.docs" value="${build.dir}/docs" />
-    <property name="build.javadoc" value="${build.docs}/api" />
     <property name="dist.dir" value="${build.dir}/${final.name}" />
 
     <!-- javac properties -->
@@ -73,43 +69,20 @@
     <property name="test.output" value="no"/>
     <property name="hive.conf.dir" value="${hive.root}/conf"/>
 
-    <!-- ivy properteis set here -->
-    <property name="ivy.dir" location="../../ivy" />
-    <loadproperties srcfile="${ivy.dir}/libraries.properties"/>
-    <property name="ivy.jar" location="${ivy.dir}/ivy-${ivy.version}.jar"/>
-    <property name="ivysettings.xml" location="${ivy.dir}/ivysettings.xml" />
-    <property name="build.ivy.dir" location="${build.dir}/ivy" />
-    <property name="build.ivy.report.dir" location="${build.ivy.dir}/report" />
-    <property name="pom.file" location="${build.ivy.dir}/${ant.project.name}-${hcatalog.version}.pom"/>
-
     <!-- rats properties -->
     <property name="rat.reporting.classname" value="rat.Report"/>
 
-    <!--this is the naming policy for artifacts we want pulled down-->
-    <property name="ivy.artifact.retrieve.pattern" value="${ant.project.name}/[artifact]-[revision](-[classifier]).[ext]"/>
-
-    <path id="compile.classpath">
-      <path refid="mvn.compile.classpath"/>
+    <path id="compile.class.path">
+      <fileset dir="${build.dir}/lib/compile"/>
     </path>
 
-    <path id="test.classpath">
+    <path id="test.class.path">
+        <fileset dir="${build.dir}/lib/test"/>
         <pathelement location="${test.build.classes}" />
         <pathelement location="${build.classes}" />
         <pathelement location="conf"/>
-        <path refid="mvn.test.classpath"/>
     </path>
 
-    <target name="mvn-dependencies" depends="mvn-init">
-      <artifact:dependencies pathId="mvn.compile.classpath" scopes="compile">
-        <pom file="pom.xml"/>
-        <localRepository path="${mvn.local.repo}" />
-      </artifact:dependencies>
-      <artifact:dependencies pathId="mvn.test.classpath" scopes="compile, test">
-        <localRepository path="${mvn.local.repo}" />
-        <pom file="pom.xml"/>
-      </artifact:dependencies>
-    </target>
-
     <target name="init" depends="mvn-dependencies">
         <mkdir dir="${dist.dir}" />
         <mkdir dir="${build.classes}" />
@@ -128,7 +101,7 @@
                source="${javac.version}" deprecation="${javac.deprecation}"
                includeantruntime="false">
             <compilerarg line="${javac.args}"/>
-            <classpath refid="compile.classpath"/>
+            <classpath refid="compile.class.path"/>
         </javac>
     </target>
 
@@ -139,7 +112,7 @@
                 <include name="*"/>
             </fileset>
         </copy>
-        <jar jarfile="${build.dir}/${ant.project.name}/${handler.jar}" basedir="${build.classes}"/>
+        <jar jarfile="${build.dir}/${handler.jar}" basedir="${build.classes}"/>
     </target>
 
     <!--
@@ -155,7 +128,7 @@
                source="${javac.version}" deprecation="${javac.deprecation}"
                includeantruntime="false">
             <compilerarg line="${javac.args}"/>
-            <classpath refid="test.classpath" />
+            <classpath refid="test.class.path" />
         </javac>
     </target>
 
@@ -174,7 +147,7 @@
                 <classpath>
                     <pathelement location="${test.build.classes}" />
                     <pathelement location="." />
-                    <path refid="test.classpath"/>
+                    <path refid="test.class.path"/>
                     <pathelement path="${clover.jar}"/>
                 </classpath>
                 <formatter type="${test.junit.output.format}" />
@@ -212,54 +185,21 @@
     </target>
 
     <!--
-    ================================================================================
-    Docs Section
-    ================================================================================
-    -->
-    <target name="docs" depends="javadoc">
-    </target>
-
-    <target name="javadoc" depends="jar" description="Create documentation">
-        <mkdir dir="${build.javadoc}"/>
-        <javadoc
-          packagenames="org.apache.hcatalog.*"
-          destdir="${build.javadoc}"
-          author="true"
-          version="true"
-          use="true"
-          windowtitle="HCatalog ${hcatalog.version} API"
-          doctitle="HCatalog ${hcatalog.version} API"
-          sourcepath="${src.dir}:${basedir}/src/gen-java">
-        <classpath>
-          <path refid="compile.classpath"/>
-        </classpath>
-        <group title="hcatalog" packages="org.apache.hcatalog.*"/>
-      </javadoc>
-    </target>
-
-
-    <!--
     ===============================================================================
     Distribution Section
     ===============================================================================
     -->
-    <target name="package" depends="jar, docs" description="Create an HCatalog release">
+    <target name="package" depends="jar" description="Create an HCatalog release">
         <mkdir dir="${dist.dir}" />
         <mkdir dir="${dist.dir}/conf" />
         <mkdir dir="${dist.dir}/lib" />
-        <mkdir dir="${dist.dir}/docs" />
 
         <copy todir="${dist.dir}/lib" includeEmptyDirs="false">
-            <fileset dir="${lib.dir}" erroronmissingdir="false" />
-            <fileset dir="${build.dir}/${ant.project.name}">
-                <include name="*.jar"/>
+            <fileset dir="${build.dir}">
+                <include name="hbase-storage-handler-*.jar"/>
             </fileset>
         </copy>
 
-
-        <copy todir="${dist.dir}/docs">
-            <fileset dir="${build.docs}" />
-        </copy>
         <copy todir="${dist.dir}/conf">
             <fileset dir="${basedir}/conf" />
         </copy>
@@ -277,7 +217,6 @@
         </copy>
     </target>
 
-    <import file="../../ant/dependencies.xml"/>
     <import file="../../ant/deploy.xml"/>
 
 </project>

Modified: incubator/hcatalog/trunk/storage-handlers/hbase/pom.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/storage-handlers/hbase/pom.xml?rev=1409488&r1=1409487&r2=1409488&view=diff
==============================================================================
--- incubator/hcatalog/trunk/storage-handlers/hbase/pom.xml (original)
+++ incubator/hcatalog/trunk/storage-handlers/hbase/pom.xml Wed Nov 14 22:39:55 2012
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.apache.hcatalog</groupId>
     <artifactId>hcatalog</artifactId>
-    <version>${hcatalog.version}</version>
+    <version>0.5.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -13,15 +13,15 @@
   <groupId>org.apache.hcatalog</groupId>
   <artifactId>hbase-storage-handler</artifactId>
   <packaging>jar</packaging>
-  <version>${hcatalog.version}</version>
+  <version>0.5.0-SNAPSHOT</version>
   <name>hbase-storage-handler</name>
   <url>http://maven.apache.org</url>
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase</artifactId>
-      <version>${hbase.version}</version>
+      <groupId>org.apache.hive</groupId>
+      <artifactId>hive-hbase-handler</artifactId>
+      <version>${hive.version}</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
@@ -51,18 +51,6 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>${junit.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-test</artifactId>
-      <version>${hadoop20.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.apache.hbase</groupId>
       <artifactId>hbase</artifactId>
       <version>${hbase.version}</version>

Modified: incubator/hcatalog/trunk/webhcat/java-client/build.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/webhcat/java-client/build.xml?rev=1409488&r1=1409487&r2=1409488&view=diff
==============================================================================
--- incubator/hcatalog/trunk/webhcat/java-client/build.xml (original)
+++ incubator/hcatalog/trunk/webhcat/java-client/build.xml Wed Nov 14 22:39:55 2012
@@ -28,17 +28,13 @@
 
   <path id="test.class.path">
     <fileset dir="${build.dir}/lib/test"/>
-    <dirset dir="${path.to.basedir}/build/test/classes"/>
+    <dirset dir="${path.to.basedir}/core/build/test/classes"/>
     <dirset dir="${basedir}/build/classes"/>
     <dirset dir="${basedir}/build/test/classes"/>
-    <dirset dir="../../build/classes"/>
   </path>
 
   <path id="findbugs.class.path">
     <fileset dir="${build.dir}/lib/compile"/>
   </path>
 
-  <!-- Use Maven (instead of Ivy) for dependencies. -->
-  <target name="ivy-retrieve" depends="mvn-dependencies"/>
-
 </project>

Modified: incubator/hcatalog/trunk/webhcat/java-client/pom.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/webhcat/java-client/pom.xml?rev=1409488&r1=1409487&r2=1409488&view=diff
==============================================================================
--- incubator/hcatalog/trunk/webhcat/java-client/pom.xml (original)
+++ incubator/hcatalog/trunk/webhcat/java-client/pom.xml Wed Nov 14 22:39:55 2012
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.hcatalog</groupId>
         <artifactId>hcatalog</artifactId>
-        <version>${hcatalog.version}</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -30,7 +30,7 @@
     <groupId>org.apache.hcatalog</groupId>
     <artifactId>webhcat-java-client</artifactId>
     <packaging>jar</packaging>
-    <version>${hcatalog.version}</version>
+    <version>0.5.0-SNAPSHOT</version>
     <name>webhcat-java-client</name>
     <url>http://maven.apache.org</url>
 
@@ -41,13 +41,5 @@
             <version>${hcatalog.version}</version>
             <scope>compile</scope>
         </dependency>
-
-        <!-- test scope -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>

Modified: incubator/hcatalog/trunk/webhcat/svr/build.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/webhcat/svr/build.xml?rev=1409488&r1=1409487&r2=1409488&view=diff
==============================================================================
--- incubator/hcatalog/trunk/webhcat/svr/build.xml (original)
+++ incubator/hcatalog/trunk/webhcat/svr/build.xml Wed Nov 14 22:39:55 2012
@@ -28,7 +28,7 @@
 
   <path id="test.class.path">
     <fileset dir="${build.dir}/lib/test"/>
-    <dirset dir="${path.to.basedir}/build/test/classes"/>
+    <dirset dir="${path.to.basedir}/core/build/test/classes"/>
     <dirset dir="${basedir}/build/classes"/>
     <dirset dir="${basedir}/build/test/classes"/>
   </path>
@@ -37,7 +37,4 @@
     <fileset dir="${build.dir}/lib/compile"/>
   </path>
 
-  <!-- Use Maven (instead of Ivy) for dependencies. -->
-  <target name="ivy-retrieve" depends="mvn-dependencies"/>
-
 </project>

Modified: incubator/hcatalog/trunk/webhcat/svr/pom.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/webhcat/svr/pom.xml?rev=1409488&r1=1409487&r2=1409488&view=diff
==============================================================================
--- incubator/hcatalog/trunk/webhcat/svr/pom.xml (original)
+++ incubator/hcatalog/trunk/webhcat/svr/pom.xml Wed Nov 14 22:39:55 2012
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.hcatalog</groupId>
         <artifactId>hcatalog</artifactId>
-        <version>${hcatalog.version}</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -30,12 +30,18 @@
     <groupId>org.apache.hcatalog</groupId>
     <artifactId>webhcat</artifactId>
     <packaging>jar</packaging>
-    <version>${hcatalog.version}</version>
+    <version>0.5.0-SNAPSHOT</version>
     <name>webhcat</name>
     <url>http://maven.apache.org</url>
 
     <dependencies>
         <dependency>
+            <groupId>com.sun.jersey</groupId>
+            <artifactId>jersey-servlet</artifactId>
+            <version>${jersey.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-exec</artifactId>
             <version>${commons-exec.version}</version>
@@ -59,19 +65,5 @@
             <version>${slf4j.version}</version>
             <scope>compile</scope>
         </dependency>
-
-        <!-- test scope -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-test</artifactId>
-            <version>${hadoop20.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>



Mime
View raw message