diff --git build.properties build.properties
index ec9f7ff..de9432e 100644
--- build.properties
+++ build.properties
@@ -98,3 +98,9 @@ mvn.license.dir=${build.dir.hive}/maven/licenses
#
datanucleus.repo=http://www.datanucleus.org/downloads/maven2
+#
+# Eclipse Properties
+#
+
+# JVM arguments for Eclipse launch configurations
+eclipse.launch.jvm.args=-Xms256m -Xmx1024m
diff --git build.xml build.xml
index bc0f2bd..66261d8 100644
--- build.xml
+++ build.xml
@@ -577,6 +577,14 @@
+
+
+
+
+
+
+
+
@@ -595,6 +603,9 @@
+
+
+
diff --git eclipse-templates/.classpath eclipse-templates/.classpath
index 2ada559..0cab940 100644
--- eclipse-templates/.classpath
+++ eclipse-templates/.classpath
@@ -46,6 +46,8 @@
+
+
diff --git eclipse-templates/HiveCLI.launchtemplate eclipse-templates/HiveCLI.launchtemplate
index 05cb373..507a225 100644
--- eclipse-templates/HiveCLI.launchtemplate
+++ eclipse-templates/HiveCLI.launchtemplate
@@ -20,7 +20,7 @@
-
+
@@ -35,6 +35,7 @@
+
@@ -43,6 +44,7 @@
-
+
diff --git eclipse-templates/HiveServer.launchtemplate eclipse-templates/HiveServer.launchtemplate
new file mode 100644
index 0000000..a550c6f
--- /dev/null
+++ eclipse-templates/HiveServer.launchtemplate
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git eclipse-templates/TestCliDriver.launchtemplate eclipse-templates/TestCliDriver.launchtemplate
index 83bd0ef..2db3456 100644
--- eclipse-templates/TestCliDriver.launchtemplate
+++ eclipse-templates/TestCliDriver.launchtemplate
@@ -20,7 +20,7 @@
-
+
@@ -37,6 +37,7 @@
-
+
diff --git eclipse-templates/TestEmbeddedHiveMetaStore.launchtemplate eclipse-templates/TestEmbeddedHiveMetaStore.launchtemplate
index 65b6a50..3dc1010 100644
--- eclipse-templates/TestEmbeddedHiveMetaStore.launchtemplate
+++ eclipse-templates/TestEmbeddedHiveMetaStore.launchtemplate
@@ -20,7 +20,7 @@
-
+
@@ -37,6 +37,7 @@
-
+
diff --git eclipse-templates/TestHBaseCliDriver.launchtemplate eclipse-templates/TestHBaseCliDriver.launchtemplate
index 586922f..ab02c4d 100644
--- eclipse-templates/TestHBaseCliDriver.launchtemplate
+++ eclipse-templates/TestHBaseCliDriver.launchtemplate
@@ -20,7 +20,7 @@
-
+
@@ -37,6 +37,7 @@
-
+
diff --git eclipse-templates/TestHive.launchtemplate eclipse-templates/TestHive.launchtemplate
index dc91f4a..5e68c21 100644
--- eclipse-templates/TestHive.launchtemplate
+++ eclipse-templates/TestHive.launchtemplate
@@ -20,7 +20,7 @@
-
+
@@ -37,6 +37,7 @@
-
+
diff --git eclipse-templates/TestHiveMetaStoreChecker.launchtemplate eclipse-templates/TestHiveMetaStoreChecker.launchtemplate
index af94271..2bb9268 100644
--- eclipse-templates/TestHiveMetaStoreChecker.launchtemplate
+++ eclipse-templates/TestHiveMetaStoreChecker.launchtemplate
@@ -20,7 +20,7 @@
-
+
@@ -37,6 +37,7 @@
-
+
diff --git eclipse-templates/TestJdbc.launchtemplate eclipse-templates/TestJdbc.launchtemplate
index 5331b89..267f58a 100644
--- eclipse-templates/TestJdbc.launchtemplate
+++ eclipse-templates/TestJdbc.launchtemplate
@@ -20,7 +20,7 @@
-
+
@@ -37,7 +37,8 @@
-
+
diff --git eclipse-templates/TestMTQueries.launchtemplate eclipse-templates/TestMTQueries.launchtemplate
index 81e5b18..172692e 100644
--- eclipse-templates/TestMTQueries.launchtemplate
+++ eclipse-templates/TestMTQueries.launchtemplate
@@ -20,7 +20,7 @@
-
+
@@ -37,6 +37,7 @@
-
+
diff --git eclipse-templates/TestRemoteHiveMetaStore.launchtemplate eclipse-templates/TestRemoteHiveMetaStore.launchtemplate
index 5f06d03..81e3877 100644
--- eclipse-templates/TestRemoteHiveMetaStore.launchtemplate
+++ eclipse-templates/TestRemoteHiveMetaStore.launchtemplate
@@ -20,7 +20,7 @@
-
+
@@ -37,6 +37,7 @@
-
+
diff --git eclipse-templates/TestTruncate.launchtemplate eclipse-templates/TestTruncate.launchtemplate
index f6b8d09..38513a5 100644
--- eclipse-templates/TestTruncate.launchtemplate
+++ eclipse-templates/TestTruncate.launchtemplate
@@ -20,7 +20,7 @@
-
+
@@ -37,6 +37,7 @@
-
+