diff --git a/ant/checkstyle.xml b/ant/checkstyle.xml
index 1d75e5d..d981ab2 100644
--- a/ant/checkstyle.xml
+++ b/ant/checkstyle.xml
@@ -25,12 +25,14 @@
+
diff --git a/ant/dependencies.xml b/ant/dependencies.xml
index 376cf28..885d761 100644
--- a/ant/dependencies.xml
+++ b/ant/dependencies.xml
@@ -29,6 +29,9 @@
+
+
+
@@ -43,8 +46,10 @@
-
+
+
diff --git a/ant/deploy.xml b/ant/deploy.xml
index ff05531..b317b79 100644
--- a/ant/deploy.xml
+++ b/ant/deploy.xml
@@ -65,15 +65,19 @@
-
+
+
+
-
-
+
+
+
+
diff --git a/build-support/scripts/list-libs.py b/build-support/scripts/list-libs.py
old mode 100644
new mode 100755
diff --git a/build.xml b/build.xml
index cb79c6e..c61e8bd 100644
--- a/build.xml
+++ b/build.xml
@@ -71,6 +71,7 @@
+
@@ -149,7 +150,9 @@
-
+
+
+
+
@@ -171,7 +176,6 @@
-
@@ -185,14 +189,6 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ivy/ivysettings.xml b/ivy/ivysettings.xml
index 90a5038..2ca6670 100644
--- a/ivy/ivysettings.xml
+++ b/ivy/ivysettings.xml
@@ -69,9 +69,6 @@
-
-
-
@@ -79,6 +76,6 @@
-
+
diff --git a/pom.xml b/pom.xml
index 52783ea..7c03c74 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,4 +66,81 @@
+
+
+
+ hadoop-20
+
+
+ hadoopversion
+ 20
+
+
+
+
+ org.apache.hadoop
+ hadoop-core
+ ${hadoop20.version}
+ true
+
+
+ hsqldb
+ hsqldb
+
+
+ net.sf.kosmosfs
+ kfs
+
+
+ org.eclipse.jdt
+ core
+
+
+ net.java.dev.jets3t
+ jets3t
+
+
+ oro
+ oro
+
+
+
+
+ org.apache.hadoop
+ hadoop-test
+ ${hadoop20.version}
+ true
+ test
+
+
+
+
+ hadoop-23
+
+
+ hadoopversion
+ 23
+
+
+
+
+ org.apache.hadoop
+ hadoop-client
+ ${hadoop23.version}
+
+
+ org.apache.hadoop
+ hadoop-annotations
+ ${hadoop23.version}
+
+
+
+ org.apache.hadoop
+ hadoop-minicluster
+ ${hadoop23.version}
+ test
+
+
+
+
diff --git a/server-extensions/build.xml b/server-extensions/build.xml
index f753ce2..83eca7b 100644
--- a/server-extensions/build.xml
+++ b/server-extensions/build.xml
@@ -28,6 +28,7 @@
+
diff --git a/server-extensions/pom.xml b/server-extensions/pom.xml
index 3f6ee20..e1c3c65 100644
--- a/server-extensions/pom.xml
+++ b/server-extensions/pom.xml
@@ -51,6 +51,14 @@
org.springframework
spring-context
+
+ org.glassfish.grizzly
+ grizzly-framework
+
+
+ org.glassfish.grizzly
+ grizzly-rcm
+
@@ -58,12 +66,40 @@
kahadb
${activemq.version}
compile
+
+
+ org.springframework
+ spring-context
+
+
+ org.glassfish.grizzly
+ grizzly-framework
+
+
+ org.glassfish.grizzly
+ grizzly-rcm
+
+
org.apache.hcatalog
hcatalog-core
${hcatalog.version}
compile
+
+
+ org.springframework
+ spring-context
+
+
+ org.glassfish.grizzly
+ grizzly-framework
+
+
+ org.glassfish.grizzly
+ grizzly-rcm
+
+
@@ -87,3 +123,4 @@
+
diff --git a/shims/build.xml b/shims/build.xml
index 683495d..2aa04a8 100644
--- a/shims/build.xml
+++ b/shims/build.xml
@@ -6,35 +6,28 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
+
+
+
+
+
+
+
-
- <_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="src/${hadoopversion}"
+ destDir="${parent.build.dir}/classes"
+ classPathRef="compile.class.path"/>
diff --git a/shims/ivy.xml b/shims/ivy.xml
deleted file mode 100644
index 29eb330..0000000
--- a/shims/ivy.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
- Apache HCatalog
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/test/e2e/hcatalog/conf/default.conf b/src/test/e2e/hcatalog/conf/default.conf
index 83d2cf2..14c91b4 100644
--- a/src/test/e2e/hcatalog/conf/default.conf
+++ b/src/test/e2e/hcatalog/conf/default.conf
@@ -58,7 +58,7 @@ $cfg = {
#PIG
, 'pighome' => $ENV{'PIG_HOME'}
- , 'pigbin' => "$ENV{'PIG_HOME'}/bin/pig"
+ , 'pigbin' => "$ENV{'PIG_HOME'}/bin/pig -useHCatalog"
#HADOOP
, 'hadoopconfdir' => "$ENV{'HADOOP_CONF_DIR'}"
diff --git a/src/test/e2e/hcatalog/drivers/Util.pm b/src/test/e2e/hcatalog/drivers/Util.pm
index 9c13f06..9d9f23a 100644
--- a/src/test/e2e/hcatalog/drivers/Util.pm
+++ b/src/test/e2e/hcatalog/drivers/Util.pm
@@ -274,7 +274,7 @@ sub getPigCmd
{
my ( $cfg, $log ) = @_;
- my @cmd = ("$cfg->{'pigbin'}");
+ my @cmd = ("$cfg->{'pigbin'}","-useHCatalog");
# sets the queue, for exampel "grideng"
diff --git a/src/test/e2e/hcatalog/udfs/java/build.xml b/src/test/e2e/hcatalog/udfs/java/build.xml
index 6486882..b235722 100644
--- a/src/test/e2e/hcatalog/udfs/java/build.xml
+++ b/src/test/e2e/hcatalog/udfs/java/build.xml
@@ -22,6 +22,7 @@
+