incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [50/51] [partial] git commit: Changing default jvm version to 1.8. Removing hadoop profiles, will only support hadoop 2 from this point forward. Broke up the distribution project into 4 projects. Source, binary, parcel and csd. Also changed blur's ve
Date Sun, 27 Sep 2015 18:52:40 GMT
http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e5ae88af/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Selector.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Selector.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Selector.java
index af622c5..37385d7 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Selector.java
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Selector.java
@@ -1304,7 +1304,7 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
                 struct.columnsToFetch = new HashMap<String,Set<String>>(2*_map29.size);
                 for (int _i30 = 0; _i30 < _map29.size; ++_i30)
                 {
-                  String _key31; // optional
+                  String _key31; // required
                   Set<String> _val32; // required
                   _key31 = iprot.readString();
                   {
@@ -1603,7 +1603,7 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
           struct.columnsToFetch = new HashMap<String,Set<String>>(2*_map50.size);
           for (int _i51 = 0; _i51 < _map50.size; ++_i51)
           {
-            String _key52; // optional
+            String _key52; // required
             Set<String> _val53; // required
             _key52 = iprot.readString();
             {

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e5ae88af/blur-thrift/src/main/java/org/apache/blur/thrift/generated/TableDescriptor.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/TableDescriptor.java
b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/TableDescriptor.java
index 1a08bc0..3793c00 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/TableDescriptor.java
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/TableDescriptor.java
@@ -1799,7 +1799,7 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
                 struct.tableProperties = new HashMap<String,String>(2*_map172.size);
                 for (int _i173 = 0; _i173 < _map172.size; ++_i173)
                 {
-                  String _key174; // optional
+                  String _key174; // required
                   String _val175; // required
                   _key174 = iprot.readString();
                   _val175 = iprot.readString();
@@ -1843,7 +1843,7 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
                 struct.defaultMissingFieldProps = new HashMap<String,String>(2*_map176.size);
                 for (int _i177 = 0; _i177 < _map176.size; ++_i177)
                 {
-                  String _key178; // optional
+                  String _key178; // required
                   String _val179; // required
                   _key178 = iprot.readString();
                   _val179 = iprot.readString();
@@ -2169,7 +2169,7 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
           struct.tableProperties = new HashMap<String,String>(2*_map194.size);
           for (int _i195 = 0; _i195 < _map194.size; ++_i195)
           {
-            String _key196; // optional
+            String _key196; // required
             String _val197; // required
             _key196 = iprot.readString();
             _val197 = iprot.readString();
@@ -2196,7 +2196,7 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
           struct.defaultMissingFieldProps = new HashMap<String,String>(2*_map198.size);
           for (int _i199 = 0; _i199 < _map198.size; ++_i199)
           {
-            String _key200; // optional
+            String _key200; // required
             String _val201; // required
             _key200 = iprot.readString();
             _val201 = iprot.readString();

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e5ae88af/blur-thrift/src/main/java/org/apache/blur/thrift/generated/User.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/User.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/User.java
index 33b0f91..8415554 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/User.java
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/User.java
@@ -480,7 +480,7 @@ public class User implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<User,
                 struct.attributes = new HashMap<String,String>(2*_map0.size);
                 for (int _i1 = 0; _i1 < _map0.size; ++_i1)
                 {
-                  String _key2; // optional
+                  String _key2; // required
                   String _val3; // required
                   _key2 = iprot.readString();
                   _val3 = iprot.readString();
@@ -580,7 +580,7 @@ public class User implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<User,
           struct.attributes = new HashMap<String,String>(2*_map6.size);
           for (int _i7 = 0; _i7 < _map6.size; ++_i7)
           {
-            String _key8; // optional
+            String _key8; // required
             String _val9; // required
             _key8 = iprot.readString();
             _val9 = iprot.readString();

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e5ae88af/blur-util/pom.xml
----------------------------------------------------------------------
diff --git a/blur-util/pom.xml b/blur-util/pom.xml
index 462f5f8..9b972fe 100644
--- a/blur-util/pom.xml
+++ b/blur-util/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.apache.blur</groupId>
 		<artifactId>blur</artifactId>
-		<version>0.2.4-incubating-SNAPSHOT</version>
+		<version>0.3.0.incubating</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>org.apache.blur</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e5ae88af/blur-util/src/main/java/org/apache/blur/doc/CreateCSDDescriptor.java
----------------------------------------------------------------------
diff --git a/blur-util/src/main/java/org/apache/blur/doc/CreateCSDDescriptor.java b/blur-util/src/main/java/org/apache/blur/doc/CreateCSDDescriptor.java
deleted file mode 100644
index 83d31d0..0000000
--- a/blur-util/src/main/java/org/apache/blur/doc/CreateCSDDescriptor.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.blur.doc;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.blur.doc.BlurPropertyParser.BlurProp;
-
-public class CreateCSDDescriptor {
-
-  private static final String BLUR_VERSION = "|||BLUR-VERSION|||";
-
-  public static void main(String[] args) throws IOException {
-    BlurPropertyParser parser = new BlurPropertyParser();
-    Map<String, List<BlurProp>> props = parser.parse();
-    Map<String, StringBuffer> map = new HashMap<String, StringBuffer>();
-
-    JsonPropertyFormatter formatter = new JsonPropertyFormatter();
-
-    for (Map.Entry<String, List<BlurProp>> prop : props.entrySet()) {
-
-      StringBuffer buffer = map.get(prop.getKey());
-      if (buffer == null) {
-        buffer = new StringBuffer();
-        map.put(prop.getKey(), buffer);
-      }
-      boolean first = true;
-
-      for (BlurProp p : prop.getValue()) {
-        if (!first) {
-          buffer.append(formatter.separator());
-        }
-        buffer.append(formatter.format(p));
-        first = false;
-      }
-    }
-
-    String source = args[0];
-    String dest = args[1];
-    String blurVersion = args[2];
-
-    replaceValuesInFile(source, dest, map, formatVersion(blurVersion));
-  }
-
-  public static String formatVersion(String blurVersion) {
-    return blurVersion.replace("-", ".");
-  }
-
-  private static void replaceValuesInFile(String s, String o, Map<String, StringBuffer>
replacements, String blurVersion)
-      throws IOException {
-
-    File source = new File(s);
-    File output = new File(o);
-    System.out.println("Source[" + source.getAbsolutePath() + "]");
-    System.out.println("Output[" + output.getAbsolutePath() + "]");
-    PrintWriter writer = new PrintWriter(output);
-
-    BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(source)));
-    String line;
-    while ((line = reader.readLine()) != null) {
-      StringBuffer newData = replacements.get(line.trim());
-      if (line.contains(BLUR_VERSION)) {
-        writer.println(line.replace(BLUR_VERSION, blurVersion));
-      } else if (newData != null) {
-        writer.println(newData.toString());
-      } else {
-        writer.println(line);
-      }
-    }
-    writer.close();
-    reader.close();
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e5ae88af/blur-util/src/main/java/org/apache/blur/doc/ParcelJsonTemplate.java
----------------------------------------------------------------------
diff --git a/blur-util/src/main/java/org/apache/blur/doc/ParcelJsonTemplate.java b/blur-util/src/main/java/org/apache/blur/doc/ParcelJsonTemplate.java
deleted file mode 100644
index f165963..0000000
--- a/blur-util/src/main/java/org/apache/blur/doc/ParcelJsonTemplate.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.blur.doc;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-
-public class ParcelJsonTemplate {
-
-  private static final String BLUR_VERSION = "|||BLUR-VERSION|||";
-
-  public static void main(String[] args) throws IOException {
-
-    String source = args[0];
-    String dest = args[1];
-    String blurVersion = args[2];
-
-    replaceValuesInFile(source, dest, blurVersion);
-  }
-
-  private static void replaceValuesInFile(String s, String o, String blurVersion) throws
IOException {
-    File source = new File(s);
-    File output = new File(o);
-    System.out.println("Source[" + source.getAbsolutePath() + "]");
-    System.out.println("Output[" + output.getAbsolutePath() + "]");
-    PrintWriter writer = new PrintWriter(output);
-
-    BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(source)));
-    String line;
-    while ((line = reader.readLine()) != null) {
-      if (line.contains(BLUR_VERSION)) {
-        writer.println(line.replace(BLUR_VERSION, blurVersion));
-      } else {
-        writer.println(line);
-      }
-    }
-    writer.close();
-    reader.close();
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e5ae88af/cdh-csd/pom.xml
----------------------------------------------------------------------
diff --git a/cdh-csd/pom.xml b/cdh-csd/pom.xml
new file mode 100644
index 0000000..6c4cb4f
--- /dev/null
+++ b/cdh-csd/pom.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
+	license agreements. See the NOTICE file distributed with this work for additional 
+	information regarding copyright ownership. The ASF licenses this file to 
+	you under the Apache License, Version 2.0 (the "License"); you may not use 
+	this file except in compliance with the License. You may obtain a copy of 
+	the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
+	by applicable law or agreed to in writing, software distributed under the 
+	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+	OF ANY KIND, either express or implied. See the License for the specific 
+	language governing permissions and limitations under the License. -->
+<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>
+		<groupId>org.apache.blur</groupId>
+		<artifactId>blur</artifactId>
+		<version>0.3.0.incubating</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+
+	<artifactId>cdh-csd</artifactId>
+	<version>${projectVersion}</version>
+	<packaging>jar</packaging>
+	<name>CDH CSD</name>
+	<description>The Blur cdh-csd module builds a csd artifact.</description>
+	<properties>
+		<csd.name>BLUR</csd.name>
+		<csd.assembly.file>src/assemble/csd-hadoop2.xml</csd.assembly.file>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.blur</groupId>
+			<artifactId>blur-store</artifactId>
+			<version>${project.version}</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>exec-maven-plugin</artifactId>
+				<version>1.2.1</version>
+				<executions>
+					<execution>
+						<id>create-service-descriptor</id>
+						<phase>package</phase>
+						<goals>
+							<goal>java</goal>
+						</goals>
+						<configuration>
+							<classpathScope>test</classpathScope>
+							<mainClass>org.apache.blur.doc.CreateCSDDescriptor</mainClass>
+							<arguments>
+								<argument>${project.basedir}/src/main/resources/descriptor/service.sdl.template</argument>
+								<argument>${project.basedir}/target/generated/service.sdl</argument>
+								<argument>${project.version}</argument>
+							</arguments>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>distro-assembly-csd</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+						<configuration>
+							<descriptors>
+								<descriptor>${csd.assembly.file}</descriptor>
+							</descriptors>
+							<finalName>${csd.name}-${project.version}</finalName>
+							<appendAssemblyId>false</appendAssemblyId>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e5ae88af/cdh-csd/src/assemble/csd-hadoop2.xml
----------------------------------------------------------------------
diff --git a/cdh-csd/src/assemble/csd-hadoop2.xml b/cdh-csd/src/assemble/csd-hadoop2.xml
new file mode 100644
index 0000000..3e36564
--- /dev/null
+++ b/cdh-csd/src/assemble/csd-hadoop2.xml
@@ -0,0 +1,45 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+  <id>csd</id>
+  <formats>
+    <format>jar</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+
+  <fileSets>
+    <fileSet>
+      <directory>${project.basedir}/src/main/resources/scripts</directory>
+      <outputDirectory>scripts</outputDirectory>
+      <excludes>
+        <exclude>**/.empty</exclude>
+      </excludes>
+    </fileSet>
+  </fileSets>
+
+  <files>
+    <file>
+      <source>${project.build.directory}/generated/service.sdl</source>
+      <outputDirectory>descriptor</outputDirectory>
+      <destName>service.sdl</destName>
+    </file>
+  </files>
+</assembly>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e5ae88af/cdh-csd/src/main/resources/descriptor/service.sdl.template
----------------------------------------------------------------------
diff --git a/cdh-csd/src/main/resources/descriptor/service.sdl.template b/cdh-csd/src/main/resources/descriptor/service.sdl.template
new file mode 100644
index 0000000..2f66d28
--- /dev/null
+++ b/cdh-csd/src/main/resources/descriptor/service.sdl.template
@@ -0,0 +1,168 @@
+{
+  "name"  : "BLUR",
+  "label" : "Blur",
+  "description": "Apache Blur Search Service",
+  "version" : "|||BLUR-VERSION|||",
+  "runAs" : {
+    "user"  : "blur",
+    "group" : "blur"
+  },
+  "rolesWithExternalLinks":["BLUR_CONTROLLER","BLUR_SHARD"],
+  "hdfsDirs" : [
+  	{
+  		"name" : "CreateBlurTablesDir",
+  		"label": "Create Blur Tables Directory",
+  		"description" : "Creates the Blur Tables Directory",
+  		"directoryDescription": "Location of Blur tables.",
+  		"path":"/user/${user}/${blur_cluster_name}/tables",
+  		"permissions":"0755"
+  	},
+  	{
+  		"name" : "CreateBlurCommandsDir",
+  		"label": "Create Blur Commands Directory",
+  		"description" : "Creates the Blur Commands Directory",
+  		"directoryDescription": "Path that Blur will look for installed commands.",
+  		"path":"/user/${user}/${blur_cluster_name}/commands",
+  		"permissions":"0755"
+  	}
+  ],
+  "serviceInit": {
+  	"preStartSteps": [
+		{"commandName":"CreateBlurTablesDir"},
+		{"commandName":"CreateBlurCommandsDir"}  	
+  	]
+  },
+  
+  "parameters": [
+    
+    {
+      "name":"blur_cluster_name",
+      "label":"Blur Cluster Name",
+      "description": "Name of Blur Cluster",
+      "configName":"blur.cluster.name",
+      "required":"true",
+      "type":"string",
+      "default":"default",
+      "configurableInWizard":true
+    },
+    {
+      "name":"blur_zookeeper_root",
+      "label":"Zookeeper Root",
+      "description": "Advanced: Root ZK connection to alternate path.",
+      "configName":"blur.zookeeper.root",
+      "required":"false",
+      "type":"string",
+      "default":"",
+      "configurableInWizard":true
+    },    
+   
+|||General-Server-Properties|||
+  ],
+  
+  "roles" : [
+    {
+      "name" : "BLUR_CONTROLLER",
+      "label" : "Blur Controller Server",
+      "pluralLabel" : "Blur Controller Servers",
+      "startRunner" : {
+        "program" : "scripts/control.sh",
+        "args" : [ "start-controller" ],
+        "environmentVariables" : {
+            "BLUR_ZK_ROOT": "${blur_zookeeper_root}",
+            "BLUR_DEFAULT_TABLE_PATH": "/user/${user}/${blur_cluster_name}/tables",
+            "BLUR_COMMAND_PATH":"/user/${user}/${blur_cluster_name}/commands",
+            "BLUR_CLUSTER_NAME":"${blur_cluster_name}",
+            "BLUR_CONTROLLER_JVM_OPTIONS":"${blur_controller_jvm_options}"
+        }
+      },
+      "externalLink" : {
+      	"name":"blur_controller_ui",
+      	"label":"Blur Controller Status UI",
+      	"url":"http://${host}:${blur_gui_controller_port}"
+      },
+      "logging": {
+    	  "dir":"/var/log/blur",
+    	  "filename": "blur-controller-server-${host}.log",
+    	  "loggingType":"log4j"
+      },
+      "configWriter" : {
+      	"generators" : [
+      		{
+      			"filename" : "blur-site.properties",
+            	"configFormat" : "properties",
+            	"excludedParams": ["blur_controller_jvm_options"]
+      		}
+      	 ]
+      },
+	  "parameters": [
+	    {
+          "name":"blur_controller_jvm_options",
+          "label":"JVM Options for Controllers",
+          "description": "JAVA JVM OPTIONS for the controller servers, jvm tuning parameters
are placed here.",
+          "configName":"blur.controller.jvm.options",
+	      "required":"false",
+	      "type":"string",
+	      "default":"-Xmx1024m -Djava.net.preferIPv4Stack=true",
+	      "configurableInWizard":true
+      },
+|||Controller-Server-Properties|||
+                 ]
+   },
+   {
+	   "name" : "BLUR_SHARD",
+	   "label" : "Blur Shard Server",
+	   "pluralLabel" : "Blur Shard Servers",
+	   "startRunner" : {
+	     "program" : "scripts/control.sh",
+	     "args" : [ "start-shard" ],
+	     "environmentVariables" : {
+            "BLUR_ZK_ROOT": "${blur_zookeeper_root}",
+            "BLUR_DEFAULT_TABLE_PATH": "/user/${user}/${blur_cluster_name}/tables",
+            "BLUR_COMMAND_PATH":"/user/${user}/${blur_cluster_name}/commands",
+            "BLUR_CLUSTER_NAME":"${blur_cluster_name}",
+            "BLUR_SHARD_JVM_OPTIONS":"${blur_shard_jvm_options}"
+          }
+	    },
+      "additionalExternalLinks" : [{
+      	"name":"blur_shard_ui",
+      	"label":"Blur Shard Status UI",
+      	"url":"http://${host}:${blur_gui_shard_port}"
+      }],
+	     "logging": {
+	    	  "dir":"/var/log/blur",
+	    	  "filename": "blur-shard-server-${host}.log",
+	    	  "loggingType":"log4j"
+	     },
+      "configWriter" : {
+      	"generators" : [
+      		{
+      			"filename" : "blur-site.properties",
+            	"configFormat" : "properties",
+            	"excludedParams": ["blur_shard_jvm_options"]
+      		}
+      	 ]
+      },
+	     "parameters": [
+		    {
+	          "name":"blur_shard_jvm_options",
+	          "label":"JVM OPTIONS for Shards",
+	          "description": "JAVA JVM OPTIONS for the shard servers, jvm tuning parameters
are placed here.",
+	          "configName":"blur.shard.jvm.options",
+		      "required":"false",
+		      "type":"string",
+		      "default":"-Xmx1024m -Djava.net.preferIPv4Stack=true -XX:MaxDirectMemorySize=256m",
+		      "configurableInWizard":true
+	      	},
+|||Shard-Server-Properties|||
+                 ]
+	}   
+  ],
+  "parcel" : {
+  	"requiredTags": ["blurcontroller"],
+  	"optionalTags": ["blurcontroller", "blurshard", "blurconsole"]
+  },
+  "serviceDependencies" : [
+        {"name":"HDFS", "required":"true"},
+        {"name":"ZOOKEEPER", "required":"true"}
+   ]
+}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e5ae88af/cdh-csd/src/main/resources/scripts/control.sh
----------------------------------------------------------------------
diff --git a/cdh-csd/src/main/resources/scripts/control.sh b/cdh-csd/src/main/resources/scripts/control.sh
new file mode 100644
index 0000000..b5c18e6
--- /dev/null
+++ b/cdh-csd/src/main/resources/scripts/control.sh
@@ -0,0 +1,128 @@
+#!/bin/bash
+
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+: <<DOCUMENTATION
+ --------------------------------------------------------------------------
+|                 control.sh 
+ --------------------------------------------------------------------------
+Script used by CM to control services of Blur. This should mostly be 
+bridge
+ --------------------------------------------------------------------------
+DOCUMENTATION
+
+this="${BASH_SOURCE-$0}"
+bin=$(cd -P -- "$(dirname -- "$this")" && pwd -P)
+script="$(basename -- "$this")"
+this="$bin/$script"
+
+set -e
+set -u
+set -o pipefail
+
+IFS=$'\n\t'
+
+scratch=$(mktemp -d -t scratch.tmp.XXXXXXXXXX)
+
+function finish {
+  rm -rf "${scratch}"
+  # Your cleanup code here
+}
+trap finish EXIT
+
+#__args
+declare -A OPT_ARGS
+usage() { echo "Usage: $0 <action>" 1>&2; exit 1; }
+
+#__functions
+
+write_to_blur_site_props() {
+  prop="$1=$2"
+  echo -n "Adding property[$prop] to blur-site.properties..."
+  #For now, rely on last one in 
+  echo $prop >> $BLUR_SITE
+  echo " done."
+}
+
+setup_environment() {
+	blur_tmp_path="${CONF_DIR}/tmp"
+	blur_conf_dir="${CONF_DIR}"
+	
+	mkdir -p $blur_tmp_path
+	mkdir -p $blur_conf_dir
+	
+	#Wacky, yo!
+	chown blur:blur $blur_tmp_path
+	
+	BLUR_SITE=${blur_conf_dir}/blur-site.properties
+	
+#	cp ${BLUR_HOME}/conf/log* ${blur_conf_dir}/
+	
+	if [ -z "$BLUR_ZK_ROOT" ]; then
+	  echo "Rooting zookeeper at [${BLUR_ZK_ROOT}]"
+	fi
+	
+	write_to_blur_site_props blur.zookeeper.connection "$ZK_QUORUM/$BLUR_ZK_ROOT"
+		
+	DFS_PATH=$(hdfs getconf -confKey fs.defaultFS)
+	
+	#TODO: Should allow BLUR_DEFAULT_TABLE_PATH to be absolute to another cluster too.
+	write_to_blur_site_props "blur.cluster.${BLUR_CLUSTER_NAME}.table.uri" "$DFS_PATH/$BLUR_DEFAULT_TABLE_PATH"
+	write_to_blur_site_props blur.command.lib.path "$DFS_PATH/$BLUR_COMMAND_PATH"
+	
+	export BLUR_CONF_DIR=$blur_conf_dir
+	export BLUR_LOGS="/var/log/blur"
+	export HADOOP_CLASSPATH=$(hadoop classpath)
+}
+
+start_controller() {
+	setup_environment
+	exec $BLUR_HOME/bin/start-supervised-controller-server.sh
+}
+
+start_shard() {
+	setup_environment
+	exec $BLUR_HOME/bin/start-supervised-shard-server.sh
+}
+
+#__main
+action="$1"
+
+if [ "${action}" == "" ] ;then
+  usage
+fi
+
+echo "Executing [$action] with BLUR_HOME [$BLUR_HOME]"
+
+export BLUR_LOGS=${CONF_DIR}/logs
+
+case ${action} in
+  (start-controller)
+  	start_controller
+    ;;
+  (start-shard)
+  	start_shard
+    ;;    
+  (*)
+    echo "Unknown command[${action}]"
+    ;;
+esac
+
+
+
+
+
+

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e5ae88af/cdh-csd/src/test/java/org/apache/blur/doc/CreateCSDDescriptor.java
----------------------------------------------------------------------
diff --git a/cdh-csd/src/test/java/org/apache/blur/doc/CreateCSDDescriptor.java b/cdh-csd/src/test/java/org/apache/blur/doc/CreateCSDDescriptor.java
new file mode 100644
index 0000000..eacc7dc
--- /dev/null
+++ b/cdh-csd/src/test/java/org/apache/blur/doc/CreateCSDDescriptor.java
@@ -0,0 +1,97 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.blur.doc;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.blur.doc.BlurPropertyParser.BlurProp;
+
+public class CreateCSDDescriptor {
+
+  private static final String BLUR_VERSION = "|||BLUR-VERSION|||";
+
+  public static void main(String[] args) throws IOException {
+    BlurPropertyParser parser = new BlurPropertyParser();
+    Map<String, List<BlurProp>> props = parser.parse();
+    Map<String, StringBuffer> map = new HashMap<String, StringBuffer>();
+
+    JsonPropertyFormatter formatter = new JsonPropertyFormatter();
+
+    for (Map.Entry<String, List<BlurProp>> prop : props.entrySet()) {
+
+      StringBuffer buffer = map.get(prop.getKey());
+      if (buffer == null) {
+        buffer = new StringBuffer();
+        map.put(prop.getKey(), buffer);
+      }
+      boolean first = true;
+
+      for (BlurProp p : prop.getValue()) {
+        if (!first) {
+          buffer.append(formatter.separator());
+        }
+        buffer.append(formatter.format(p));
+        first = false;
+      }
+    }
+
+    String source = args[0];
+    String dest = args[1];
+    String blurVersion = args[2];
+
+    replaceValuesInFile(source, dest, map, formatVersion(blurVersion));
+  }
+
+  public static String formatVersion(String blurVersion) {
+    return blurVersion.replace("-", ".");
+  }
+
+  private static void replaceValuesInFile(String s, String o, Map<String, StringBuffer>
replacements, String blurVersion)
+      throws IOException {
+
+    File source = new File(s);
+    File output = new File(o);
+    output.getParentFile().mkdirs();
+    System.out.println("Source[" + source.getAbsolutePath() + "]");
+    System.out.println("Output[" + output.getAbsolutePath() + "]");
+    PrintWriter writer = new PrintWriter(output);
+
+    BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(source)));
+    String line;
+    while ((line = reader.readLine()) != null) {
+      StringBuffer newData = replacements.get(line.trim());
+      if (line.contains(BLUR_VERSION)) {
+        writer.println(line.replace(BLUR_VERSION, blurVersion));
+      } else if (newData != null) {
+        writer.println(newData.toString());
+      } else {
+        writer.println(line);
+      }
+    }
+    writer.close();
+    reader.close();
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e5ae88af/cdh-parcel/pom.xml
----------------------------------------------------------------------
diff --git a/cdh-parcel/pom.xml b/cdh-parcel/pom.xml
new file mode 100644
index 0000000..7a81826
--- /dev/null
+++ b/cdh-parcel/pom.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<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>
+		<groupId>org.apache.blur</groupId>
+		<artifactId>blur</artifactId>
+		<version>0.3.0.incubating</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+
+	<artifactId>cdh-parcel</artifactId>
+	<version>${projectVersion}</version>
+	<packaging>pom</packaging>
+	<name>CDH Parcel</name>
+	<description>The Blur cdh-parcel module builds a binary parcel artifact.</description>
+	<properties>
+		<parcel.name>BLUR</parcel.name>
+		<parcel.assembly.file>src/assemble/parcel-hadoop2.xml</parcel.assembly.file>
+	</properties>
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.blur</groupId>
+			<artifactId>blur-mapred</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.blur</groupId>
+			<artifactId>blur-shell</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.blur</groupId>
+			<artifactId>blur-command</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.blur</groupId>
+			<artifactId>blur-console</artifactId>
+			<version>${project.version}</version>
+			<classifier>webapp</classifier>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+				<plugin>
+					<artifactId>maven-assembly-plugin</artifactId>
+					<executions>
+						<execution>
+							<id>distro-assembly-parcel</id>
+							<phase>package</phase>
+							<goals>
+								<goal>single</goal>
+							</goals>
+							<configuration>
+								<descriptors>
+									<descriptor>${parcel.assembly.file}</descriptor>
+								</descriptors>
+								<finalName>${parcel.name}-${project.version}</finalName>
+								<appendAssemblyId>false</appendAssemblyId>
+								<ignoreDirFormatExtensions>false</ignoreDirFormatExtensions>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+		</plugins>
+	</build>
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e5ae88af/cdh-parcel/run_parcel_server.sh
----------------------------------------------------------------------
diff --git a/cdh-parcel/run_parcel_server.sh b/cdh-parcel/run_parcel_server.sh
new file mode 100755
index 0000000..08f17d7
--- /dev/null
+++ b/cdh-parcel/run_parcel_server.sh
@@ -0,0 +1,57 @@
+#!/bin/bash
+
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+PROJECT_DIR=`dirname "$0"`
+PROJECT_DIR=`cd "$PROJECT_DIR"; pwd`
+
+PARCEL_VERSION=`mvn help:evaluate -Dexpression=project.version | grep -Ev '(^\[|Download\w+:)'`
+echo "PARCEL_VERSION=${PARCEL_VERSION}"
+TARGET="${PROJECT_DIR}/target"
+
+PARCEL_NAME=`mvn help:evaluate -Dexpression=parcel.name | grep -Ev '(^\[|Download\w+:)'`
+
+LAST_UPDATED_SEC=`date +%s`
+LAST_UPDATED="${LAST_UPDATED_SEC}0000"
+
+PARCEL="${TARGET}/${PARCEL_NAME}-${PARCEL_VERSION}.tar.gz"
+PARCEL_SHA="${PARCEL}.sha"
+
+HTTP_DIR="${TARGET}/http"
+MANIFEST="${HTTP_DIR}/manifest.json"
+
+rm -r $HTTP_DIR
+mkdir $HTTP_DIR
+
+shasum $PARCEL | awk '{print $1}' > $PARCEL_SHA
+HASH=`cat $PARCEL_SHA`
+echo "{\"lastUpdated\":${LAST_UPDATED},\"parcels\": [" > $MANIFEST
+for DISTRO in el5 el6 sles11 lucid precise trusty squeeze wheezy
+do
+	if [ $DISTRO != "el5" ] ; then
+		echo "," >> $MANIFEST
+	fi
+	DISTRO_PARCEL="${PARCEL_NAME}-${PARCEL_VERSION}-${DISTRO}.parcel"
+	DISTRO_PARCEL_SHA="${PARCEL_NAME}-${PARCEL_VERSION}-${DISTRO}.parcel.sha"
+	ln $PARCEL "${HTTP_DIR}/${DISTRO_PARCEL}"
+	ln $PARCEL_SHA "${HTTP_DIR}/${DISTRO_PARCEL_SHA}"
+	echo "{\"parcelName\":\"${DISTRO_PARCEL}\",\"components\": [{\"name\" : \"${PARCEL_NAME}\",\"version\"
: \"${PARCEL_VERSION}\",\"pkg_version\": \"${PARCEL_VERSION}\"}],\"hash\":\"${HASH}\"}" >>
$MANIFEST
+done
+echo "]}" >> $MANIFEST
+cd ${HTTP_DIR}
+python -m SimpleHTTPServer
+
+

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e5ae88af/cdh-parcel/src/assemble/cdh/README.txt
----------------------------------------------------------------------
diff --git a/cdh-parcel/src/assemble/cdh/README.txt b/cdh-parcel/src/assemble/cdh/README.txt
new file mode 100644
index 0000000..588cbfa
--- /dev/null
+++ b/cdh-parcel/src/assemble/cdh/README.txt
@@ -0,0 +1,37 @@
+== Overview ==
+This provides some info on testing the CSD/Parcel packaging for Apache Blur.
+
+== CSD ==
+ sudo cp distribution/target/BLUR-0.2.4.jar /opt/cloudera/csd/BLUR-0.2.4.jar
+ sudo service cloudera-scm-server restart
+ 
+== Parcel ==
+Note that the '.tar.gz' extension is ripped off in the copy
+sudo cp distribution/target/blur-hadoop2-2.5.0-cdh5.2.0-0.2.4-incubating-SNAPSHOT-el6.parcel.tar.gz
/opt/cloudera/parcel-repo/blur-hadoop2-2.5.0-cdh5.2.0-0.2.4-incubating-SNAPSHOT-el6.parcel
+
+Then, in /opt/cloudera/parcel-repo:
+sha1sum blur-hadoop2-2.5.0-cdh5.2.0-0.2.4-incubating-SNAPSHOT-el6.parcel | awk '{print $1}'
> blur-hadoop2-2.5.0-cdh5.2.0-0.2.4-incubating-SNAPSHOT-el6.parcel.sha && cat blur-hadoop2-2.5.0-cdh5.2.0-0.2.4-incubating-SNAPSHOT-el6.parcel.sha
+
+... which will write the sha file and print it to the screen.  You can then copy that into
a manifest in the
+ same directory [/opt/cloudera/parcel-repo/manifest.json] and substitute it in the hash value,
which will look
+ like this:
+ 
+ 
+{
+  "lastUpdated":14286139390000,
+  "parcels": [
+    {
+      "parcelName":"blur-hadoop2-2.5.0-cdh5.2.0-0.2.4-incubating-SNAPSHOT-el6.parcel",
+      "components": [
+        {
+          "name" : "blur",
+          "version" : "0.2.4",
+          "pkg_version": "0.2.4"
+        }
+      ],
+      "hash":"632bd8d320f27ba68b9595f39ca2d99a203dd43c"
+    }
+  ]
+}
+ 
+Now you should be able to click the "Check for new parcels" in CM and begin activating it.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e5ae88af/cdh-parcel/src/assemble/cdh/parcel/meta/blur_parcel_env.sh
----------------------------------------------------------------------
diff --git a/cdh-parcel/src/assemble/cdh/parcel/meta/blur_parcel_env.sh b/cdh-parcel/src/assemble/cdh/parcel/meta/blur_parcel_env.sh
new file mode 100644
index 0000000..ff839e7
--- /dev/null
+++ b/cdh-parcel/src/assemble/cdh/parcel/meta/blur_parcel_env.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+export HADOOP_HOME=$CDH_HADOOP_HOME
+export BLUR_HOME=$PARCELS_ROOT/$PARCEL_DIRNAME
+
+source $COMMON_SCRIPT
+set_hadoop_classpath
+HCP=$(hadoop classpath)
+export HADOOP_CLASSPATH=$HADOOP_CLASSPATH:$HCP
+echo "***** PREFIX:"
+env
+echo "**** DONE."
+

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e5ae88af/cdh-parcel/src/assemble/cdh/parcel/meta/parcel.json
----------------------------------------------------------------------
diff --git a/cdh-parcel/src/assemble/cdh/parcel/meta/parcel.json b/cdh-parcel/src/assemble/cdh/parcel/meta/parcel.json
new file mode 100644
index 0000000..5daa82c
--- /dev/null
+++ b/cdh-parcel/src/assemble/cdh/parcel/meta/parcel.json
@@ -0,0 +1,40 @@
+{
+	"schema_version": 1,
+	"name": "BLUR",
+	"version" : "${projectVersion}",
+	"setActiveSymlink": true,
+	
+	"depends": "",
+	"replaces":"blur,BLUR",
+	"conflicts":"",
+	
+	"provides": [
+		"blurcontroller",
+		"blurshard"
+	],
+	
+	"scripts": {
+		"defines":"blur_parcel_env.sh"
+	},
+	
+	"components": [
+		{
+			"name" : "BLUR",
+			"version" : "${projectVersion}",
+			"pkg_version": "${projectVersion}"
+		}
+	],
+	
+	"packages" : [],
+	
+	"users":  {
+		"blur": {
+			"longname" : "Blur",
+			"home" : "/var/lib/blur",
+			"shell"	: "/bin/bash",
+			"extra_groups": []	
+		}	
+	},
+	"groups": []
+	
+}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e5ae88af/cdh-parcel/src/assemble/parcel-hadoop2.xml
----------------------------------------------------------------------
diff --git a/cdh-parcel/src/assemble/parcel-hadoop2.xml b/cdh-parcel/src/assemble/parcel-hadoop2.xml
new file mode 100644
index 0000000..4e9004f
--- /dev/null
+++ b/cdh-parcel/src/assemble/parcel-hadoop2.xml
@@ -0,0 +1,104 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+  <id>parcel</id>
+  <formats>
+  <format>dir</format>
+    <format>tar.gz</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  
+  <dependencySets>
+    <dependencySet>
+      <useProjectArtifact>false</useProjectArtifact>
+      <outputDirectory>${parcel.name}-${project.version}/lib</outputDirectory>
+      <unpack>false</unpack>
+      <includes>
+        <include>org.apache.blur:*</include>
+        <include>org.json:json</include>
+        <include>com.yammer.metrics:*</include>
+        <include>com.google.guava:guava</include>
+        <include>org.apache.httpcomponents:*</include>
+        <include>org.apache.lucene:*</include>
+        <include>com.spatial4j:spatial4j</include>
+        <include>commons-cli:commons-cli</include>
+        <include>org.eclipse.jetty:*</include>
+        <include>com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru</include>
+        <include>jline:jline</include>
+        <include>com.fasterxml.jackson.core:*</include>
+        <include>javax.servlet:*</include>        
+      </includes>
+    </dependencySet>
+  </dependencySets>
+
+  <fileSets>
+    <fileSet>
+      <directory>${project.parent.basedir}/scripts/conf</directory>
+      <outputDirectory>${parcel.name}-${project.version}/conf</outputDirectory>
+      <excludes>
+        <exclude>**/.empty</exclude>
+        <exclude>**/log4j*.xml</exclude>
+      </excludes>
+    </fileSet> 
+    <fileSet>
+      <directory>${project.parent.basedir}/scripts/bin</directory>
+      <outputDirectory>${parcel.name}-${project.version}/bin</outputDirectory>
+      <excludes>
+        <exclude>**/.empty</exclude>
+      </excludes>
+    </fileSet>       
+    <fileSet>
+      <directory>${project.basedir}/src/assemble/cdh/parcel/meta</directory>
+      <outputDirectory>${parcel.name}-${project.version}/meta</outputDirectory>
+      <excludes>
+        <exclude>**/.empty</exclude>
+        <exclude>**/parcel.json</exclude>
+      </excludes>
+    </fileSet>
+    <fileSet>
+      <directory>${project.parent.basedir}/</directory>
+      <outputDirectory>${parcel.name}-${project.version}/</outputDirectory>
+      <includes>
+        <include>DISCLAIMER</include>
+        <include>README</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+
+  <files>
+    <file>
+      <source>${project.basedir}/src/assemble/cdh/parcel/meta/parcel.json</source>
+      <outputDirectory>${parcel.name}-${project.version}/meta</outputDirectory>
+      <destName>parcel.json</destName>
+      <filtered>true</filtered>
+    </file>
+    <file>
+      <source>${project.basedir}/src/main/resources-hadoop2/NOTICE-bin.txt</source>
+      <outputDirectory>${parcel.name}-${project.version}</outputDirectory>
+      <destName>NOTICE</destName>
+    </file>
+    <file>
+      <source>${project.basedir}/src/main/resources-hadoop2/LICENSE-bin.txt</source>
+      <outputDirectory>${parcel.name}-${project.version}</outputDirectory>
+      <destName>LICENSE</destName>
+    </file>
+  </files>
+</assembly>


Mime
View raw message