You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mb...@apache.org on 2016/05/09 23:21:01 UTC

[07/13] incubator-asterixdb git commit: Normalize XML Whitespace

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b4c1fb06/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/configs/asterix-configuration.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/configs/asterix-configuration.xml b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/configs/asterix-configuration.xml
index 0159194..cc289bd 100644
--- a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/configs/asterix-configuration.xml
+++ b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/configs/asterix-configuration.xml
@@ -14,246 +14,246 @@
  !-->
 <asterixConfiguration xmlns="asterixconf">
 
-	<property>
-		<name>nc.java.opts</name>
-		<value>-Xms6144m -Xmx7168m</value>
-		<description>JVM parameters for each Node Contoller (NC)</description>
-	</property>
+  <property>
+    <name>nc.java.opts</name>
+    <value>-Xms6144m -Xmx7168m</value>
+    <description>JVM parameters for each Node Contoller (NC)</description>
+  </property>
 
-	<property>
-		<name>cc.java.opts</name>
-		<value>-Xms6144m -Xmx6144m</value>
-		<description>JVM parameters for each Cluster Contoller (CC)
-		</description>
-	</property>
+  <property>
+    <name>cc.java.opts</name>
+    <value>-Xms6144m -Xmx6144m</value>
+    <description>JVM parameters for each Cluster Contoller (CC)
+    </description>
+  </property>
 
-    <property>
-        <name>max.wait.active.cluster</name>
-        <value>60</value>
-        <description>Maximum wait (in seconds) for a cluster to be ACTIVE (all nodes are available)
-                before a submitted query/statement can be executed. (Default = 60 seconds)
-        </description>
-    </property>
+  <property>
+    <name>max.wait.active.cluster</name>
+    <value>60</value>
+    <description>Maximum wait (in seconds) for a cluster to be ACTIVE (all nodes are available)
+      before a submitted query/statement can be executed. (Default = 60 seconds)
+    </description>
+  </property>
 
-	<property>
-		<name>storage.buffercache.pagesize</name>
-		<value>131072</value>
-		<description>The page size in bytes for pages in the buffer cache.
-			(Default = "131072" // 128KB)
-		</description>
-	</property>
+  <property>
+    <name>storage.buffercache.pagesize</name>
+    <value>131072</value>
+    <description>The page size in bytes for pages in the buffer cache.
+      (Default = "131072" // 128KB)
+    </description>
+  </property>
 
-	<property>
-		<name>storage.buffercache.size</name>
-		<value>3221225472</value>
-		<description>[3GB] The size of memory allocated to the disk buffer cache.
-			The value should be a multiple of the buffer cache page size(Default
-			= "536870912" // 512MB)
-		</description>
-	</property>
+  <property>
+    <name>storage.buffercache.size</name>
+    <value>3221225472</value>
+    <description>[3GB] The size of memory allocated to the disk buffer cache.
+      The value should be a multiple of the buffer cache page size(Default
+      = "536870912" // 512MB)
+    </description>
+  </property>
 
-	<property>
-		<name>storage.buffercache.maxopenfiles</name>
-		<value>214748364</value>
-		<description>The maximum number of open files in the buffer cache.
-			(Default = "214748364")
-		</description>
-	</property>
+  <property>
+    <name>storage.buffercache.maxopenfiles</name>
+    <value>214748364</value>
+    <description>The maximum number of open files in the buffer cache.
+      (Default = "214748364")
+    </description>
+  </property>
 
-    <!-- Buffer size per dataset for in-memory components: 1GB -->
-	<property>
-		<name>storage.memorycomponent.pagesize</name>
-		<value>131072</value>
-		<description>The page size in bytes for pages allocated to memory
-			components. (Default = "131072" // 128KB)
-		</description>
-	</property>
+  <!-- Buffer size per dataset for in-memory components: 1GB -->
+  <property>
+    <name>storage.memorycomponent.pagesize</name>
+    <value>131072</value>
+    <description>The page size in bytes for pages allocated to memory
+      components. (Default = "131072" // 128KB)
+    </description>
+  </property>
 
-	<property>
-		<name>storage.memorycomponent.numpages</name>
-		<value>8192</value>
-		<description>
-		</description>
-	</property>
-    <!--// Buffer size per dataset for in-memory components -->
+  <property>
+    <name>storage.memorycomponent.numpages</name>
+    <value>8192</value>
+    <description>
+    </description>
+  </property>
+  <!--// Buffer size per dataset for in-memory components -->
 
-	<property>
-		<name>storage.metadata.memorycomponent.numpages</name>
-		<value>64</value>
-		<description>The number of pages to allocate for a memory component.
-			(Default = 64)
-		</description>
-	</property>
+  <property>
+    <name>storage.metadata.memorycomponent.numpages</name>
+    <value>64</value>
+    <description>The number of pages to allocate for a memory component.
+      (Default = 64)
+    </description>
+  </property>
 
-    <property>
-		<name>storage.memorycomponent.numcomponents</name>
-		<value>2</value>
-		<description>The number of memory components to be used per lsm index.
-			(Default = 2)
-		</description>
-	</property>
+  <property>
+    <name>storage.memorycomponent.numcomponents</name>
+    <value>2</value>
+    <description>The number of memory components to be used per lsm index.
+      (Default = 2)
+    </description>
+  </property>
 
-	<property>
-		<name>storage.memorycomponent.globalbudget</name>
-		<value>4399824896</value>
-		<description>[4GB + 8MB]The total size of memory in bytes that the sum of all
-			open memory
-			components cannot exceed. (Default = "536870192" // 512MB)
-		</description>
-	</property>
+  <property>
+    <name>storage.memorycomponent.globalbudget</name>
+    <value>4399824896</value>
+    <description>[4GB + 8MB]The total size of memory in bytes that the sum of all
+      open memory
+      components cannot exceed. (Default = "536870192" // 512MB)
+    </description>
+  </property>
 
-	<property>
-		<name>storage.lsm.bloomfilter.falsepositiverate</name>
-		<value>0.01</value>
-		<description>The maximum acceptable false positive rate for bloom
-			filters associated with LSM indexes. (Default = "0.01" // 1%)
-		</description>
-	</property>
+  <property>
+    <name>storage.lsm.bloomfilter.falsepositiverate</name>
+    <value>0.01</value>
+    <description>The maximum acceptable false positive rate for bloom
+      filters associated with LSM indexes. (Default = "0.01" // 1%)
+    </description>
+  </property>
 
-	<property>
-		<name>txn.log.buffer.numpages</name>
-		<value>2</value>
-		<description>The number of in-memory log buffer pages. (Default = "8")
-		</description>
-	</property>
+  <property>
+    <name>txn.log.buffer.numpages</name>
+    <value>2</value>
+    <description>The number of in-memory log buffer pages. (Default = "8")
+    </description>
+  </property>
 
-	<property>
-		<name>txn.log.buffer.pagesize</name>
-		<value>8388608</value>
-		<description>[8MB]The size of pages in the in-memory log buffer. (Default =
-			"524288" // 512KB)
-		</description>
-	</property>
+  <property>
+    <name>txn.log.buffer.pagesize</name>
+    <value>8388608</value>
+    <description>[8MB]The size of pages in the in-memory log buffer. (Default =
+      "524288" // 512KB)
+    </description>
+  </property>
 
-	<property>
-		<name>txn.log.partitionsize</name>
-		<value>2147483648</value>
-		<description>The maximum size of a log file partition allowed before
-			rotating the log to the next partition. (Default = "2147483648" //
-			2GB)
-		</description>
-	</property>
+  <property>
+    <name>txn.log.partitionsize</name>
+    <value>2147483648</value>
+    <description>The maximum size of a log file partition allowed before
+      rotating the log to the next partition. (Default = "2147483648" //
+      2GB)
+    </description>
+  </property>
 
-	<property>
-		<name>txn.log.checkpoint.lsnthreshold</name>
-		<value>67108864</value>
-		<description>The size of the window that the maximum LSN is allowed to
-			be ahead of the checkpoint LSN by. (Default = ""67108864" // 64M)
-		</description>
-	</property>
+  <property>
+    <name>txn.log.checkpoint.lsnthreshold</name>
+    <value>67108864</value>
+    <description>The size of the window that the maximum LSN is allowed to
+      be ahead of the checkpoint LSN by. (Default = ""67108864" // 64M)
+    </description>
+  </property>
 
-	<property>
-		<name>txn.log.checkpoint.pollfrequency</name>
-		<value>120</value>
-		<description>The time in seconds between that the checkpoint thread
-			waits between polls. (Default = "120" // 120s)
-		</description>
-	</property>
+  <property>
+    <name>txn.log.checkpoint.pollfrequency</name>
+    <value>120</value>
+    <description>The time in seconds between that the checkpoint thread
+      waits between polls. (Default = "120" // 120s)
+    </description>
+  </property>
 
-	<property>
-		<name>txn.log.checkpoint.history</name>
-		<value>0</value>
-		<description>The number of old log partition files to keep before
-			discarding. (Default = "0")
-		</description>
-	</property>
+  <property>
+    <name>txn.log.checkpoint.history</name>
+    <value>0</value>
+    <description>The number of old log partition files to keep before
+      discarding. (Default = "0")
+    </description>
+  </property>
 
-	<property>
-		<name>txn.lock.escalationthreshold</name>
-		<value>1000</value>
-		<description>The number of entity level locks that need to be acquired
-			before the locks are coalesced and escalated into a dataset level
-			lock. (Default = "1000")
-		</description>
-	</property>
+  <property>
+    <name>txn.lock.escalationthreshold</name>
+    <value>1000</value>
+    <description>The number of entity level locks that need to be acquired
+      before the locks are coalesced and escalated into a dataset level
+      lock. (Default = "1000")
+    </description>
+  </property>
 
-	<property>
-		<name>txn.lock.shrinktimer</name>
-		<value>5000</value>
-		<description>The time in milliseconds to wait before deallocating
-			unused lock manager memory. (Default = "5000" // 5s)
-		</description>
-	</property>
+  <property>
+    <name>txn.lock.shrinktimer</name>
+    <value>5000</value>
+    <description>The time in milliseconds to wait before deallocating
+      unused lock manager memory. (Default = "5000" // 5s)
+    </description>
+  </property>
 
-	<property>
-		<name>txn.lock.timeout.waitthreshold</name>
-		<value>60000</value>
-		<description>The time in milliseconds to wait before labeling a
-			transaction which has been waiting for a lock timed-out. (Default =
-			"60000" // 60s)
-		</description>
-	</property>
+  <property>
+    <name>txn.lock.timeout.waitthreshold</name>
+    <value>60000</value>
+    <description>The time in milliseconds to wait before labeling a
+      transaction which has been waiting for a lock timed-out. (Default =
+      "60000" // 60s)
+    </description>
+  </property>
 
-	<property>
-		<name>txn.lock.timeout.sweepthreshold</name>
-		<value>10000</value>
-		<description>The time in milliseconds the timeout thread waits between
-			sweeps to detect timed-out transactions. (Default = "10000" // 10s)
-		</description>
-	</property>
+  <property>
+    <name>txn.lock.timeout.sweepthreshold</name>
+    <value>10000</value>
+    <description>The time in milliseconds the timeout thread waits between
+      sweeps to detect timed-out transactions. (Default = "10000" // 10s)
+    </description>
+  </property>
 
-	<property>
-		<name>compiler.sortmemory</name>
-		<value>67108864</value>
-		<description>[64MB]The amount of memory in bytes given to sort operations.
-			(Default = "33554432" // 32mb)
-		</description>
-	</property>
+  <property>
+    <name>compiler.sortmemory</name>
+    <value>67108864</value>
+    <description>[64MB]The amount of memory in bytes given to sort operations.
+      (Default = "33554432" // 32mb)
+    </description>
+  </property>
 
-	<property>
-		<name>compiler.joinmemory</name>
-		<value>67108864</value>
-		<description>[64MB]The amount of memory in bytes given to join operations.
-			(Default = "33554432" // 32mb)
-		</description>
-	</property>
+  <property>
+    <name>compiler.joinmemory</name>
+    <value>67108864</value>
+    <description>[64MB]The amount of memory in bytes given to join operations.
+      (Default = "33554432" // 32mb)
+    </description>
+  </property>
 
-	<property>
-		<name>compiler.framesize</name>
-		<value>131072</value>
-		<description>The Hyracks frame size that the compiler configures per
-			job. (Default = "131072" // 128KB)
-		</description>
-	</property>
+  <property>
+    <name>compiler.framesize</name>
+    <value>131072</value>
+    <description>The Hyracks frame size that the compiler configures per
+      job. (Default = "131072" // 128KB)
+    </description>
+  </property>
 
-	<property>
-		<name>web.port</name>
-		<value>19001</value>
-		<description>The port for the ASTERIX web interface. (Default = 19001)
-		</description>
-	</property>
+  <property>
+    <name>web.port</name>
+    <value>19001</value>
+    <description>The port for the ASTERIX web interface. (Default = 19001)
+    </description>
+  </property>
 
-	<property>
-		<name>api.port</name>
-		<value>19002</value>
-		<description>The port for the ASTERIX API server. (Default = 19002)
-		</description>
-	</property>
+  <property>
+    <name>api.port</name>
+    <value>19002</value>
+    <description>The port for the ASTERIX API server. (Default = 19002)
+    </description>
+  </property>
 
-	<property>
-		<name>log.level</name>
-		<value>ALL</value>
-		<description>The minimum log level to be displayed. (Default = INFO)
-		</description>
-	</property>
-	      <property>
-          <name>feed.memory.global.budget</name>
-          <value>1073741824</value>
-          <description>Feed memory budget (1 GB = 1073741824 Bytes)
-          </description>
-      </property>
-  
-      <property>
-          <name>feed.pending.work.threshold</name>
-          <value>1000</value>
-          <description>Feed pending work threshold 
-          </description>
-      </property>
-      
-      <property>
-          <name>feed.max.threshold.period</name>
-          <value>100</value>
-          <description>Feed max threshold period
-          </description>
-      </property>
+  <property>
+    <name>log.level</name>
+    <value>ALL</value>
+    <description>The minimum log level to be displayed. (Default = INFO)
+    </description>
+  </property>
+  <property>
+    <name>feed.memory.global.budget</name>
+    <value>1073741824</value>
+    <description>Feed memory budget (1 GB = 1073741824 Bytes)
+    </description>
+  </property>
+
+  <property>
+    <name>feed.pending.work.threshold</name>
+    <value>1000</value>
+    <description>Feed pending work threshold
+    </description>
+  </property>
+
+  <property>
+    <name>feed.max.threshold.period</name>
+    <value>100</value>
+    <description>Feed max threshold period
+    </description>
+  </property>
 </asterixConfiguration>

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b4c1fb06/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/configs/managix-conf.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/configs/managix-conf.xml b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/configs/managix-conf.xml
index a21935f..720770f 100644
--- a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/configs/managix-conf.xml
+++ b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/configs/managix-conf.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <configuration xmlns="installer">
-    <backup>
-        <hdfs>
-            <version>0.20.2</version>
-            <url></url>
-        </hdfs>
-        <backupDir>/home/youngsk2/managix/clusters/local/working_dir/backup</backupDir>
-    </backup>
-    <zookeeper>
-        <homeDir>/home/youngsk2/managix/.installer/zookeeper_home</homeDir>
-        <clientPort>2900</clientPort>
-        <servers>
-            <java_home>/home/youngsk2/jdk1.7.0_65</java_home>
-            <server>128.195.9.21</server>
-        </servers>
-    </zookeeper>
+  <backup>
+    <hdfs>
+      <version>0.20.2</version>
+      <url></url>
+    </hdfs>
+    <backupDir>/home/youngsk2/managix/clusters/local/working_dir/backup</backupDir>
+  </backup>
+  <zookeeper>
+    <homeDir>/home/youngsk2/managix/.installer/zookeeper_home</homeDir>
+    <clientPort>2900</clientPort>
+    <servers>
+      <java_home>/home/youngsk2/jdk1.7.0_65</java_home>
+      <server>128.195.9.21</server>
+    </servers>
+  </zookeeper>
 </configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b4c1fb06/asterixdb/asterix-external-data/pom.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-external-data/pom.xml b/asterixdb/asterix-external-data/pom.xml
index f7ac6a9..7b25f5a 100644
--- a/asterixdb/asterix-external-data/pom.xml
+++ b/asterixdb/asterix-external-data/pom.xml
@@ -17,277 +17,277 @@
  ! 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/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <artifactId>apache-asterixdb</artifactId>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>apache-asterixdb</artifactId>
+    <groupId>org.apache.asterix</groupId>
+    <version>0.8.9-SNAPSHOT</version>
+  </parent>
+  <licenses>
+    <license>
+      <name>Apache License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+      <comments>A business-friendly OSS license</comments>
+    </license>
+  </licenses>
+  <artifactId>asterix-external-data</artifactId>
+  <properties>
+    <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
+  </properties>
+  <build>
+    <plugins>
+      <plugin>
         <groupId>org.apache.asterix</groupId>
+        <artifactId>lexer-generator-maven-plugin</artifactId>
         <version>0.8.9-SNAPSHOT</version>
-    </parent>
-    <licenses>
-        <license>
-            <name>Apache License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            <distribution>repo</distribution>
-            <comments>A business-friendly OSS license</comments>
-        </license>
-    </licenses>
-    <artifactId>asterix-external-data</artifactId>
-    <properties>
-        <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
-    </properties>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.asterix</groupId>
-                <artifactId>lexer-generator-maven-plugin</artifactId>
-                <version>0.8.9-SNAPSHOT</version>
-                <configuration>
-                    <grammarFile>src/main/resources/adm.grammar</grammarFile>
-                    <outputDir>${project.build.directory}/generated-sources/org/apache/asterix/runtime/operators/file/adm</outputDir>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>generate-lexer</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>generate-lexer</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.9</version>
-                <executions>
-                    <execution>
-                        <id>add-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>${project.build.directory}/generated-sources/</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
-                <version>0.9.0</version>
-                <executions>
-                    <execution>
-                        <id>configuration</id>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                        <configuration>
-                            <schemaDirectory>src/main/resources/schema</schemaDirectory>
-                            <schemaIncludes>
-                                <include>library.xsd</include>
-                            </schemaIncludes>
-                            <generatePackage>org.apache.asterix.external.library</generatePackage>
-                            <generateDirectory>${project.build.directory}/generated-sources/configuration</generateDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-jar-plugin</artifactId>
-            <version>2.4</version>
+        <configuration>
+          <grammarFile>src/main/resources/adm.grammar</grammarFile>
+          <outputDir>${project.build.directory}/generated-sources/org/apache/asterix/runtime/operators/file/adm</outputDir>
+        </configuration>
+        <executions>
+          <execution>
+            <id>generate-lexer</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>generate-lexer</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>1.9</version>
+        <executions>
+          <execution>
+            <id>add-source</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>add-source</goal>
+            </goals>
             <configuration>
-               <includes>
-                  <include>**/*.class</include>
-                  <include>**/*.txt</include>
-                  <include>**/DISCLAIMER</include>
-                  <include>**/NOTICE</include>
-                  <include>**/LICENSE</include>
-                  <include>**/DEPENDENCIES</include>
-               </includes>
+              <sources>
+                <source>${project.build.directory}/generated-sources/</source>
+              </sources>
             </configuration>
-            <executions>
-               <execution>
-                  <goals>
-                     <goal>test-jar</goal>
-                  </goals>
-                  <phase>package</phase>
-               </execution>
-            </executions>
-         </plugin>
-         <plugin>
-            <artifactId>maven-assembly-plugin</artifactId>
-            <version>2.2-beta-5</version>
-            <executions>
-               <execution>
-                  <configuration>
-                     <descriptor>src/main/assembly/binary-assembly-libzip.xml</descriptor>
-                     <finalName>testlib-zip</finalName>
-                  </configuration>
-                  <phase>package</phase>
-                  <goals>
-                     <goal>attached</goal>
-                  </goals>
-               </execution>
-            </executions>
-         </plugin>
-        </plugins>
-        <pluginManagement>
-            <plugins>
-                <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-                <plugin>
-                    <groupId>org.eclipse.m2e</groupId>
-                    <artifactId>lifecycle-mapping</artifactId>
-                    <version>1.0.0</version>
-                    <configuration>
-                        <lifecycleMappingMetadata>
-                            <pluginExecutions>
-                                <pluginExecution>
-                                    <pluginExecutionFilter>
-                                        <groupId> org.apache.asterix</groupId>
-                                        <artifactId> lexer-generator-maven-plugin</artifactId>
-                                        <versionRange>[0.1,)</versionRange>
-                                        <goals>
-                                            <goal>generate-lexer</goal>
-                                        </goals>
-                                    </pluginExecutionFilter>
-                                    <action>
-                                        <execute>
-                                            <runOnIncremental>false</runOnIncremental>
-                                        </execute>
-                                    </action>
-                                </pluginExecution>
-                                <pluginExecution>
-                                    <pluginExecutionFilter>
-                                        <groupId> org.codehaus.mojo</groupId>
-                                        <artifactId>build-helper-maven-plugin</artifactId>
-                                        <versionRange>[1.7,)</versionRange>
-                                        <goals>
-                                            <goal>add-source</goal>
-                                        </goals>
-                                    </pluginExecutionFilter>
-                                    <action>
-                                        <ignore />
-                                    </action>
-                                </pluginExecution>
-                            </pluginExecutions>
-                        </lifecycleMappingMetadata>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-    <dependencies>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.asterix</groupId>
-            <artifactId>asterix-om</artifactId>
-            <version>0.8.9-SNAPSHOT</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.asterix</groupId>
-            <artifactId>asterix-runtime</artifactId>
-            <version>0.8.9-SNAPSHOT</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.hyracks</groupId>
-            <artifactId>algebricks-compiler</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.kenai.nbpwr</groupId>
-            <artifactId>org-apache-commons-io</artifactId>
-            <version>1.3.1-201002241208</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.twitter4j</groupId>
-            <artifactId>twitter4j-core</artifactId>
-            <version>4.0.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.twitter4j</groupId>
-            <artifactId>twitter4j-stream</artifactId>
-            <version>4.0.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-client</artifactId>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-hdfs</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>net.java.dev.rome</groupId>
-            <artifactId>rome-fetcher</artifactId>
-            <version>1.0.0</version>
-            <type>jar</type>
-            <scope>compile</scope>
-            <exclusions>
-                <exclusion>
-                    <artifactId>rome</artifactId>
-                    <groupId>net.java.dev.rome</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>rome</groupId>
-            <artifactId>rome</artifactId>
-            <version>1.0.1-modified-01</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.hyracks</groupId>
-            <artifactId>hyracks-hdfs-core</artifactId>
-            <version>${hyracks.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>jdom</groupId>
-            <artifactId>jdom</artifactId>
-            <version>1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.asterix</groupId>
-            <artifactId>asterix-common</artifactId>
-            <version>0.8.9-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.windowsazure</groupId>
-            <artifactId>microsoft-windowsazure-api</artifactId>
-            <version>0.4.4</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.hive</groupId>
-            <artifactId>hive-exec</artifactId>
-            <version>0.13.0</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.jdo</groupId>
-            <artifactId>jdo2-api</artifactId>
-            <version>2.3-20090302111651</version>
-        </dependency>
-        <dependency>
-            <groupId>com.e-movimento.tinytools</groupId>
-            <artifactId>privilegedaccessor</artifactId>
-            <version>1.2.2</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.couchbase.client</groupId>
-            <artifactId>core-io</artifactId>
-            <version>1.2.7</version>
-        </dependency>
-    </dependencies>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.jvnet.jaxb2.maven2</groupId>
+        <artifactId>maven-jaxb2-plugin</artifactId>
+        <version>0.9.0</version>
+        <executions>
+          <execution>
+            <id>configuration</id>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+            <configuration>
+              <schemaDirectory>src/main/resources/schema</schemaDirectory>
+              <schemaIncludes>
+                <include>library.xsd</include>
+              </schemaIncludes>
+              <generatePackage>org.apache.asterix.external.library</generatePackage>
+              <generateDirectory>${project.build.directory}/generated-sources/configuration</generateDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.4</version>
+        <configuration>
+          <includes>
+            <include>**/*.class</include>
+            <include>**/*.txt</include>
+            <include>**/DISCLAIMER</include>
+            <include>**/NOTICE</include>
+            <include>**/LICENSE</include>
+            <include>**/DEPENDENCIES</include>
+          </includes>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+            <phase>package</phase>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.2-beta-5</version>
+        <executions>
+          <execution>
+            <configuration>
+              <descriptor>src/main/assembly/binary-assembly-libzip.xml</descriptor>
+              <finalName>testlib-zip</finalName>
+            </configuration>
+            <phase>package</phase>
+            <goals>
+              <goal>attached</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+    <pluginManagement>
+      <plugins>
+        <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+        <plugin>
+          <groupId>org.eclipse.m2e</groupId>
+          <artifactId>lifecycle-mapping</artifactId>
+          <version>1.0.0</version>
+          <configuration>
+            <lifecycleMappingMetadata>
+              <pluginExecutions>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>org.apache.asterix</groupId>
+                    <artifactId>lexer-generator-maven-plugin</artifactId>
+                    <versionRange>[0.1,)</versionRange>
+                    <goals>
+                      <goal>generate-lexer</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <execute>
+                      <runOnIncremental>false</runOnIncremental>
+                    </execute>
+                  </action>
+                </pluginExecution>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>build-helper-maven-plugin</artifactId>
+                    <versionRange>[1.7,)</versionRange>
+                    <goals>
+                      <goal>add-source</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <ignore/>
+                  </action>
+                </pluginExecution>
+              </pluginExecutions>
+            </lifecycleMappingMetadata>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.asterix</groupId>
+      <artifactId>asterix-om</artifactId>
+      <version>0.8.9-SNAPSHOT</version>
+      <type>jar</type>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.asterix</groupId>
+      <artifactId>asterix-runtime</artifactId>
+      <version>0.8.9-SNAPSHOT</version>
+      <type>jar</type>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hyracks</groupId>
+      <artifactId>algebricks-compiler</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.kenai.nbpwr</groupId>
+      <artifactId>org-apache-commons-io</artifactId>
+      <version>1.3.1-201002241208</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.twitter4j</groupId>
+      <artifactId>twitter4j-core</artifactId>
+      <version>4.0.3</version>
+    </dependency>
+    <dependency>
+      <groupId>org.twitter4j</groupId>
+      <artifactId>twitter4j-stream</artifactId>
+      <version>4.0.3</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-client</artifactId>
+      <type>jar</type>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-hdfs</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>net.java.dev.rome</groupId>
+      <artifactId>rome-fetcher</artifactId>
+      <version>1.0.0</version>
+      <type>jar</type>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>rome</artifactId>
+          <groupId>net.java.dev.rome</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>rome</groupId>
+      <artifactId>rome</artifactId>
+      <version>1.0.1-modified-01</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hyracks</groupId>
+      <artifactId>hyracks-hdfs-core</artifactId>
+      <version>${hyracks.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>jdom</groupId>
+      <artifactId>jdom</artifactId>
+      <version>1.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.asterix</groupId>
+      <artifactId>asterix-common</artifactId>
+      <version>0.8.9-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>com.microsoft.windowsazure</groupId>
+      <artifactId>microsoft-windowsazure-api</artifactId>
+      <version>0.4.4</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hive</groupId>
+      <artifactId>hive-exec</artifactId>
+      <version>0.13.0</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.jdo</groupId>
+      <artifactId>jdo2-api</artifactId>
+      <version>2.3-20090302111651</version>
+    </dependency>
+    <dependency>
+      <groupId>com.e-movimento.tinytools</groupId>
+      <artifactId>privilegedaccessor</artifactId>
+      <version>1.2.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.couchbase.client</groupId>
+      <artifactId>core-io</artifactId>
+      <version>1.2.7</version>
+    </dependency>
+  </dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b4c1fb06/asterixdb/asterix-external-data/src/test/resources/library_descriptor.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-external-data/src/test/resources/library_descriptor.xml b/asterixdb/asterix-external-data/src/test/resources/library_descriptor.xml
index bdf422e..4658a57 100644
--- a/asterixdb/asterix-external-data/src/test/resources/library_descriptor.xml
+++ b/asterixdb/asterix-external-data/src/test/resources/library_descriptor.xml
@@ -17,78 +17,78 @@
  ! under the License.
  !-->
 <externalLibrary xmlns="library">
-	<language>JAVA</language>
-	<libraryFunctions>
-		<libraryFunction>
-			<function_type>SCALAR</function_type>
-			<name>parseTweet</name>
-			<arguments>TweetInputType</arguments>
-			<return_type>TweetOutputType</return_type>
-			<definition>org.apache.asterix.external.library.ParseTweetFactory
-			</definition>
-		</libraryFunction>
-		<libraryFunction>
-			<function_type>SCALAR</function_type>
-			<name>addHashTags</name>
-			<arguments>Tweet</arguments>
-			<return_type>ProcessedTweet</return_type>
-			<definition>org.apache.asterix.external.library.AddHashTagsFactory
-			</definition>
-		</libraryFunction>
-		<libraryFunction>
-			<function_type>SCALAR</function_type>
-			<name>addHashTagsInPlace</name>
-			<arguments>Tweet</arguments>
-			<return_type>ProcessedTweet</return_type>
-			<definition>org.apache.asterix.external.library.AddHashTagsInPlaceFactory
-			</definition>
-		</libraryFunction>
-		<libraryFunction>
-			<function_type>SCALAR</function_type>
-			<name>mysum</name>
-			<arguments>AINT32,AINT32</arguments>
-			<return_type>AINT32</return_type>
-			<definition>org.apache.asterix.external.library.SumFactory
-			</definition>
-		</libraryFunction>
-		<libraryFunction>
-			<function_type>SCALAR</function_type>
-			<name>getCapital</name>
-			<arguments>ASTRING</arguments>
-			<return_type>CountryCapitalType</return_type>
-			<definition>org.apache.asterix.external.library.CapitalFinderFactory
-			</definition>
-		</libraryFunction>
-		<libraryFunction>
-			<function_type>SCALAR</function_type>
-			<name>toUpper</name>
-			<arguments>TextType</arguments>
-			<return_type>TextType</return_type>
-			<definition>org.apache.asterix.external.library.UpperCaseFactory
-			</definition>
-		</libraryFunction>
-		<libraryFunction>
-			<function_type>SCALAR</function_type>
-			<name>allTypes</name>
-			<arguments>AllType</arguments>
-			<return_type>AllType</return_type>
-			<definition>org.apache.asterix.external.library.AllTypesFactory
-			</definition>
-		</libraryFunction>
-		<libraryFunction>
-			<function_type>SCALAR</function_type>
-			<name>echoDelay</name>
-			<arguments>TweetMessageType</arguments>
-			<return_type>TweetMessageType</return_type>
-			<definition>org.apache.asterix.external.library.EchoDelayFactory
-			</definition>
-		</libraryFunction>
-	</libraryFunctions>
-	<libraryAdapters>
-		<libraryAdapter>
-			<name>test_typed_adapter</name>
-			<factory_class>org.apache.asterix.external.library.adapter.TestTypedAdapterFactory
-			</factory_class>
-		</libraryAdapter>
-	</libraryAdapters>
+  <language>JAVA</language>
+  <libraryFunctions>
+    <libraryFunction>
+      <function_type>SCALAR</function_type>
+      <name>parseTweet</name>
+      <arguments>TweetInputType</arguments>
+      <return_type>TweetOutputType</return_type>
+      <definition>org.apache.asterix.external.library.ParseTweetFactory
+      </definition>
+    </libraryFunction>
+    <libraryFunction>
+      <function_type>SCALAR</function_type>
+      <name>addHashTags</name>
+      <arguments>Tweet</arguments>
+      <return_type>ProcessedTweet</return_type>
+      <definition>org.apache.asterix.external.library.AddHashTagsFactory
+      </definition>
+    </libraryFunction>
+    <libraryFunction>
+      <function_type>SCALAR</function_type>
+      <name>addHashTagsInPlace</name>
+      <arguments>Tweet</arguments>
+      <return_type>ProcessedTweet</return_type>
+      <definition>org.apache.asterix.external.library.AddHashTagsInPlaceFactory
+      </definition>
+    </libraryFunction>
+    <libraryFunction>
+      <function_type>SCALAR</function_type>
+      <name>mysum</name>
+      <arguments>AINT32,AINT32</arguments>
+      <return_type>AINT32</return_type>
+      <definition>org.apache.asterix.external.library.SumFactory
+      </definition>
+    </libraryFunction>
+    <libraryFunction>
+      <function_type>SCALAR</function_type>
+      <name>getCapital</name>
+      <arguments>ASTRING</arguments>
+      <return_type>CountryCapitalType</return_type>
+      <definition>org.apache.asterix.external.library.CapitalFinderFactory
+      </definition>
+    </libraryFunction>
+    <libraryFunction>
+      <function_type>SCALAR</function_type>
+      <name>toUpper</name>
+      <arguments>TextType</arguments>
+      <return_type>TextType</return_type>
+      <definition>org.apache.asterix.external.library.UpperCaseFactory
+      </definition>
+    </libraryFunction>
+    <libraryFunction>
+      <function_type>SCALAR</function_type>
+      <name>allTypes</name>
+      <arguments>AllType</arguments>
+      <return_type>AllType</return_type>
+      <definition>org.apache.asterix.external.library.AllTypesFactory
+      </definition>
+    </libraryFunction>
+    <libraryFunction>
+      <function_type>SCALAR</function_type>
+      <name>echoDelay</name>
+      <arguments>TweetMessageType</arguments>
+      <return_type>TweetMessageType</return_type>
+      <definition>org.apache.asterix.external.library.EchoDelayFactory
+      </definition>
+    </libraryFunction>
+  </libraryFunctions>
+  <libraryAdapters>
+    <libraryAdapter>
+      <name>test_typed_adapter</name>
+      <factory_class>org.apache.asterix.external.library.adapter.TestTypedAdapterFactory
+      </factory_class>
+    </libraryAdapter>
+  </libraryAdapters>
 </externalLibrary>

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b4c1fb06/asterixdb/asterix-fuzzyjoin/pom.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-fuzzyjoin/pom.xml b/asterixdb/asterix-fuzzyjoin/pom.xml
index 92f9ddf..ce4e7d1 100644
--- a/asterixdb/asterix-fuzzyjoin/pom.xml
+++ b/asterixdb/asterix-fuzzyjoin/pom.xml
@@ -19,9 +19,9 @@
 <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">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-          <artifactId>apache-asterixdb</artifactId>
-          <groupId>org.apache.asterix</groupId>
-          <version>0.8.9-SNAPSHOT</version>
+    <artifactId>apache-asterixdb</artifactId>
+    <groupId>org.apache.asterix</groupId>
+    <version>0.8.9-SNAPSHOT</version>
   </parent>
   <groupId>org.apache.asterix</groupId>
   <artifactId>asterix-fuzzyjoin</artifactId>
@@ -37,33 +37,33 @@
   </licenses>
 
   <properties>
-      <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
+    <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
   </properties>
 
   <build>
     <plugins>
       <plugin>
-    <groupId>org.apache.maven.plugins</groupId>
-    <artifactId>maven-jar-plugin</artifactId>
-    <version>2.4</version>
-    <executions>
-      <execution>
-        <goals>
-          <goal>test-jar</goal>
-        </goals>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.4</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
             <phase>test-compile</phase>
           </execution>
         </executions>
         <configuration>
           <outputDirectory>${basedir}/target</outputDirectory>
           <includes>
-              <include>**/*.class</include>
-              <include>**/*.txt</include>
-              <include>**/README*</include>
-              <include>**/DISCLAIMER*</include>
-              <include>**/NOTICE*</include>
-              <include>**/LICENSE*</include>
-              <include>**/DEPENDENCIES*</include>
+            <include>**/*.class</include>
+            <include>**/*.txt</include>
+            <include>**/README*</include>
+            <include>**/DISCLAIMER*</include>
+            <include>**/NOTICE*</include>
+            <include>**/LICENSE*</include>
+            <include>**/DEPENDENCIES*</include>
           </includes>
         </configuration>
       </plugin>
@@ -76,8 +76,8 @@
       <artifactId>junit</artifactId>
     </dependency>
     <dependency>
-        <groupId>org.apache.hyracks</groupId>
-        <artifactId>hyracks-api</artifactId>
+      <groupId>org.apache.hyracks</groupId>
+      <artifactId>hyracks-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.hyracks</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b4c1fb06/asterixdb/asterix-installer/pom.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-installer/pom.xml b/asterixdb/asterix-installer/pom.xml
index cdda6b7..1fa3eb7 100644
--- a/asterixdb/asterix-installer/pom.xml
+++ b/asterixdb/asterix-installer/pom.xml
@@ -17,21 +17,21 @@
  ! 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/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>apache-asterixdb</artifactId>
-		<groupId>org.apache.asterix</groupId>
-		<version>0.8.9-SNAPSHOT</version>
-	</parent>
-	<artifactId>asterix-installer</artifactId>
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<failsafe.test.excludes>**/DmlRecoveryIT.java</failsafe.test.excludes>
-        <cluster.test.excludes>**/AsterixClusterLifeCycleIT.java</cluster.test.excludes>
-		<cluster.extest.excludes>**/ClusterExecutionIT.java</cluster.extest.excludes>
-        <replication.test.excludes>**/ReplicationIT.java</replication.test.excludes>
-        <appendedResourcesDirectory>${basedir}/src/main/appended-resources</appendedResourcesDirectory>
-	</properties>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>apache-asterixdb</artifactId>
+    <groupId>org.apache.asterix</groupId>
+    <version>0.8.9-SNAPSHOT</version>
+  </parent>
+  <artifactId>asterix-installer</artifactId>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <failsafe.test.excludes>**/DmlRecoveryIT.java</failsafe.test.excludes>
+    <cluster.test.excludes>**/AsterixClusterLifeCycleIT.java</cluster.test.excludes>
+    <cluster.extest.excludes>**/ClusterExecutionIT.java</cluster.extest.excludes>
+    <replication.test.excludes>**/ReplicationIT.java</replication.test.excludes>
+    <appendedResourcesDirectory>${basedir}/src/main/appended-resources</appendedResourcesDirectory>
+  </properties>
 
   <licenses>
     <license>
@@ -42,313 +42,312 @@
     </license>
   </licenses>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.jvnet.jaxb2.maven2</groupId>
-				<artifactId>maven-jaxb2-plugin</artifactId>
-				<version>0.9.0</version>
-				<executions>
-					<execution>
-						<id>configuration</id>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-						<configuration>
-							<args>
-								<arg>-Xsetters</arg>
-								<arg>-Xvalue-constructor</arg>
-							</args>
-							<plugins>
-								<plugin>
-									<groupId>org.jvnet.jaxb2_commons</groupId>
-									<artifactId>jaxb2-basics</artifactId>
-									<version>0.6.2</version>
-								</plugin>
-								<plugin>
-									<groupId>org.jvnet.jaxb2_commons</groupId>
-									<artifactId>jaxb2-value-constructor</artifactId>
-									<version>3.0</version>
-								</plugin>
-							</plugins>
-							<schemaDirectory>src/main/resources/schema</schemaDirectory>
-							<schemaIncludes>
-								<include>installer-conf.xsd</include>
-							</schemaIncludes>
-							<generatePackage>org.apache.asterix.installer.schema.conf</generatePackage>
-							<generateDirectory>${project.build.directory}/generated-sources/configuration</generateDirectory>
-						</configuration>
-					</execution>
-					<execution>
-						<id>cluster</id>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-						<configuration>
-							<schemaDirectory>src/main/resources/schema</schemaDirectory>
-							<schemaIncludes>
-								<include>cluster.xsd</include>
-							</schemaIncludes>
-							<generatePackage>org.apache.asterix.installer.schema.cluster</generatePackage>
-							<bindingDirectory>src/main/resources/schema</bindingDirectory>
-							<bindingIncludes>
-								<bindingInclude>jaxb-bindings.xjb</bindingInclude>
-							</bindingIncludes>
-							<generateDirectory>${project.build.directory}/generated-sources/cluster</generateDirectory>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<version>2.2-beta-5</version>
-				<executions>
-					<execution>
-						<configuration>
-							<descriptor>src/main/assembly/binary-assembly.xml</descriptor>
-						</configuration>
-						<phase>package</phase>
-						<goals>
-							<goal>attached</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-failsafe-plugin</artifactId>
-				<version>2.6</version>
-				<configuration>
-					<runOrder>alphabetical</runOrder>
-					<forkMode>pertest</forkMode>
-					<argLine>${coverageArgLine}</argLine>
-					<excludes>
-						<exclude>${failsafe.test.excludes}</exclude>
-                        <exclude>${cluster.test.excludes}</exclude>
-					    <exclude>${cluster.extest.excludes}</exclude>
-                        <exclude>${replication.test.excludes}</exclude>
-					</excludes>
-				</configuration>
-				<executions>
-					<execution>
-						<goals>
-							<goal>integration-test</goal>
-							<goal>verify</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-external-library</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>target/resources/externallib</outputDirectory>
-                            <overwrite>true</overwrite>
-                            <resources>
-                                <resource>
-                                    <directory>../asterix-external-data/target</directory>
-                                    <includes>
-                                        <include>testlib-zip-binary-assembly.zip</include>
-                                    </includes>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy-test-data</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>target/data</outputDirectory>
-                            <overwrite>true</overwrite>
-                            <resources>
-                                <resource>
-                                    <directory>../asterix-external-data/src/test/resources</directory>
-                                    <includes>
-                                        <include>beer.csv</include>
-                                    </includes>
-                                </resource>
-                                <resource>
-                                    <directory>../asterix-app/data/external-parser</directory>
-                                    <includes>
-                                        <include>jobads.new</include>
-                                    </includes>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-		</plugins>
-    </build>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.jvnet.jaxb2.maven2</groupId>
+        <artifactId>maven-jaxb2-plugin</artifactId>
+        <version>0.9.0</version>
+        <executions>
+          <execution>
+            <id>configuration</id>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+            <configuration>
+              <args>
+                <arg>-Xsetters</arg>
+                <arg>-Xvalue-constructor</arg>
+              </args>
+              <plugins>
+                <plugin>
+                  <groupId>org.jvnet.jaxb2_commons</groupId>
+                  <artifactId>jaxb2-basics</artifactId>
+                  <version>0.6.2</version>
+                </plugin>
+                <plugin>
+                  <groupId>org.jvnet.jaxb2_commons</groupId>
+                  <artifactId>jaxb2-value-constructor</artifactId>
+                  <version>3.0</version>
+                </plugin>
+              </plugins>
+              <schemaDirectory>src/main/resources/schema</schemaDirectory>
+              <schemaIncludes>
+                <include>installer-conf.xsd</include>
+              </schemaIncludes>
+              <generatePackage>org.apache.asterix.installer.schema.conf</generatePackage>
+              <generateDirectory>${project.build.directory}/generated-sources/configuration</generateDirectory>
+            </configuration>
+          </execution>
+          <execution>
+            <id>cluster</id>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+            <configuration>
+              <schemaDirectory>src/main/resources/schema</schemaDirectory>
+              <schemaIncludes>
+                <include>cluster.xsd</include>
+              </schemaIncludes>
+              <generatePackage>org.apache.asterix.installer.schema.cluster</generatePackage>
+              <bindingDirectory>src/main/resources/schema</bindingDirectory>
+              <bindingIncludes>
+                <bindingInclude>jaxb-bindings.xjb</bindingInclude>
+              </bindingIncludes>
+              <generateDirectory>${project.build.directory}/generated-sources/cluster</generateDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.2-beta-5</version>
+        <executions>
+          <execution>
+            <configuration>
+              <descriptor>src/main/assembly/binary-assembly.xml</descriptor>
+            </configuration>
+            <phase>package</phase>
+            <goals>
+              <goal>attached</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <version>2.6</version>
+        <configuration>
+          <runOrder>alphabetical</runOrder>
+          <forkMode>pertest</forkMode>
+          <argLine>${coverageArgLine}</argLine>
+          <excludes>
+            <exclude>${failsafe.test.excludes}</exclude>
+            <exclude>${cluster.test.excludes}</exclude>
+            <exclude>${cluster.extest.excludes}</exclude>
+            <exclude>${replication.test.excludes}</exclude>
+          </excludes>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>integration-test</goal>
+              <goal>verify</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-external-library</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>target/resources/externallib</outputDirectory>
+              <overwrite>true</overwrite>
+              <resources>
+                <resource>
+                  <directory>../asterix-external-data/target</directory>
+                  <includes>
+                    <include>testlib-zip-binary-assembly.zip</include>
+                  </includes>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test-data</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>target/data</outputDirectory>
+              <overwrite>true</overwrite>
+              <resources>
+                <resource>
+                  <directory>../asterix-external-data/src/test/resources</directory>
+                  <includes>
+                    <include>beer.csv</include>
+                  </includes>
+                </resource>
+                <resource>
+                  <directory>../asterix-app/data/external-parser</directory>
+                  <includes>
+                    <include>jobads.new</include>
+                  </includes>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 
+  <profiles>
+    <profile>
+      <id>cluster-tests</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+        <property>
+          <name>clusterTest</name>
+          <value>true</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>net.ju-n.maven.plugins</groupId>
+            <artifactId>vagrant-maven-plugin</artifactId>
+            <version>1.1.0-SNAPSHOT</version>
+            <executions>
 
-    <profiles>
-        <profile>
-            <id>cluster-tests</id>
-            <activation>
-                 <activeByDefault>false</activeByDefault>
-                 <property>
-                     <name>clusterTest</name>
-                     <value>true</value>
-                 </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                      <groupId>net.ju-n.maven.plugins</groupId>
-                      <artifactId>vagrant-maven-plugin</artifactId>
-                      <version>1.1.0-SNAPSHOT</version>
-                      <executions>
+              <!-- Before tests: import box, start VM -->
+              <execution>
+                <id>setup-and-start-vagrant-vm</id>
+                <phase>pre-integration-test</phase>
+                <goals>
+                  <goal>up</goal>
+                </goals>
+                <configuration>
+                  <box>chef/centos-6.5</box>
+                  <url>https://vagrantcloud.com/chef/centos-6.5</url>
+                  <vagrantHome>${project.basedir}/src/test/resources/clusterts</vagrantHome>
+                </configuration>
+              </execution>
 
-                        <!-- Before tests: import box, start VM -->
-                        <execution>
-                          <id>setup-and-start-vagrant-vm</id>
-                          <phase>pre-integration-test</phase>
-                          <goals>
-                            <goal>up</goal>
-                          </goals>
-                          <configuration>
-                            <box>chef/centos-6.5</box>
-                            <url>https://vagrantcloud.com/chef/centos-6.5</url>
-                            <vagrantHome>${project.basedir}/src/test/resources/clusterts</vagrantHome>
-                          </configuration>
-                        </execution>
+              <!-- After tests: shut down, destroy VM -->
+              <execution>
+                <id>destroy-vagrant-vm</id>
+                <phase>post-integration-test</phase>
+                <goals>
+                  <goal>destroy</goal>
+                </goals>
+                <configuration>
+                  <box>chef/centos-6.5</box>
+                  <url>https://vagrantcloud.com/chef/centos-6.5</url>
+                  <vagrantHome>${project.basedir}/src/test/resources/clusterts</vagrantHome>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-failsafe-plugin</artifactId>
+            <version>2.6</version>
+            <configuration>
+              <runOrder>alphabetical</runOrder>
+              <forkMode>pertest</forkMode>
+              <excludes>
+                <exclude>${failsafe.test.excludes}</exclude>
+                <exclude>${cluster.test.excludes}</exclude>
+                <exclude>${cluster.extest.excludes}</exclude>
+              </excludes>
+            </configuration>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>integration-test</goal>
+                  <goal>verify</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 
-                        <!-- After tests: shut down, destroy VM -->
-                        <execution>
-                          <id>destroy-vagrant-vm</id>
-                          <phase>post-integration-test</phase>
-                          <goals>
-                            <goal>destroy</goal>
-                          </goals>
-                          <configuration>
-                            <box>chef/centos-6.5</box>
-                            <url>https://vagrantcloud.com/chef/centos-6.5</url>
-                            <vagrantHome>${project.basedir}/src/test/resources/clusterts</vagrantHome>
-                          </configuration>
-                        </execution>
-                      </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <version>2.6</version>
-                        <configuration>
-                            <runOrder>alphabetical</runOrder>
-                            <forkMode>pertest</forkMode>
-                            <excludes>
-                                <exclude>${failsafe.test.excludes}</exclude>
-                                <exclude>${cluster.test.excludes}</exclude>
-                                <exclude>${cluster.extest.excludes}</exclude>
-                            </excludes>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                 </plugins>
-             </build>
-         </profile>
-      </profiles>
-
-	<dependencies>
-		<dependency>
-			<groupId>args4j</groupId>
-			<artifactId>args4j</artifactId>
-			<version>2.0.12</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.zookeeper</groupId>
-			<artifactId>zookeeper</artifactId>
-			<version>3.4.5</version>
-			<exclusions>
-				<exclusion>
-					<groupId>com.sun.jmx</groupId>
-					<artifactId>jmxri</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.sun.jdmk</groupId>
-					<artifactId>jmxtools</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>javax.jms</groupId>
-					<artifactId>jms</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.asterix</groupId>
-			<artifactId>asterix-events</artifactId>
-			<version>0.8.9-SNAPSHOT</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.asterix</groupId>
-			<artifactId>asterix-common</artifactId>
-			<version>0.8.9-SNAPSHOT</version>
-			<type>test-jar</type>
-			<scope>test</scope>
-		</dependency>
-        <dependency>
-            <groupId>org.apache.asterix</groupId>
-            <artifactId>asterix-app</artifactId>
-            <version>0.8.9-SNAPSHOT</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-		<dependency>
-			<groupId>org.apache.asterix</groupId>
-			<artifactId>asterix-app</artifactId>
-			<version>0.8.9-SNAPSHOT</version>
-			<type>test-jar</type>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.asterix</groupId>
-			<artifactId>asterix-server</artifactId>
-			<version>0.8.9-SNAPSHOT</version>
-			<type>zip</type>
-			<classifier>binary-assembly</classifier>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.asterix</groupId>
-			<artifactId>asterix-external-data</artifactId>
-			<version>0.8.9-SNAPSHOT</version>
-			<type>zip</type>
-			<classifier>binary-assembly</classifier>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.asterix</groupId>
-			<artifactId>asterix-test-framework</artifactId>
-			<version>0.8.9-SNAPSHOT</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.hadoop</groupId>
-			<artifactId>hadoop-common</artifactId>
-			<version>${hadoop.version}</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
+  <dependencies>
+    <dependency>
+      <groupId>args4j</groupId>
+      <artifactId>args4j</artifactId>
+      <version>2.0.12</version>
+      <type>jar</type>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.zookeeper</groupId>
+      <artifactId>zookeeper</artifactId>
+      <version>3.4.5</version>
+      <exclusions>
+        <exclusion>
+          <groupId>com.sun.jmx</groupId>
+          <artifactId>jmxri</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.sun.jdmk</groupId>
+          <artifactId>jmxtools</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.jms</groupId>
+          <artifactId>jms</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.asterix</groupId>
+      <artifactId>asterix-events</artifactId>
+      <version>0.8.9-SNAPSHOT</version>
+      <type>jar</type>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.asterix</groupId>
+      <artifactId>asterix-common</artifactId>
+      <version>0.8.9-SNAPSHOT</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.asterix</groupId>
+      <artifactId>asterix-app</artifactId>
+      <version>0.8.9-SNAPSHOT</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.asterix</groupId>
+      <artifactId>asterix-app</artifactId>
+      <version>0.8.9-SNAPSHOT</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.asterix</groupId>
+      <artifactId>asterix-server</artifactId>
+      <version>0.8.9-SNAPSHOT</version>
+      <type>zip</type>
+      <classifier>binary-assembly</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.asterix</groupId>
+      <artifactId>asterix-external-data</artifactId>
+      <version>0.8.9-SNAPSHOT</version>
+      <type>zip</type>
+      <classifier>binary-assembly</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.asterix</groupId>
+      <artifactId>asterix-test-framework</artifactId>
+      <version>0.8.9-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-common</artifactId>
+      <version>${hadoop.version}</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b4c1fb06/asterixdb/asterix-installer/src/main/assembly/binary-assembly.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-installer/src/main/assembly/binary-assembly.xml b/asterixdb/asterix-installer/src/main/assembly/binary-assembly.xml
index da042b9..da89a02 100644
--- a/asterixdb/asterix-installer/src/main/assembly/binary-assembly.xml
+++ b/asterixdb/asterix-installer/src/main/assembly/binary-assembly.xml
@@ -17,135 +17,135 @@
  ! under the License.
  !-->
 <assembly>
-	<id>binary-assembly</id>
-	<formats>
-		<format>zip</format>
-		<format>dir</format>
-	</formats>
-	<includeBaseDirectory>false</includeBaseDirectory>
-	<fileSets>
-		<fileSet>
-			<directory>src/main/resources/conf</directory>
-			<outputDirectory>conf</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>src/main/resources/clusters</directory>
-			<outputDirectory>clusters</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>src/main/resources/examples</directory>
-			<outputDirectory>examples</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>src/main/resources/zookeeper</directory>
-			<fileMode>0755</fileMode>
-			<outputDirectory>.installer/zookeeper/bin</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>src/main/resources/scripts</directory>
-			<fileMode>0755</fileMode>
-			<includes>
-				<include>managix</include>
-			</includes>
-			<outputDirectory>bin</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>src/main/resources/scripts</directory>
-			<fileMode>0755</fileMode>
-			<excludes>
-				<exclude>managix</exclude>
-			</excludes>
-			<outputDirectory>.installer/scripts</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>src/main/resources/hadoop-0.20.2</directory>
-			<outputDirectory>.installer/hadoop-0.20.2</outputDirectory>
-			<fileMode>0755</fileMode>
-		</fileSet>
-		<fileSet>
-			<directory>target</directory>
-			<outputDirectory>lib</outputDirectory>
-			<includes>
-				<include>*.jar</include>
-			</includes>
-		</fileSet>
-		<fileSet>
-			<directory>target/classes/META-INF</directory>
-			<outputDirectory>.</outputDirectory>
-			<includes>
-				<include>DISCLAIMER*</include>
-			</includes>
-		</fileSet>
-		<fileSet>
-			<directory>src/main/licenses/</directory>
-			<outputDirectory>.</outputDirectory>
-			<includes>
-				<include>LICENSE*</include>
-				<include>NOTICE*</include>
-			</includes>
-		</fileSet>
-		<fileSet>
-			<directory>../asterix-events/src/main/resources/events</directory>
-			<outputDirectory>.installer/events</outputDirectory>
-			<fileMode>0755</fileMode>
-		</fileSet>
-	</fileSets>
-	<dependencySets>
-		<dependencySet>
-			<includes>
-				<include>log4j:log4j</include>
-				<include>org.apache.asterix:asterix-events</include>
-				<include>org.apache.asterix:asterix-common</include>
-				<include>org.apache.zookeeper:zookeeper</include>
-				<include>args4j:args4j</include>
-				<include>log4j:log4j</include>
-				<include>commons-io:commons-io</include>
-				<include>org.slf4j:slf4j-api</include>
-				<include>org.slf4j:slf4j-log4j12</include>
-			</includes>
-			<unpack>false</unpack>
-			<outputDirectory>lib</outputDirectory>
-		</dependencySet>
-		<dependencySet>
-			<includes>
-				<include>org.apache.hadoop:hadoop-core</include>
-				<include>commons-cli:commons-cli</include>
-				<include>commons-logging:commons-logging</include>
-			</includes>
-			<unpack>false</unpack>
-			<outputDirectory>.installer/hadoop-0.20.2/lib</outputDirectory>
-		</dependencySet>
-		<dependencySet>
-			<includes>
-				<include>org.apache.zookeeper:zookeeper</include>
-				<include>log4j:log4j</include>
-				<include>org.slf4j:slf4j-api</include>
-			</includes>
-			<unpack>false</unpack>
-			<outputDirectory>.installer/zookeeper/lib</outputDirectory>
-		</dependencySet>
-		<dependencySet>
-			<outputDirectory>asterix</outputDirectory>
-			<includes>
-				<include>asterix-server*</include>
-			</includes>
-			<useTransitiveDependencies>false</useTransitiveDependencies>
-		</dependencySet>
-		<dependencySet>
-			<outputDirectory>.installer/events</outputDirectory>
-			<includes>
-				<include>asterix-events*</include>
-			</includes>
-			<unpack>false</unpack>
-			<useTransitiveDependencies>false</useTransitiveDependencies>
-		</dependencySet>
-		<dependencySet>
-			<outputDirectory>extlibs</outputDirectory>
-			<includes>
-				<include>asterix-external-data:*:zip</include>
-			</includes>
-			<unpack>false</unpack>
-			<useTransitiveDependencies>false</useTransitiveDependencies>
-		</dependencySet>
-	</dependencySets>
- </assembly>
+  <id>binary-assembly</id>
+  <formats>
+    <format>zip</format>
+    <format>dir</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>src/main/resources/conf</directory>
+      <outputDirectory>conf</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>src/main/resources/clusters</directory>
+      <outputDirectory>clusters</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>src/main/resources/examples</directory>
+      <outputDirectory>examples</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>src/main/resources/zookeeper</directory>
+      <fileMode>0755</fileMode>
+      <outputDirectory>.installer/zookeeper/bin</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>src/main/resources/scripts</directory>
+      <fileMode>0755</fileMode>
+      <includes>
+        <include>managix</include>
+      </includes>
+      <outputDirectory>bin</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>src/main/resources/scripts</directory>
+      <fileMode>0755</fileMode>
+      <excludes>
+        <exclude>managix</exclude>
+      </excludes>
+      <outputDirectory>.installer/scripts</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>src/main/resources/hadoop-0.20.2</directory>
+      <outputDirectory>.installer/hadoop-0.20.2</outputDirectory>
+      <fileMode>0755</fileMode>
+    </fileSet>
+    <fileSet>
+      <directory>target</directory>
+      <outputDirectory>lib</outputDirectory>
+      <includes>
+        <include>*.jar</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>target/classes/META-INF</directory>
+      <outputDirectory>.</outputDirectory>
+      <includes>
+        <include>DISCLAIMER*</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>src/main/licenses/</directory>
+      <outputDirectory>.</outputDirectory>
+      <includes>
+        <include>LICENSE*</include>
+        <include>NOTICE*</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>../asterix-events/src/main/resources/events</directory>
+      <outputDirectory>.installer/events</outputDirectory>
+      <fileMode>0755</fileMode>
+    </fileSet>
+  </fileSets>
+  <dependencySets>
+    <dependencySet>
+      <includes>
+        <include>log4j:log4j</include>
+        <include>org.apache.asterix:asterix-events</include>
+        <include>org.apache.asterix:asterix-common</include>
+        <include>org.apache.zookeeper:zookeeper</include>
+        <include>args4j:args4j</include>
+        <include>log4j:log4j</include>
+        <include>commons-io:commons-io</include>
+        <include>org.slf4j:slf4j-api</include>
+        <include>org.slf4j:slf4j-log4j12</include>
+      </includes>
+      <unpack>false</unpack>
+      <outputDirectory>lib</outputDirectory>
+    </dependencySet>
+    <dependencySet>
+      <includes>
+        <include>org.apache.hadoop:hadoop-core</include>
+        <include>commons-cli:commons-cli</include>
+        <include>commons-logging:commons-logging</include>
+      </includes>
+      <unpack>false</unpack>
+      <outputDirectory>.installer/hadoop-0.20.2/lib</outputDirectory>
+    </dependencySet>
+    <dependencySet>
+      <includes>
+        <include>org.apache.zookeeper:zookeeper</include>
+        <include>log4j:log4j</include>
+        <include>org.slf4j:slf4j-api</include>
+      </includes>
+      <unpack>false</unpack>
+      <outputDirectory>.installer/zookeeper/lib</outputDirectory>
+    </dependencySet>
+    <dependencySet>
+      <outputDirectory>asterix</outputDirectory>
+      <includes>
+        <include>asterix-server*</include>
+      </includes>
+      <useTransitiveDependencies>false</useTransitiveDependencies>
+    </dependencySet>
+    <dependencySet>
+      <outputDirectory>.installer/events</outputDirectory>
+      <includes>
+        <include>asterix-events*</include>
+      </includes>
+      <unpack>false</unpack>
+      <useTransitiveDependencies>false</useTransitiveDependencies>
+    </dependencySet>
+    <dependencySet>
+      <outputDirectory>extlibs</outputDirectory>
+      <includes>
+        <include>asterix-external-data:*:zip</include>
+      </includes>
+      <unpack>false</unpack>
+      <useTransitiveDependencies>false</useTransitiveDependencies>
+    </dependencySet>
+  </dependencySets>
+</assembly>

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b4c1fb06/asterixdb/asterix-installer/src/main/resources/clusters/demo/demo.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-installer/src/main/resources/clusters/demo/demo.xml b/asterixdb/asterix-installer/src/main/resources/clusters/demo/demo.xml
index 1932fcc..2721eec 100644
--- a/asterixdb/asterix-installer/src/main/resources/clusters/demo/demo.xml
+++ b/asterixdb/asterix-installer/src/main/resources/clusters/demo/demo.xml
@@ -17,39 +17,39 @@
  ! under the License.
  !-->
 <cluster xmlns="cluster">
-	<!--
-		This defines a cluster that runs 2 worker nodes on a single machine.
-		Also, each worker node is assigned to 2 partitions in the same
-		directory (and thus on the same external storage device).
-		Both of these decisions are usually not advisable for production
-		use.
-	-->
-	<name>demo</name>
-	<working_dir>
-		<dir>/tmp/asterix-installer</dir>
-		<NFS>true</NFS>
-	</working_dir>
-	<log_dir>/tmp/asterix/logs</log_dir>
-	<store>storage</store>
-	<java_home></java_home>
-	<master_node>
-		<id>master</id>
-		<client_ip>127.0.0.1</client_ip>
-		<cluster_ip>127.0.0.1</cluster_ip>
-		<cluster_port>1099</cluster_port>
-		<client_port>1098</client_port>
-		<http_port>8888</http_port>
-	</master_node>
-	<node>
-		<id>node1</id>
-		<cluster_ip>127.0.0.1</cluster_ip>
-		<txn_log_dir>/tmp/asterix/node1/txnLogs</txn_log_dir>
-		<iodevices>/tmp/asterix/node1/1,/tmp/asterix/node1/2</iodevices>
-	</node>
-	<node>
-		<id>node2</id>
-		<cluster_ip>127.0.0.1</cluster_ip>
-		<txn_log_dir>/tmp/asterix/node2/txnLogs</txn_log_dir>
-		<iodevices>/tmp/asterix/node2/1,/tmp/asterix/node2/2</iodevices>
-	</node>
+  <!--
+    This defines a cluster that runs 2 worker nodes on a single machine.
+    Also, each worker node is assigned to 2 partitions in the same
+    directory (and thus on the same external storage device).
+    Both of these decisions are usually not advisable for production
+    use.
+  -->
+  <name>demo</name>
+  <working_dir>
+    <dir>/tmp/asterix-installer</dir>
+    <NFS>true</NFS>
+  </working_dir>
+  <log_dir>/tmp/asterix/logs</log_dir>
+  <store>storage</store>
+  <java_home></java_home>
+  <master_node>
+    <id>master</id>
+    <client_ip>127.0.0.1</client_ip>
+    <cluster_ip>127.0.0.1</cluster_ip>
+    <cluster_port>1099</cluster_port>
+    <client_port>1098</client_port>
+    <http_port>8888</http_port>
+  </master_node>
+  <node>
+    <id>node1</id>
+    <cluster_ip>127.0.0.1</cluster_ip>
+    <txn_log_dir>/tmp/asterix/node1/txnLogs</txn_log_dir>
+    <iodevices>/tmp/asterix/node1/1,/tmp/asterix/node1/2</iodevices>
+  </node>
+  <node>
+    <id>node2</id>
+    <cluster_ip>127.0.0.1</cluster_ip>
+    <txn_log_dir>/tmp/asterix/node2/txnLogs</txn_log_dir>
+    <iodevices>/tmp/asterix/node2/1,/tmp/asterix/node2/2</iodevices>
+  </node>
 </cluster>

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b4c1fb06/asterixdb/asterix-installer/src/main/resources/clusters/local/local.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-installer/src/main/resources/clusters/local/local.xml b/asterixdb/asterix-installer/src/main/resources/clusters/local/local.xml
index 20f697f..bd3bde0 100644
--- a/asterixdb/asterix-installer/src/main/resources/clusters/local/local.xml
+++ b/asterixdb/asterix-installer/src/main/resources/clusters/local/local.xml
@@ -18,47 +18,47 @@
  ! under the License.
  !-->
 <cluster xmlns="cluster">
-    <java_home>/usr/lib/jvm/jdk-8-oracle-x64/jre</java_home>
-    <log_dir>/tmp/asterix/logs</log_dir>
-    <txn_log_dir>/tmp/asterix/txnLogs</txn_log_dir>
-    <store>storage</store>
-    <working_dir>
-        <dir>/tmp/asterix-installer</dir>
-        <NFS>true</NFS>
-    </working_dir>
-    <!-- Sets the time duration between two heartbeats from each node controller in milliseconds (default: 10000) -->
-    <heartbeat_period>10000</heartbeat_period>
-    <!-- Sets the maximum number of missed heartbeats before a node is marked as dead (default: 5) -->
-    <max_heartbeat_lapse_periods>5</max_heartbeat_lapse_periods>
-    <!-- Sets the time duration between two profile dumps from each node controller in milliseconds. 0 to disable. (default: 0) -->
-    <profile_dump_period>0</profile_dump_period>
-    <!-- Sets the default number of job attempts allowed if not specified in the job specification. (default: 5) -->
-    <default_max_job_attempts>5</default_max_job_attempts>
-    <!-- Limits the number of historical jobs remembered by the system to the specified value. (default: 10) -->
-    <job_history_size>10</job_history_size>
-    <!-- Limits the amount of time results for asynchronous jobs should be retained by the system in milliseconds. (default: 24 hours) -->
-    <result_time_to_live>86400000</result_time_to_live>
-    <!-- The duration within which an instance of the result cleanup should be invoked in milliseconds. (default: 1 minute) -->
-    <result_sweep_threshold>60000</result_sweep_threshold>
-    <master_node>
-        <id>master</id>
-        <client_ip>127.0.0.1</client_ip>
-        <cluster_ip>127.0.0.1</cluster_ip>
-        <client_port>1098</client_port>
-        <cluster_port>1099</cluster_port>
-        <http_port>8888</http_port>
-    </master_node>
-    <node>
-        <id>nc1</id>
-        <cluster_ip>127.0.0.1</cluster_ip>
-        <txn_log_dir>/tmp/asterix/nc1/txnLogs</txn_log_dir>
-        <iodevices>/tmp/asterix/nc1/p1,/tmp/asterix/nc1/p2</iodevices>
+  <java_home>/usr/lib/jvm/jdk-8-oracle-x64/jre</java_home>
+  <log_dir>/tmp/asterix/logs</log_dir>
+  <txn_log_dir>/tmp/asterix/txnLogs</txn_log_dir>
+  <store>storage</store>
+  <working_dir>
+    <dir>/tmp/asterix-installer</dir>
+    <NFS>true</NFS>
+  </working_dir>
+  <!-- Sets the time duration between two heartbeats from each node controller in milliseconds (default: 10000) -->
+  <heartbeat_period>10000</heartbeat_period>
+  <!-- Sets the maximum number of missed heartbeats before a node is marked as dead (default: 5) -->
+  <max_heartbeat_lapse_periods>5</max_heartbeat_lapse_periods>
+  <!-- Sets the time duration between two profile dumps from each node controller in milliseconds. 0 to disable. (default: 0) -->
+  <profile_dump_period>0</profile_dump_period>
+  <!-- Sets the default number of job attempts allowed if not specified in the job specification. (default: 5) -->
+  <default_max_job_attempts>5</default_max_job_attempts>
+  <!-- Limits the number of historical jobs remembered by the system to the specified value. (default: 10) -->
+  <job_history_size>10</job_history_size>
+  <!-- Limits the amount of time results for asynchronous jobs should be retained by the system in milliseconds. (default: 24 hours) -->
+  <result_time_to_live>86400000</result_time_to_live>
+  <!-- The duration within which an instance of the result cleanup should be invoked in milliseconds. (default: 1 minute) -->
+  <result_sweep_threshold>60000</result_sweep_threshold>
+  <master_node>
+    <id>master</id>
+    <client_ip>127.0.0.1</client_ip>
+    <cluster_ip>127.0.0.1</cluster_ip>
+    <client_port>1098</client_port>
+    <cluster_port>1099</cluster_port>
+    <http_port>8888</http_port>
+  </master_node>
+  <node>
+    <id>nc1</id>
+    <cluster_ip>127.0.0.1</cluster_ip>
+    <txn_log_dir>/tmp/asterix/nc1/txnLogs</txn_log_dir>
+    <iodevices>/tmp/asterix/nc1/p1,/tmp/asterix/nc1/p2</iodevices>
 
-    </node>
-    <node>
-        <id>nc2</id>
-        <cluster_ip>127.0.0.1</cluster_ip>
-        <txn_log_dir>/tmp/asterix/nc2/txnLogs</txn_log_dir>
-        <iodevices>/tmp/asterix/nc2/p1,/tmp/asterix/nc2/p2</iodevices>
-    </node>
+  </node>
+  <node>
+    <id>nc2</id>
+    <cluster_ip>127.0.0.1</cluster_ip>
+    <txn_log_dir>/tmp/asterix/nc2/txnLogs</txn_log_dir>
+    <iodevices>/tmp/asterix/nc2/p1,/tmp/asterix/nc2/p2</iodevices>
+  </node>
 </cluster>