incubator-hcatalog-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r1095161 - in /incubator/hcatalog/trunk: ./ bin/ hive/ ivy/ lib/ src/docs/ src/docs/src/documentation/content/xdocs/images/ src/test/
Date Tue, 19 Apr 2011 18:33:20 GMT
Author: gates
Date: Tue Apr 19 18:33:19 2011
New Revision: 1095161

URL: http://svn.apache.org/viewvc?rev=1095161&view=rev
Log:
HCATALOG-4 Get the build file up and running.

Added:
    incubator/hcatalog/trunk/bin/umaskcheck.sh   (with props)
    incubator/hcatalog/trunk/hive/README
    incubator/hcatalog/trunk/ivy/ivysettings.xml
    incubator/hcatalog/trunk/lib/
    incubator/hcatalog/trunk/lib/libthrift.jar   (with props)
    incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/images/
    incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/images/build-with-forrest-button.jpg
  (with props)
    incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/images/hcat-archt.jpg
  (with props)
    incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/images/hcat-box.jpg
  (with props)
    incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/images/hcat-product.jpg
  (with props)
    incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/images/hcat.jpg   (with
props)
    incubator/hcatalog/trunk/src/test/all-tests
    incubator/hcatalog/trunk/src/test/excluded-tests
Modified:
    incubator/hcatalog/trunk/build.xml
    incubator/hcatalog/trunk/hive/   (props changed)
    incubator/hcatalog/trunk/ivy.xml
    incubator/hcatalog/trunk/ivy/libraries.properties
    incubator/hcatalog/trunk/src/docs/forrest.properties

Added: incubator/hcatalog/trunk/bin/umaskcheck.sh
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/bin/umaskcheck.sh?rev=1095161&view=auto
==============================================================================
--- incubator/hcatalog/trunk/bin/umaskcheck.sh (added)
+++ incubator/hcatalog/trunk/bin/umaskcheck.sh Tue Apr 19 18:33:19 2011
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+if [ `umask` != '0022' ]
+then
+  echo "Umask must be set to 0022 to run hcatalog unit tests."
+  exit 1
+fi

Propchange: incubator/hcatalog/trunk/bin/umaskcheck.sh
------------------------------------------------------------------------------
    svn:executable = *

Modified: incubator/hcatalog/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/build.xml?rev=1095161&r1=1095160&r2=1095161&view=diff
==============================================================================
--- incubator/hcatalog/trunk/build.xml (original)
+++ incubator/hcatalog/trunk/build.xml Tue Apr 19 18:33:19 2011
@@ -18,61 +18,309 @@
 -->
 
 
-<!-- 
-Before you can run these subtargets directly, you need 
-to call at top-level: ant deploy-contrib compile-core-test
--->
 <project name="hcatalog" default="fatjar" xmlns:ivy="antlib:org.apache.ivy.ant" >
 
-  <property name="src.dir"  location="${basedir}/src/java"/>
+  <!--
+  ================================================================================
+  Properties and Classpaths Section
+  ================================================================================
+  -->
+  <!-- name and version -->
   <property name="hcatalog.version" value="0.1.0"/>
   <property name="hcatalog.jar" value="${ant.project.name}-${hcatalog.version}.jar"/>
+    <property name="final.name" value="${ant.project.name}-${hcatalog.version}" />
+
+  <!-- hive properties -->
+  <property name="hive.root" value="${basedir}/hive/external"/>
+
+  <!-- build properties -->
+  <property name="src.dir"  location="${basedir}/src/java"/>
   <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 -->
+  <property name="build.encoding" value="UTF8" />
+  <property name="excludes" value=""/>
+  <property name="javac.debug" value="on" />
+  <property name="javac.optimize" value="on" />
+  <property name="javac.deprecation" value="off" />
+  <property name="javac.version" value="1.6" />
+  <property name="javac.args" value="" />
 
-  <import file="../build-common.xml"/>
+  <!-- test properties -->
+  <property name="test.src.dir" value="${basedir}/src/test" />
+  <property name="test.build.dir" value="${build.dir}/test" />
+  <property name="test.build.classes" value="${test.build.dir}/classes" />
+  <property name="test.log.dir" value="${test.build.dir}/logs" />
+  <property name="test.timeout" value="2700000" />
+  <property name="test.junit.output.format" value="plain" />
+  <property name="test.all.file" value="${test.src.dir}/all-tests"/>
+  <property name="test.exclude.file" value="${test.src.dir}/excluded-tests"/>
+  <property name="test.output" value="no"/>
+  <property name="hive.conf.dir" value="${hive.root}/conf"/>
+  <property name="test.warehouse.dir" value="/tmp/hcat_junit_warehouse"/>
+
+  <!-- ivy properteis set here -->
+  <property name="ivy.repo.dir" value="${user.home}/ivyrepo" />
+  <property name="ivy.dir" location="ivy" />
+  <loadproperties srcfile="${ivy.dir}/libraries.properties"/>
+  <property name="asfrepo" value="https://repository.apache.org"/>
+  <property name="asfsnapshotrepo" value="${asfrepo}/content/repositories/snapshots"/>
+  <property name="mvnrepo" value="http://repo2.maven.org/maven2"/>
+  <property name="asfstagingrepo" value="${asfrepo}/service/local/staging/deploy/maven2"/>
+  <property name="ivy.jar" location="${ivy.dir}/ivy-${ivy.version}.jar"/>
+  <property name="ant_task.jar" location="${ivy.dir}/maven-ant-tasks-${ant-task.version}.jar"/>
+  <property name="ant_task_repo_url"
+    value="${mvnrepo}/org/apache/maven/maven-ant-tasks/${ant-task.version}/maven-ant-tasks-${ant-task.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="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" />
+
+    <!--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]"/>
+
+  <!-- Classpaths for various builds -->
+  <path id="classpath">
+    <fileset dir="${hive.root}" includes="testlibs/*.jar"/>
+    <fileset dir="${hive.root}" includes="testlibs/*.jar"/>
+    <fileset dir="${hive.root}/lib" includes="*.jar"/>
+    <fileset dir="${hive.root}/build/cli" includes="*.jar"/>
+    <fileset dir="${hive.root}/build/common" includes="*.jar"/>
+    <fileset dir="${hive.root}/build/serde" includes="*.jar"/>
+    <fileset dir="${hive.root}/build/metastore" includes="*.jar"/>
+    <fileset dir="${hive.root}/build/ql" includes="*.jar"/>
+    <fileset dir="${hive.root}/ql/lib" includes="antlr-3.0.1.jar"/>
+    <fileset dir="${hive.root}/build/hadoopcore/hadoop-0.20.3-CDH3-SNAPSHOT/"
+      includes="hadoop-core-0.20.3-CDH3-SNAPSHOT.jar"/>
+    <fileset dir="${ivy.lib.dir}" includes="*.jar"/>
+    
+  </path>
 
   <path id="test.classpath">
     <pathelement location="${test.build.classes}" />
     <pathelement location="" />
     <pathelement location="conf"/>
-    <pathelement location="${test.src.data.dir}/conf"/>
     <pathelement location="${hive.conf.dir}"/>
+    <!-- jars Hive depends on -->
+    <fileset dir="${hive.root}/build/ivy/lib/default/">
+      <include name="**/*.jar" />
+    </fileset>
+    <!-- jars Hadoop depends on -->
+    <fileset dir="${hive.root}/build/hadoopcore/hadoop-0.20.3-CDH3-SNAPSHOT/lib/" >
+      <include name="**/*.jar" />
+    </fileset>
+    <!--
+    <pathelement location="${test.src.data.dir}/conf"/>
     <pathelement location="${hadoop.oldstyle-name.test.jar}"/>
     <pathelement location="${hadoop.newstyle-name.test.jar}"/>
     <pathelement location="${common.jar}"/>
     <pathelement location="${jsp.test.jar}"/>
+    -->
+    <pathelement location="${hcatalog.jar}"/>
+    <!--
     <pathelement location="${hadoop.root}/lib/jsp-2.1/jsp-api-2.1.jar"/>
-    <fileset dir="${hive.root}" includes="testlibs/*.jar"/>
-    <fileset dir="${hadoop.root}/lib" includes="*.jar"/>
+    -->
     <path refid="classpath"/>
+    <fileset dir="${hive.root}/build/hadoopcore/hadoop-0.20.3-CDH3-SNAPSHOT/"
+      includes="hadoop-test-0.20.3-CDH3-SNAPSHOT.jar"/>
   </path>
 
-  <target name="fatjar" depends="jar">
-     <jar jarfile="${hcatalog.jar}" basedir="${build.dir}/classes">
+  <!--
+  ================================================================================
+  Ivy Section
+  ================================================================================
+  -->
+  <!-- Ivy goop stolen directly from Pig's build.xml -->
+  <target name="ivy-init-dirs">
+    <mkdir dir="${build.ivy.dir}" />
+    <mkdir dir="${build.ivy.lib.dir}" />
+    <mkdir dir="${build.ivy.report.dir}" />
+  </target>
+
+  <target name="ivy-probe-antlib" >
+    <condition property="ivy.found">
+      <typefound uri="antlib:org.apache.ivy.ant" name="cleancache"/>
+    </condition>
+  </target>
+
+  <target name="ivy-download" description="To download ivy" unless="offline">
+    <get src="${ivy_repo_url}" dest="${ivy.jar}" usetimestamp="true"/>
+  </target>
+
+  <!--
+     To avoid Ivy leaking things across big projects, always load Ivy in the same classloader.
+     Also note how we skip loading Ivy if it is already there, just to make sure all is well.
+  -->
+  <target name="ivy-init-antlib" depends="ivy-download,ivy-init-dirs,ivy-probe-antlib"
unless="ivy.found">
+    <typedef uri="antlib:org.apache.ivy.ant" onerror="fail" loaderRef="ivyLoader">
+      <classpath>
+        <pathelement location="${ivy.jar}"/>
+      </classpath>
+    </typedef>
+    <fail>
+      <condition >
+        <not>
+          <typefound uri="antlib:org.apache.ivy.ant" name="cleancache"/>
+        </not>
+      </condition>
+         You need Apache Ivy 2.0 or later from http://ant.apache.org/
+         It could not be loaded from ${ivy_repo_url}
+    </fail>
+  </target>
+
+  <target name="ivy-init" depends="ivy-init-antlib" >
+    <!--Configure Ivy by reading in the settings file
+        If anyone has already read in a settings file into this settings ID, it gets priority
+    -->
+    <ivy:configure settingsid="${ant.project.name}.ivy.settings"
+      file="${ivysettings.xml}" override='false'/>
+  </target>
+
+  <target name="ivy-compile" depends="ivy-init" description="Resolve, Retrieve Ivy-managed
artifacts for compile configuration">
+    <ivy:resolve settingsRef="${ant.project.name}.ivy.settings" conf="common"/>
+    <ivy:retrieve settingsRef="${ant.project.name}.ivy.settings"
+      pattern="${build.ivy.lib.dir}/${ivy.artifact.retrieve.pattern}" conf="common"/>
+    <ivy:cachepath pathid="compile.classpath" conf="common"/>     
+  </target>
+
+  <target name="init" depends="ivy-compile" >
+    <mkdir dir="${dist.dir}" />
+    <mkdir dir="${build.classes}" />
+    <mkdir dir="${test.build.classes}" />
+  </target>
+
+
+  <!-- Build the external hive code -->
+  <target name="hive.jar">
+    <ant antfile="build.xml" dir="${hive.root}" target="jar"/>
+  </target>
+
+  <!--
+  ================================================================================
+  Main Build and Jar Section
+  ================================================================================
+  -->
+  <!-- Build HCatalog src files -->
+  <target name="compile-src" depends="init,hive.jar">
+    <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="classpath" />
+    </javac>
+  </target>
+ 
+  <!-- Build the jar, this is the default -->
+  <target name="fatjar" depends="compile-src">
+     <jar jarfile="${hcatalog.jar}" basedir="${build.classes}">
         <zipgroupfileset dir="${hive.root}/lib" includes="thrift-fb303-${thrift-fb303.version}.jar,thrift-${thrift.version}.jar,commons-lang-2.4.jar,derby.jar"/>

-        <zipgroupfileset dir="${build.dir.hive}/metastore" includes="hive-metastore-${version}.jar"/>

-        <zipgroupfileset dir="${build.dir.hive}/ql" includes="hive-exec-${version}.jar"/>

-        <zipgroupfileset dir="${build.dir.hive}/common" includes="hive-common-${version}.jar"/>

-        <zipgroupfileset dir="${build.dir.hive}/serde" includes="hive-serde-${version}.jar"/>

+        <zipgroupfileset dir="${hive.root}/metastore" includes="hive-metastore-${version}.jar"/>

+        <zipgroupfileset dir="${hive.root}/ql" includes="hive-exec-${version}.jar"/>

+        <zipgroupfileset dir="${hive.root}/common" includes="hive-common-${version}.jar"/>

+        <zipgroupfileset dir="${hive.root}/serde" includes="hive-serde-${version}.jar"/>

     </jar>
   </target>
 
+  <!--
+  ================================================================================
+  Test Section
+  ================================================================================
+  -->
+  <!-- Build HCatalog test files -->
+  <target name="compile-test" depends="fatjar">
+    <javac encoding="${build.encoding}" srcdir="${test.src.dir}" excludes="${excludes}"
+        includes="**/*.java" destdir="${test.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="test.classpath" />
+    </javac>
+  </target>
+
+  <!-- Run the unit tests -->
+  <target name="test" depends="compile-test">
+    <sequential>
+      <!-- If anyone knows how to set umask inside ant please do so -->
+      <exec executable="bin/umaskcheck.sh" failonerror="true"/>
+      <delete dir="${test.log.dir}"/>
+      <mkdir dir="${test.log.dir}"/>
+      <mkdir dir="${test.warehouse.dir}"/>
+      <junit showoutput="${test.output}" printsummary="yes" haltonfailure="no"
+          fork="yes" maxmemory="512m" dir="${basedir}" timeout="${test.timeout}"
+          errorProperty="tests.failed" failureProperty="tests.failed">
+        <sysproperty key="hadoop.log.dir" value="${test.log.dir}"/>
+        <sysproperty key="hive.metastore.warehouse.dir" value="${test.warehouse.dir}"/>
+        <classpath>
+          <pathelement location="${test.build.classes}" />
+          <pathelement location="." />
+          <path refid="test.classpath"/>
+        </classpath>
+        <formatter type="${test.junit.output.format}" />
+        <!-- If the user has not defined a particular test to run, run them all -->
+        <batchtest fork="yes" todir="${test.log.dir}" unless="testcase">
+          <fileset dir="src/test">
+            <patternset>
+              <includesfile name="${test.all.file}"/>
+              <excludesfile name="${test.exclude.file}"/>
+            </patternset>
+          </fileset>
+        </batchtest>
+        <!-- Run one test case.  To use this define -Dtestcase=X on the command line -->
+        <batchtest fork="yes" todir="${test.log.dir}" if="testcase">
+          <fileset dir="src/test" includes="**/${testcase}.java"/>
+        </batchtest>
+
+        <assertions>
+          <enable />
+        </assertions>
+
+      </junit>
+      <fail if="tests.failed">Tests failed!</fail>
+    </sequential>
+  </target>
+
+  <!--
+  ================================================================================
+  Clean Section
+  ================================================================================
+  -->
+  <!-- Clean the external hive code -->
+  <target name="hive.clean">
+    <ant antfile="${hive.root}/build.xml" dir="${hive.root}" target="clean"/>
+  </target>
+
+  <!-- Clean up children -->
+  <target name="clean" depends="hive.clean" description="Cleanup build artifacts">
+    <delete dir="${build.dir}" />
+    <delete dir="${test.warehouse.dir}"/>
+  </target>
+ 
+  <!--
+  ================================================================================
+  Docs Section
+  ================================================================================
+  -->
   <target name="docs" depends="forrest.check" description="Generate forrest-based documentation.
To use, specify -Dforrest.home=&lt;base of Apache Forrest installation&gt; on the
command line." if="forrest.home">
     <exec dir="${docs.src}" executable="${forrest.home}/bin/forrest"
           failonerror="true">
-      <env key="JAVA_HOME" value="${java5.home}"/>
     </exec>
-    <copy todir="${build.dir.hive}/docs">
+    <copy todir="${build.docs}/">
       <fileset dir="${docs.src}/build/site/" />
     </copy>
   </target>
 
-  <target name="forrest.check" unless="forrest.home" depends="java5.check">
+  <target name="forrest.check" unless="forrest.home" >
     <fail message="'forrest.home' is not defined. Please pass -Dforrest.home=&lt;base
of Apache Forrest installation&gt; to Ant on the command-line." />
   </target>
 
-  <target name="java5.check" unless="java5.home">
-    <fail message="'java5.home' is not defined.  Forrest requires Java 5.  Please pass
-Djava5.home=&lt;base of Java 5 distribution&gt; to Ant on the command-line." />
-  </target>
-
 </project>

Propchange: incubator/hcatalog/trunk/hive/
------------------------------------------------------------------------------
--- svn:externals (added)
+++ svn:externals Tue Apr 19 18:33:19 2011
@@ -0,0 +1 @@
+-r 1085590 http://svn.apache.org/repos/asf//hive/tags/release-0.7.0 external

Added: incubator/hcatalog/trunk/hive/README
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/hive/README?rev=1095161&view=auto
==============================================================================
--- incubator/hcatalog/trunk/hive/README (added)
+++ incubator/hcatalog/trunk/hive/README Tue Apr 19 18:33:19 2011
@@ -0,0 +1,16 @@
+The Hive code is pulled in via an SVN external definition.  This allows 
+us to have a local version of hive to build against, including an 
+up to date trunk version, without needing to fork the code.
+
+The external definition is pegged to an SVN revision, so that 
+changes in Hive's code base do not cause suprising changes in HCatalog.  
+The SVN revision should be updated regularly.
+
+For release branches, the SVN revision should be pegged against a Hive release
+tag.
+
+The external definition can be edited by doing:
+
+svn propedit svn:externals hive
+
+in the top level directory.

Modified: incubator/hcatalog/trunk/ivy.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/ivy.xml?rev=1095161&r1=1095160&r2=1095161&view=diff
==============================================================================
--- incubator/hcatalog/trunk/ivy.xml (original)
+++ incubator/hcatalog/trunk/ivy.xml Tue Apr 19 18:33:19 2011
@@ -15,11 +15,12 @@
   limitations under the License. -->
 
 <ivy-module version="2.0">
-    <info organisation="org.apache.hadoop.hive" module="howl">
+    <info organisation="org.apache.hcatalog" module="${ant.project.name}"
+            revision="${hcatalog.version}">
         <license name="Apache 2.0"/>
-        <ivyauthor name="Apache Hadoop Team" url="http://hadoop.apache.org"/>
+        <ivyauthor name="Apache HCatalog Team" url="http://incubator.apache.org/hcatalog"/>
         <description>
-            Apache Hadoop Howl
+            Apache HCatalog
         </description>
     </info>
 
@@ -34,6 +35,13 @@
         <conf name="test" visibility="private" extends="runtime"/>
     </configurations>
     <dependencies>
-        <dependency org="org.apache.pig" name="pig" rev="0.8.0" conf="common->master"
/>
+        <dependency org="org.apache.pig" name="pig" rev="${pig.version}"
+          conf="common->master" />
+        <dependency org="commons-cli" name="commons-cli" rev="${commons-cli.version}"
+          conf="common->master"/>
+        <!-- Removed until there is a secure version of hadoop in maven
+        <dependency org="org.apache.hadoop" name="hadoop-core" rev="${hadoop-core.version}"
+          conf="common->master"/>
+          -->
     </dependencies>
 </ivy-module>

Added: incubator/hcatalog/trunk/ivy/ivysettings.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/ivy/ivysettings.xml?rev=1095161&view=auto
==============================================================================
--- incubator/hcatalog/trunk/ivy/ivysettings.xml (added)
+++ incubator/hcatalog/trunk/ivy/ivysettings.xml Tue Apr 19 18:33:19 2011
@@ -0,0 +1,54 @@
+<ivysettings>
+
+ <!--
+   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.
+-->
+
+ <!--
+  see http://www.jayasoft.org/ivy/doc/configuration
+  -->
+  <!-- you can override this property to use mirrors
+          http://repo1.maven.org/maven2/
+          http://mirrors.dotsrc.org/maven2
+          http://ftp.ggi-project.org/pub/packages/maven2
+          http://mirrors.sunsite.dk/maven2
+          http://public.planetmirror.com/pub/maven2
+          http://ibiblio.lsu.edu/main/pub/packages/maven2
+          http://www.ibiblio.net/pub/packages/maven2
+  -->
+  <property name="repo.maven.org" value="${mvnrepo}" override="true"/>
+  <property name="maven2.pattern"  value="[organisation]/[module]/[revision]/[module]-[revision](-[classifier])"/>

+  <property name="maven2.pattern.ext" value="${maven2.pattern}.[ext]"/>
+  <!-- pull in the local repository -->
+  <include url="${ivy.default.conf.dir}/ivyconf-local.xml"/>
+  <settings defaultResolver="default"/>
+  <resolvers>
+    <ibiblio name="maven2" root="${repo.maven.org}" pattern="${maven2.pattern.ext}" m2compatible="true"/>
+    <chain name="default" dual="true">
+      <resolver ref="local"/>
+      <resolver ref="maven2"/>
+    </chain>
+    <chain name="internal">
+      <resolver ref="local"/>
+    </chain>
+    <chain name="external">
+      <resolver ref="maven2"/>
+    </chain>
+  </resolvers>
+  <modules>
+    <module organisation="org.apache.incubator/hcatalog" name=".*" resolver="internal"/>
+  </modules>
+</ivysettings>

Modified: incubator/hcatalog/trunk/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/ivy/libraries.properties?rev=1095161&r1=1095160&r2=1095161&view=diff
==============================================================================
--- incubator/hcatalog/trunk/ivy/libraries.properties (original)
+++ incubator/hcatalog/trunk/ivy/libraries.properties Tue Apr 19 18:33:19 2011
@@ -14,4 +14,8 @@
 #It drives ivy and the generation of a maven POM
 
 junit.version=3.8.1
+ivy.version=2.2.0
+pig.version=0.8.0
+commons-cli.version=1.0
+#hadoop-core.version=0.20.2 Waiting for a secure version of hadoop in maven
 

Added: incubator/hcatalog/trunk/lib/libthrift.jar
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/lib/libthrift.jar?rev=1095161&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/hcatalog/trunk/lib/libthrift.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: incubator/hcatalog/trunk/src/docs/forrest.properties
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/src/docs/forrest.properties?rev=1095161&r1=1095160&r2=1095161&view=diff
==============================================================================
--- incubator/hcatalog/trunk/src/docs/forrest.properties (original)
+++ incubator/hcatalog/trunk/src/docs/forrest.properties Tue Apr 19 18:33:19 2011
@@ -96,6 +96,8 @@
 # PIG-1508: Workaround for http://issues.apache.org/jira/browse/FOR-984
 # Remove when forrest-0.9 is available
 forrest.validate.sitemap=false
+forrest.validate.stylesheets=false
+forrest.validate.skins.stylesheets=false
 
 #forrest.validate.stylesheets=${forrest.validate}
 #forrest.validate.skins=${forrest.validate}

Added: incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/images/build-with-forrest-button.jpg
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/images/build-with-forrest-button.jpg?rev=1095161&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/images/build-with-forrest-button.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/images/hcat-archt.jpg
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/images/hcat-archt.jpg?rev=1095161&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/images/hcat-archt.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/images/hcat-box.jpg
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/images/hcat-box.jpg?rev=1095161&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/images/hcat-box.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/images/hcat-product.jpg
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/images/hcat-product.jpg?rev=1095161&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/images/hcat-product.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/images/hcat.jpg
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/images/hcat.jpg?rev=1095161&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/images/hcat.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/hcatalog/trunk/src/test/all-tests
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/src/test/all-tests?rev=1095161&view=auto
==============================================================================
--- incubator/hcatalog/trunk/src/test/all-tests (added)
+++ incubator/hcatalog/trunk/src/test/all-tests Tue Apr 19 18:33:19 2011
@@ -0,0 +1 @@
+**/Test*.java

Added: incubator/hcatalog/trunk/src/test/excluded-tests
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/src/test/excluded-tests?rev=1095161&view=auto
==============================================================================
--- incubator/hcatalog/trunk/src/test/excluded-tests (added)
+++ incubator/hcatalog/trunk/src/test/excluded-tests Tue Apr 19 18:33:19 2011
@@ -0,0 +1,2 @@
+**/TestPermsGrp.java
+**/TestPermsInheritance.java



Mime
View raw message