You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ga...@apache.org on 2013/03/30 00:29:07 UTC
svn commit: r1462675 - in /hive/trunk/hcatalog: ./ bin/ build-support/
build-support/ant/ build-support/checkstyle/ conf/ core/
hcatalog-pig-adapter/ historical/trunk/ historical/trunk/bin/
historical/trunk/build-support/ historical/trunk/conf/ histori...
Author: gates
Date: Fri Mar 29 23:29:06 2013
New Revision: 1462675
URL: http://svn.apache.org/r1462675
Log:
HIVE-4264 Moved hcatalog trunk code up to hive/trunk/hcatalog
Added:
hive/trunk/hcatalog/bin/
- copied from r1461840, hive/trunk/hcatalog/historical/trunk/bin/
hive/trunk/hcatalog/build-support/
- copied from r1461840, hive/trunk/hcatalog/historical/trunk/build-support/
hive/trunk/hcatalog/build.properties
- copied, changed from r1461840, hive/trunk/hcatalog/historical/trunk/build.properties
hive/trunk/hcatalog/conf/
- copied from r1461840, hive/trunk/hcatalog/historical/trunk/conf/
hive/trunk/hcatalog/core/
- copied from r1461840, hive/trunk/hcatalog/historical/trunk/core/
hive/trunk/hcatalog/hcatalog-pig-adapter/
- copied from r1461840, hive/trunk/hcatalog/historical/trunk/hcatalog-pig-adapter/
hive/trunk/hcatalog/pom.xml
- copied, changed from r1461840, hive/trunk/hcatalog/historical/trunk/pom.xml
hive/trunk/hcatalog/scripts/
- copied from r1461840, hive/trunk/hcatalog/historical/trunk/scripts/
hive/trunk/hcatalog/server-extensions/
- copied from r1461840, hive/trunk/hcatalog/historical/trunk/server-extensions/
hive/trunk/hcatalog/shims/
- copied from r1461840, hive/trunk/hcatalog/historical/trunk/shims/
hive/trunk/hcatalog/src/docs/
- copied from r1461840, hive/trunk/hcatalog/historical/trunk/src/docs/
hive/trunk/hcatalog/src/packages/
- copied from r1461840, hive/trunk/hcatalog/historical/trunk/src/packages/
hive/trunk/hcatalog/src/test/e2e/
- copied from r1461840, hive/trunk/hcatalog/historical/trunk/src/test/e2e/
hive/trunk/hcatalog/storage-handlers/
- copied from r1461840, hive/trunk/hcatalog/historical/trunk/storage-handlers/
hive/trunk/hcatalog/webhcat/
- copied from r1461840, hive/trunk/hcatalog/historical/trunk/webhcat/
Removed:
hive/trunk/hcatalog/historical/trunk/DISCLAIMER.txt
hive/trunk/hcatalog/historical/trunk/bin/
hive/trunk/hcatalog/historical/trunk/build-support/
hive/trunk/hcatalog/historical/trunk/build.properties
hive/trunk/hcatalog/historical/trunk/conf/
hive/trunk/hcatalog/historical/trunk/core/
hive/trunk/hcatalog/historical/trunk/hcatalog-pig-adapter/
hive/trunk/hcatalog/historical/trunk/pom.xml
hive/trunk/hcatalog/historical/trunk/scripts/
hive/trunk/hcatalog/historical/trunk/server-extensions/
hive/trunk/hcatalog/historical/trunk/shims/
hive/trunk/hcatalog/historical/trunk/src/docs/
hive/trunk/hcatalog/historical/trunk/src/packages/
hive/trunk/hcatalog/historical/trunk/src/test/e2e/
hive/trunk/hcatalog/historical/trunk/storage-handlers/
hive/trunk/hcatalog/historical/trunk/webhcat/
Modified:
hive/trunk/hcatalog/build-support/ant/build-common.xml
hive/trunk/hcatalog/build-support/ant/checkstyle.xml
hive/trunk/hcatalog/build-support/checkstyle/coding_style.xml
hive/trunk/hcatalog/build.xml
hive/trunk/hcatalog/core/pom.xml
hive/trunk/hcatalog/hcatalog-pig-adapter/pom.xml
hive/trunk/hcatalog/ivy.xml
hive/trunk/hcatalog/server-extensions/pom.xml
hive/trunk/hcatalog/src/java/org/apache/hive/hcatalog/package-info.java
hive/trunk/hcatalog/storage-handlers/hbase/build.xml
hive/trunk/hcatalog/storage-handlers/hbase/pom.xml
hive/trunk/hcatalog/webhcat/java-client/pom.xml
hive/trunk/hcatalog/webhcat/svr/pom.xml
Modified: hive/trunk/hcatalog/build-support/ant/build-common.xml
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/build-support/ant/build-common.xml?rev=1462675&r1=1461840&r2=1462675&view=diff
==============================================================================
--- hive/trunk/hcatalog/build-support/ant/build-common.xml (original)
+++ hive/trunk/hcatalog/build-support/ant/build-common.xml Fri Mar 29 23:29:06 2013
@@ -61,6 +61,12 @@
<delete dir="${build.dir}"/>
</target>
+ <target name="clean-test">
+ <echo message="${ant.project.name}"/>
+ <delete dir="${test.dir}"/>
+ </target>
+
+
<!--
Empty target, override in subproject to do any additional
specific resource compilation in subprojects.
Modified: hive/trunk/hcatalog/build-support/ant/checkstyle.xml
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/build-support/ant/checkstyle.xml?rev=1462675&r1=1461840&r2=1462675&view=diff
==============================================================================
--- hive/trunk/hcatalog/build-support/ant/checkstyle.xml (original)
+++ hive/trunk/hcatalog/build-support/ant/checkstyle.xml Fri Mar 29 23:29:06 2013
@@ -33,6 +33,7 @@
<fileset dir="${basedir}">
<exclude name="**/build/**"/>
<exclude name=".idea/**"/>
+ <exclude name="historical/**"/>
<exclude name="build-support/checkstyle/apache_header.txt"/>
<exclude name="build-support/conf/rat-excludes.txt"/>
<exclude name="license/*-LICENSE.txt"/>
Modified: hive/trunk/hcatalog/build-support/checkstyle/coding_style.xml
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/build-support/checkstyle/coding_style.xml?rev=1462675&r1=1461840&r2=1462675&view=diff
==============================================================================
--- hive/trunk/hcatalog/build-support/checkstyle/coding_style.xml (original)
+++ hive/trunk/hcatalog/build-support/checkstyle/coding_style.xml Fri Mar 29 23:29:06 2013
@@ -43,7 +43,7 @@ imposed on others.
<!-- Ensure files contain the Apache source file headers -->
<!-- http://www.apache.org/legal/src-headers.html -->
<module name="RegexpHeader">
- <property name="headerFile" value="build-support/checkstyle/apache_header.txt"/>
+ <property name="headerFile" value="${path.to.basedir}/build-support/checkstyle/apache_header.txt"/>
<property name="multiLines" value="1,2,3,4"/>
</module>
Copied: hive/trunk/hcatalog/build.properties (from r1461840, hive/trunk/hcatalog/historical/trunk/build.properties)
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/build.properties?p2=hive/trunk/hcatalog/build.properties&p1=hive/trunk/hcatalog/historical/trunk/build.properties&r1=1461840&r2=1462675&rev=1462675&view=diff
==============================================================================
--- hive/trunk/hcatalog/historical/trunk/build.properties (original)
+++ hive/trunk/hcatalog/build.properties Fri Mar 29 23:29:06 2013
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-hcatalog.version=0.6.0-SNAPSHOT
+hcatalog.version=0.11.0-SNAPSHOT
jar.name=${ant.project.name}-${hcatalog.version}.jar
hcatalog.jar=${ant.project.name}-${hcatalog.version}.jar
hcatalog.core.jar=${ant.project.name}-core-${hcatalog.version}.jar
Modified: hive/trunk/hcatalog/build.xml
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/build.xml?rev=1462675&r1=1462674&r2=1462675&view=diff
==============================================================================
--- hive/trunk/hcatalog/build.xml (original)
+++ hive/trunk/hcatalog/build.xml Fri Mar 29 23:29:06 2013
@@ -1,31 +1,496 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- 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.
+ 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" default="jar">
- <property name="src.dir" value="${basedir}/src"/>
- <import file="../build-common.xml"/>
-
- <!--
- NB: Only override targets defined in build-common.xml when absolutely necessary.
- -->
-
- <!-- temporarily override the test target to prevent build failures -->
- <!-- small change -->
- <target name="test"/>
+<project name="hcatalog" default="jar"
+ xmlns:artifact="artifact:org.apache.maven.artifact.ant">
+ <!-- This build file doesn't match the Hive pattern yet so don't use their
+ definitions yet. -->
+ <!-- <import file="../build-common.xml"/> -->
+
+ <property name="path.to.basedir" location="${basedir}"/>
+
+ <loadproperties srcfile="${basedir}/build.properties"/>
+
+ <!--
+ ================================================================================
+ Properties and Classpaths Section
+ ================================================================================
+ -->
+
+ <condition property="staging">
+ <equals arg1="${repo}" arg2="staging"/>
+ </condition>
+
+ <!-- e2e test properties -->
+ <property name="test.e2e.dir" value="${basedir}/src/test/e2e/hcatalog"/>
+
+ <!-- packaging properties -->
+ <property name="package.prefix" value="/usr"/>
+ <property name="package.conf.dir" value="/etc/hcatalog"/>
+ <property name="package.log.dir" value="/var/log/hcatalog"/>
+ <property name="package.pid.dir" value="/var/run/hcatalog"/>
+ <property name="package.var.dir" value="/var/lib/hcatalog"/>
+ <property name="package.share.dir" value="/share/hcatalog/${module}"/>
+ <property name="package.buildroot" value="${build.dir}/rpm/hcatalog_package_build_${user.name}"/>
+ <property name="package.build.dir" value="${build.dir}/rpm/hcatalog_package_build_${user.name}/BUILD"/>
+
+ <target name="init">
+ <mkdir dir="${dist.dir}"/>
+ </target>
+
+ <!--
+ ================================================================================
+ Build all jars
+ ================================================================================
+ -->
+ <target name="jar" depends="init" description="build all jars">
+ <ant target="jar" dir="core" inheritAll="false">
+ <property name="_mvn.hadoop.profile" value="${mvn.hadoop.profile}"/>
+ </ant>
+ <ant target="jar" dir="hcatalog-pig-adapter" inheritAll="false">
+ <property name="_mvn.hadoop.profile" value="${mvn.hadoop.profile}"/>
+ </ant>
+ <ant target="jar" dir="server-extensions" inheritAll="false">
+ <property name="_mvn.hadoop.profile" value="${mvn.hadoop.profile}"/>
+ </ant>
+ <ant target="jar" dir="webhcat/svr" inheritAll="false">
+ <property name="_mvn.hadoop.profile" value="${mvn.hadoop.profile}"/>
+ </ant>
+ <ant target="jar" dir="webhcat/java-client" inheritAll="false">
+ <property name="_mvn.hadoop.profile" value="${mvn.hadoop.profile}"/>
+ </ant>
+ <ant target="jar" dir="storage-handlers/hbase" inheritAll="false">
+ <property name="_mvn.hadoop.profile" value="${mvn.hadoop.profile}"/>
+ </ant>
+ </target>
+
+ <!--
+ ================================================================================
+ Test Section
+ ================================================================================
+ -->
+
+ <target name="gen-test" description="Generate tests, a no-op for hcat"/>
+
+ <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/hbase" inheritAll="false"/>
+ <!-- One checkstyle run for the whole repo. Runs after junit tests
+ to piggyback on resolved jars. -->
+ <path id="checkstyle.class.path">
+ <fileset dir="core/build/lib/test"/>
+ </path>
+ <antcall target="checkstyle" inheritRefs="true"/>
+ </target>
+
+ <target name="compile-test" depends="jar" description="compile unit tests">
+ <ant target="compile-test" dir="core" inheritAll="false"/>
+ <ant target="compile-test" dir="hcatalog-pig-adapter" inheritAll="false"/>
+ <ant target="compile-test" dir="server-extensions" inheritAll="false"/>
+ <ant target="compile-test" dir="webhcat/svr" inheritAll="false"/>
+ <ant target="compile-test" dir="webhcat/java-client" inheritAll="false"/>
+ <ant target="compile-test" dir="storage-handlers/hbase" inheritAll="false"/>
+ </target>
+
+ <target name="test-with-clover" depends="clover-init"
+ description="run unit tests and generate code coverage reports">
+ <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/hbase" inheritAll="false"/>
+ </target>
+
+
+ <!--
+ ================================================================================
+ Findbugs Section
+ ================================================================================
+ -->
+
+ <target name="findbugs" depends="init-findbugs,jar">
+ <property name="findbugs.out.dir" value="${test.dir}/findbugs"/>
+ <property name="findbugs.exclude.file" value="${test.src.dir}/findbugsExcludeFile.xml"/>
+ <property name="findbugs.report.htmlfile"
+ value="${findbugs.out.dir}/hcat-findbugs-report.html"/>
+ <property name="findbugs.report.xmlfile"
+ value="${findbugs.out.dir}/hcat-findbugs-report.xml"/>
+
+ <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"/>
+ <ant target="findbugs" dir="webhcat/java-client" inheritAll="false"/>
+ </target>
+
+ <!--
+ ================================================================================
+ Clean Section
+ ================================================================================
+ -->
+ <!-- Clean up children -->
+ <target name="clean" description="Cleanup all build artifacts">
+ <echo message="${ant.project.name}"/>
+ <delete dir="${build.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/hbase" inheritAll="false"/>
+ <ant target="clean" dir="shims" inheritAll="false"/>
+ </target>
+
+ <!-- Clean up children -->
+ <target name="clean-test" description="Cleanup test artifacts">
+ <echo message="${ant.project.name}"/>
+ <delete dir="${build.dir}"/>
+ <ant target="clean-test" dir="core" inheritAll="false"/>
+ <ant target="clean-test" dir="hcatalog-pig-adapter" inheritAll="false"/>
+ <ant target="clean-test" dir="server-extensions" inheritAll="false"/>
+ <ant target="clean-test" dir="webhcat/svr" inheritAll="false"/>
+ <ant target="clean-test" dir="webhcat/java-client" inheritAll="false"/>
+ <ant target="clean-test" dir="storage-handlers/hbase" inheritAll="false"/>
+ <ant target="clean-test" dir="shims" inheritAll="false"/>
+ </target>
+
+ <!--
+ ================================================================================
+ Docs Section
+ ================================================================================
+ -->
+ <target name="docs" depends="forrest, javadoc"
+ description="Generate Javadoc and Forrest documentation">
+ </target>
+
+ <target name="forrest" if="forrest.home"
+ description="Generate forrest-based documentation. To use, specify -Dforrest.home=<base of Apache Forrest installation> on the command line.">
+ <exec dir="${docs.src}" executable="${forrest.home}/bin/forrest"
+ failonerror="true">
+ </exec>
+ <copy todir="${build.docs}/">
+ <fileset dir="${docs.src}/build/site/"/>
+ </copy>
+ </target>
+
+ <target name="javadoc" depends="jar" description="Generate Javadoc documentation">
+ <mkdir dir="${build.javadoc}"/>
+ <record name="${build.dir}/javadoc.log" action="start"/>
+ <javadoc overview="${src.dir}/../docs/overview.html"
+ packagenames="org.apache.hcatalog.*"
+ destdir="${build.javadoc}"
+ author="true"
+ version="true"
+ use="true"
+ noqualifier="all"
+ windowtitle="HCatalog ${hcatalog.version} API"
+ doctitle="HCatalog ${hcatalog.version} API"
+ failonerror="true">
+ <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>
+ <fileset dir="core/build/lib/test"/>
+ <fileset dir="hcatalog-pig-adapter/build/lib/compile"/>
+ <fileset dir="hcatalog-pig-adapter/build/lib/provided"/>
+ <fileset dir="server-extensions/build/lib/compile"/>
+ <fileset dir="server-extensions/build/lib/provided"/>
+ <fileset dir="storage-handlers/hbase/build/lib/compile"/>
+ <fileset dir="storage-handlers/hbase/build/lib/provided"/>
+ <fileset dir="webhcat/svr/build/lib/compile"/>
+ <fileset dir="webhcat/svr/build/lib/provided"/>
+ </classpath>
+ <group title="hcatalog" packages="org.apache.hcatalog.*"/>
+ </javadoc>
+ <record name="${build.dir}/javadoc.log" action="stop"/>
+ <condition property="javadoc.warnings">
+ <isfileselected file="${build.dir}/javadoc.log">
+ <contains text="warnings"/>
+ </isfileselected>
+ </condition>
+ <fail if="javadoc.warnings">Javadoc comments contain warnings.</fail>
+ </target>
+
+ <!--
+ ===============================================================================
+ Deploy Section
+ ===============================================================================
+ -->
+
+ <target name="mvn-deploy" depends="mvn-init"
+ 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>
+ <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"/>
+ <ant target="mvn-deploy" dir="webhcat/svr" inheritAll="false" useNativeBasedir="true"/>
+ </target>
+
+ <target name="mvn-deploy-signed" depends="mvn-init"
+ description="Sign and deploy artifacts to a Maven repository.">
+
+ <input message="Enter your gpg password (or just press return if using an agent): "
+ addproperty="gpg.passphrase">
+ <handler classname="org.apache.tools.ant.input.SecureInputHandler"/>
+ </input>
+
+ <_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>
+ <ant target="mvn-deploy-signed" dir="server-extensions" inheritAll="false" useNativeBasedir="true">
+ <property name="gpg.passphrase" value="${gpg.passphrase}"/>
+ </ant>
+ <ant target="mvn-deploy-signed" dir="webhcat/java-client" inheritAll="false" useNativeBasedir="true">
+ <property name="gpg.passphrase" value="${gpg.passphrase}"/>
+ </ant>
+ <ant target="mvn-deploy-signed" dir="webhcat/svr" inheritAll="false" useNativeBasedir="true">
+ <property name="gpg.passphrase" value="${gpg.passphrase}"/>
+ </ant>
+ </target>
+
+ <!--
+ ===============================================================================
+ Distribution Section
+ ===============================================================================
+ -->
+ <target name="package" depends="jar, docs" description="Create an HCatalog release">
+ <mkdir dir="${dist.dir}"/>
+ <mkdir dir="${dist.dir}/share/${ant.project.name}/lib"/>
+ <mkdir dir="${dist.dir}/etc/hcatalog"/>
+ <mkdir dir="${dist.dir}/bin"/>
+ <mkdir dir="${dist.dir}/sbin"/>
+ <mkdir dir="${dist.dir}/share/${ant.project.name}/scripts"/>
+ <mkdir dir="${dist.dir}/share/${ant.project.name}/templates/conf"/>
+ <mkdir dir="${dist.dir}/share/doc/${ant.project.name}"/>
+ <mkdir dir="${dist.dir}/share/doc/${ant.project.name}/api"/>
+ <mkdir dir="${dist.dir}/share/doc/${ant.project.name}/jdiff"/>
+ <mkdir dir="${dist.dir}/share/doc/${ant.project.name}/license"/>
+
+ <copy todir="${dist.dir}/share/${ant.project.name}" includeEmptyDirs="false">
+ <fileset dir="core/build">
+ <include name="hcatalog-*.jar"/>
+ </fileset>
+ <fileset dir="hcatalog-pig-adapter/build">
+ <include name="hcatalog-*.jar"/>
+ </fileset>
+ <fileset dir="server-extensions/build">
+ <include name="hcatalog-*.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${dist.dir}/share/webhcat/svr/" includeEmptyDirs="false">
+ <fileset dir="webhcat/svr/build">
+ <include name="webhcat-*.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${dist.dir}/share/webhcat/svr/lib/" includeEmptyDirs="false">
+ <fileset dir="webhcat/svr/build/lib/compile/">
+ <include name="*.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${dist.dir}/share/webhcat/java-client/" includeEmptyDirs="false">
+ <fileset dir="webhcat/java-client/build">
+ <include name="webhcat-java-client*.jar"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${dist.dir}/bin">
+ <fileset dir="bin/">
+ <include name="hcat"/>
+ </fileset>
+
+ </copy>
+ <copy todir="${dist.dir}/libexec">
+ <fileset dir="bin">
+ <include name="hcat-config.sh"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${dist.dir}/sbin">
+ <fileset dir="${package.dir}">
+ <include name="*.sh"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${dist.dir}/etc/${ant.project.name}">
+ <fileset dir="conf"/>
+ </copy>
+
+ <copy todir="${dist.dir}/etc/webhcat">
+ <fileset dir="webhcat/svr/src/main/config/" />
+ </copy>
+
+ <copy todir="${dist.dir}/share/${ant.project.name}/scripts">
+ <fileset dir="scripts">
+ <include name="*.sh"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${dist.dir}/share/${ant.project.name}/templates/conf">
+ <fileset dir="src/packages/templates/conf">
+ <include name="*"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${dist.dir}/sbin">
+ <fileset dir="${package.dir}">
+ <include name="*.sh"/>
+ </fileset>
+ <fileset dir="webhcat/svr/src/main/bin">
+ <include name="*.sh"/>
+ </fileset>
+ <fileset dir="bin">
+ <include name="hcat_server.sh"/>
+ </fileset>
+ </copy>
+
+ <!-- Copy the licenses and such -->
+ <copy todir="${dist.dir}/share/doc/${ant.project.name}">
+ <fileset dir=".">
+ <include name="*.txt"/>
+ </fileset>
+ </copy>
+
+ <chmod perm="ugo+x" type="file">
+ <fileset dir="${dist.dir}/bin"/>
+ <fileset dir="${dist.dir}/sbin"/>
+ </chmod>
+
+ <!--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>
+
+ <!--
+ While ant has a native tar task, we call out to the command-line
+ tar command because it preserves file permissions of our carefully
+ constructed package dir.
+ -->
+ <!--
+ <exec executable="tar">
+ <arg value="-C"/>
+ <arg value="${build.dir}"/>
+ <arg value="-czf"/>
+ <arg value="${build.dir}/${final.name}.tar.gz"/>
+ <arg value="${final.name}"/>
+ </exec>
+ <checksum file="${build.dir}/${final.name}.tar.gz" forceOverwrite="yes"/>
+ -->
+ </target>
+
+ <target name="releaseaudit" depends="init" description="generate a release audit report">
+ <get src="${mvnrepo}/org/apache/rat/apache-rat/${apache-rat.version}/apache-rat-${apache-rat.version}.jar"
+ dest="${basedir}/build/apache-rat-${apache-rat.version}.jar"
+ usetimestamp="true"
+ skipexisting="true"/>
+ <java jar="${basedir}/build/apache-rat-${apache-rat.version}.jar"
+ fork="true"
+ output="${basedir}/build/releaseaudit_report.txt">
+ <arg value="--dir"/>
+ <arg value="${basedir}"/>
+ <arg value="--exclude-file"/>
+ <arg value="build-support/conf/rat-excludes.txt"/>
+ </java>
+ <echo message="releaseaudit report generated at ${basedir}/build/releaseaudit_report.txt"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Make release tarball -->
+ <!-- ================================================================== -->
+ <target name="src-release" depends="clean" description="Source distribution">
+ <mkdir dir="${build.dir}"/>
+ <property name="src-release-tarball"
+ value="${build.dir}/${ant.project.name}-src-${hcatalog.version}.tar.gz"/>
+ <tar compression="gzip" longfile="gnu" destfile="${src-release-tarball}">
+ <tarfileset dir="${basedir}" mode="644" prefix="${ant.project.name}-src-${hcatalog.version}">
+ <include name="build-support/**"/>
+ <exclude name="build-support/scripts/**"/>
+ <include name="conf/**"/>
+ <include name="core/**"/>
+ <include name="hcatalog-pig-adapter/**"/>
+ <include name="server-extensions/**"/>
+ <include name="webhcat/**"/>
+ <include name="license/**"/>
+ <include name="shims/**"/>
+ <include name="src/**"/>
+ <include name="storage-handlers/**"/>
+ <include name="*.properties"/>
+ <include name="*.txt"/>
+ <include name="*.xml"/>
+ <include name="KEYS"/>
+ </tarfileset>
+ <tarfileset dir="${basedir}" mode="755" prefix="${ant.project.name}-src-${hcatalog.version}">
+ <include name="bin/**"/>
+ <include name="build-support/scripts/**"/>
+ <include name="scripts/**"/>
+ </tarfileset>
+ </tar>
+ <checksum file="${src-release-tarball}" forceOverwrite="yes"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- End to end tests -->
+ <!-- ================================================================== -->
+
+ <target name="test-e2e" description="run end-to-end tests">
+ <ant dir="${test.e2e.dir}"/>
+ </target>
+
+ <target name="test-e2e-install" description="deploy end-to-end tests to existing cluster">
+ <ant dir="${test.e2e.dir}" target="install"/>
+ </target>
+
+ <target name="test-e2e-deploy" description="deploy end-to-end tests to existing cluster">
+ <ant dir="${test.e2e.dir}" target="deploy"/>
+ </target>
+
+ <import file="build-support/ant/checkstyle.xml"/>
+ <import file="build-support/ant/deploy.xml"/>
+ <import file="build-support/ant/findbugs.xml"/>
+ <import file="build-support/ant/test.xml"/>
+
</project>
Modified: hive/trunk/hcatalog/core/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/core/pom.xml?rev=1462675&r1=1461840&r2=1462675&view=diff
==============================================================================
--- hive/trunk/hcatalog/core/pom.xml (original)
+++ hive/trunk/hcatalog/core/pom.xml Fri Mar 29 23:29:06 2013
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.hcatalog</groupId>
<artifactId>hcatalog</artifactId>
- <version>0.6.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -32,7 +32,7 @@
<groupId>org.apache.hcatalog</groupId>
<artifactId>hcatalog-core</artifactId>
<packaging>jar</packaging>
- <version>0.6.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<name>hcatalog-core</name>
<url>http://maven.apache.org</url>
Modified: hive/trunk/hcatalog/hcatalog-pig-adapter/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/hcatalog-pig-adapter/pom.xml?rev=1462675&r1=1461840&r2=1462675&view=diff
==============================================================================
--- hive/trunk/hcatalog/hcatalog-pig-adapter/pom.xml (original)
+++ hive/trunk/hcatalog/hcatalog-pig-adapter/pom.xml Fri Mar 29 23:29:06 2013
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.hcatalog</groupId>
<artifactId>hcatalog</artifactId>
- <version>0.6.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -32,7 +32,7 @@
<groupId>org.apache.hcatalog</groupId>
<artifactId>hcatalog-pig-adapter</artifactId>
<packaging>jar</packaging>
- <version>0.6.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<name>hcatalog-pig-adapter</name>
<url>http://maven.apache.org</url>
Modified: hive/trunk/hcatalog/ivy.xml
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/ivy.xml?rev=1462675&r1=1462674&r2=1462675&view=diff
==============================================================================
--- hive/trunk/hcatalog/ivy.xml (original)
+++ hive/trunk/hcatalog/ivy.xml Fri Mar 29 23:29:06 2013
@@ -1,19 +1,23 @@
<!--
- 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
+ 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
+ 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.
+ 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.
-->
+
+
<ivy-module version="2.0">
<info organisation="${hive.ivy.org}" module="hive-hcatalog" revision="${version}">
<license name="The Apache Software License, Version 2.0" url="http://www.apache.org/licenses/LICENSE-2.0.txt" />
Copied: hive/trunk/hcatalog/pom.xml (from r1461840, hive/trunk/hcatalog/historical/trunk/pom.xml)
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/pom.xml?p2=hive/trunk/hcatalog/pom.xml&p1=hive/trunk/hcatalog/historical/trunk/pom.xml&r1=1461840&r2=1462675&rev=1462675&view=diff
==============================================================================
--- hive/trunk/hcatalog/historical/trunk/pom.xml (original)
+++ hive/trunk/hcatalog/pom.xml Fri Mar 29 23:29:06 2013
@@ -51,7 +51,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.hcatalog</groupId>
<artifactId>hcatalog</artifactId>
- <version>0.6.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<packaging>pom</packaging>
<build>
Modified: hive/trunk/hcatalog/server-extensions/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/server-extensions/pom.xml?rev=1462675&r1=1461840&r2=1462675&view=diff
==============================================================================
--- hive/trunk/hcatalog/server-extensions/pom.xml (original)
+++ hive/trunk/hcatalog/server-extensions/pom.xml Fri Mar 29 23:29:06 2013
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.hcatalog</groupId>
<artifactId>hcatalog</artifactId>
- <version>0.6.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -32,7 +32,7 @@
<groupId>org.apache.hcatalog</groupId>
<artifactId>hcatalog-server-extensions</artifactId>
<packaging>jar</packaging>
- <version>0.6.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<name>server-extensions</name>
<url>http://maven.apache.org</url>
Modified: hive/trunk/hcatalog/src/java/org/apache/hive/hcatalog/package-info.java
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/src/java/org/apache/hive/hcatalog/package-info.java?rev=1462675&r1=1462674&r2=1462675&view=diff
==============================================================================
--- hive/trunk/hcatalog/src/java/org/apache/hive/hcatalog/package-info.java (original)
+++ hive/trunk/hcatalog/src/java/org/apache/hive/hcatalog/package-info.java Fri Mar 29 23:29:06 2013
@@ -9,11 +9,12 @@
*
* 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.
+ * 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.
*/
package org.apache.hive.hcatalog;
Modified: hive/trunk/hcatalog/storage-handlers/hbase/build.xml
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/storage-handlers/hbase/build.xml?rev=1462675&r1=1461840&r2=1462675&view=diff
==============================================================================
--- hive/trunk/hcatalog/storage-handlers/hbase/build.xml (original)
+++ hive/trunk/hcatalog/storage-handlers/hbase/build.xml Fri Mar 29 23:29:06 2013
@@ -174,6 +174,11 @@
<delete dir="${build.dir}" />
</target>
+ <target name="clean-test" description="Cleanup build artifacts">
+ <delete dir="${test.build.dir}" />
+ </target>
+
+
<!--
===============================================================================
Distribution Section
Modified: hive/trunk/hcatalog/storage-handlers/hbase/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/storage-handlers/hbase/pom.xml?rev=1462675&r1=1461840&r2=1462675&view=diff
==============================================================================
--- hive/trunk/hcatalog/storage-handlers/hbase/pom.xml (original)
+++ hive/trunk/hcatalog/storage-handlers/hbase/pom.xml Fri Mar 29 23:29:06 2013
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.hcatalog</groupId>
<artifactId>hcatalog</artifactId>
- <version>0.6.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -32,7 +32,7 @@
<groupId>org.apache.hcatalog</groupId>
<artifactId>hbase-storage-handler</artifactId>
<packaging>jar</packaging>
- <version>0.6.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<name>hbase-storage-handler</name>
<url>http://maven.apache.org</url>
Modified: hive/trunk/hcatalog/webhcat/java-client/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/webhcat/java-client/pom.xml?rev=1462675&r1=1461840&r2=1462675&view=diff
==============================================================================
--- hive/trunk/hcatalog/webhcat/java-client/pom.xml (original)
+++ hive/trunk/hcatalog/webhcat/java-client/pom.xml Fri Mar 29 23:29:06 2013
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.hcatalog</groupId>
<artifactId>hcatalog</artifactId>
- <version>0.6.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -32,7 +32,7 @@
<groupId>org.apache.hcatalog</groupId>
<artifactId>webhcat-java-client</artifactId>
<packaging>jar</packaging>
- <version>0.6.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<name>webhcat-java-client</name>
<url>http://maven.apache.org</url>
Modified: hive/trunk/hcatalog/webhcat/svr/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/webhcat/svr/pom.xml?rev=1462675&r1=1461840&r2=1462675&view=diff
==============================================================================
--- hive/trunk/hcatalog/webhcat/svr/pom.xml (original)
+++ hive/trunk/hcatalog/webhcat/svr/pom.xml Fri Mar 29 23:29:06 2013
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.hcatalog</groupId>
<artifactId>hcatalog</artifactId>
- <version>0.6.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -32,7 +32,7 @@
<groupId>org.apache.hcatalog</groupId>
<artifactId>webhcat</artifactId>
<packaging>jar</packaging>
- <version>0.6.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<name>webhcat</name>
<url>http://maven.apache.org</url>