incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [47/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:37 GMT
http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e5ae88af/distribution-bin/src/main/resources-hadoop2/notices/jetty-util-6.1.26.jar.src
----------------------------------------------------------------------
diff --git a/distribution-bin/src/main/resources-hadoop2/notices/jetty-util-6.1.26.jar.src b/distribution-bin/src/main/resources-hadoop2/notices/jetty-util-6.1.26.jar.src
new file mode 100644
index 0000000..21d4ed3
--- /dev/null
+++ b/distribution-bin/src/main/resources-hadoop2/notices/jetty-util-6.1.26.jar.src
@@ -0,0 +1,36 @@
+==============================================================
+ Jetty Web Container 
+ Copyright 1995-2009 Mort Bay Consulting Pty Ltd
+==============================================================
+
+The Jetty Web Container is Copyright Mort Bay Consulting Pty Ltd
+unless otherwise noted. It is licensed under the apache 2.0
+license.
+
+The javax.servlet package used by Jetty is copyright 
+Sun Microsystems, Inc and Apache Software Foundation. It is 
+distributed under the Common Development and Distribution License.
+You can obtain a copy of the license at 
+https://glassfish.dev.java.net/public/CDDLv1.0.html.
+
+The UnixCrypt.java code ~Implements the one way cryptography used by
+Unix systems for simple password protection.  Copyright 1996 Aki Yoshida,
+modified April 2001  by Iris Van den Broeke, Daniel Deville.
+Permission to use, copy, modify and distribute UnixCrypt 
+for non-commercial or commercial purposes and without fee is
+granted provided that the copyright notice appears in all copies.
+
+The default JSP implementation is provided by the Glassfish JSP engine
+from project Glassfish http://glassfish.dev.java.net.  Copyright 2005
+Sun Microsystems, Inc. and portions Copyright Apache Software Foundation.
+
+Some portions of the code are Copyright:
+  2006 Tim Vernum 
+  1999 Jason Gilbert.
+
+The jboss integration module contains some LGPL code.
+
+The win32 Java Service Wrapper (v3.2.3) is Copyright (c) 1999, 2006 
+Tanuki Software, Inc.  and 2001 Silver Egg Technology.  It is 
+covered by an open license which is viewable at
+http://svn.codehaus.org/jetty/jetty/branches/jetty-6.1/extras/win32service/LICENSE.txt

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e5ae88af/distribution-bin/src/main/resources-hadoop2/notices/metrics-core-2.2.0.jar.src
----------------------------------------------------------------------
diff --git a/distribution-bin/src/main/resources-hadoop2/notices/metrics-core-2.2.0.jar.src b/distribution-bin/src/main/resources-hadoop2/notices/metrics-core-2.2.0.jar.src
new file mode 100644
index 0000000..cc8767c
--- /dev/null
+++ b/distribution-bin/src/main/resources-hadoop2/notices/metrics-core-2.2.0.jar.src
@@ -0,0 +1,11 @@
+Metrics
+Copyright 2010-2013 Coda Hale and Yammer, Inc.
+
+This product includes software developed by Coda Hale and Yammer, Inc.
+
+This product includes code derived from the JSR-166 project (ThreadLocalRandom, Striped64,
+LongAdder), which was released with the following comments:
+
+    Written by Doug Lea with assistance from members of JCP JSR-166
+    Expert Group and released to the public domain, as explained at
+    http://creativecommons.org/publicdomain/zero/1.0/
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e5ae88af/distribution-bin/src/main/resources-hadoop2/notices/metrics-ganglia-2.2.0.jar.src
----------------------------------------------------------------------
diff --git a/distribution-bin/src/main/resources-hadoop2/notices/metrics-ganglia-2.2.0.jar.src b/distribution-bin/src/main/resources-hadoop2/notices/metrics-ganglia-2.2.0.jar.src
new file mode 100644
index 0000000..cc8767c
--- /dev/null
+++ b/distribution-bin/src/main/resources-hadoop2/notices/metrics-ganglia-2.2.0.jar.src
@@ -0,0 +1,11 @@
+Metrics
+Copyright 2010-2013 Coda Hale and Yammer, Inc.
+
+This product includes software developed by Coda Hale and Yammer, Inc.
+
+This product includes code derived from the JSR-166 project (ThreadLocalRandom, Striped64,
+LongAdder), which was released with the following comments:
+
+    Written by Doug Lea with assistance from members of JCP JSR-166
+    Expert Group and released to the public domain, as explained at
+    http://creativecommons.org/publicdomain/zero/1.0/
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e5ae88af/distribution-bin/src/main/resources-hadoop2/notices/metrics-graphite-2.2.0.jar.src
----------------------------------------------------------------------
diff --git a/distribution-bin/src/main/resources-hadoop2/notices/metrics-graphite-2.2.0.jar.src b/distribution-bin/src/main/resources-hadoop2/notices/metrics-graphite-2.2.0.jar.src
new file mode 100644
index 0000000..cc8767c
--- /dev/null
+++ b/distribution-bin/src/main/resources-hadoop2/notices/metrics-graphite-2.2.0.jar.src
@@ -0,0 +1,11 @@
+Metrics
+Copyright 2010-2013 Coda Hale and Yammer, Inc.
+
+This product includes software developed by Coda Hale and Yammer, Inc.
+
+This product includes code derived from the JSR-166 project (ThreadLocalRandom, Striped64,
+LongAdder), which was released with the following comments:
+
+    Written by Doug Lea with assistance from members of JCP JSR-166
+    Expert Group and released to the public domain, as explained at
+    http://creativecommons.org/publicdomain/zero/1.0/
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e5ae88af/distribution-bin/src/main/resources-hadoop2/notices/metrics-servlet-2.2.0.jar.src
----------------------------------------------------------------------
diff --git a/distribution-bin/src/main/resources-hadoop2/notices/metrics-servlet-2.2.0.jar.src b/distribution-bin/src/main/resources-hadoop2/notices/metrics-servlet-2.2.0.jar.src
new file mode 100644
index 0000000..cc8767c
--- /dev/null
+++ b/distribution-bin/src/main/resources-hadoop2/notices/metrics-servlet-2.2.0.jar.src
@@ -0,0 +1,11 @@
+Metrics
+Copyright 2010-2013 Coda Hale and Yammer, Inc.
+
+This product includes software developed by Coda Hale and Yammer, Inc.
+
+This product includes code derived from the JSR-166 project (ThreadLocalRandom, Striped64,
+LongAdder), which was released with the following comments:
+
+    Written by Doug Lea with assistance from members of JCP JSR-166
+    Expert Group and released to the public domain, as explained at
+    http://creativecommons.org/publicdomain/zero/1.0/
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e5ae88af/distribution-bin/src/main/resources-hadoop2/notices/oro-2.0.8.jar.src
----------------------------------------------------------------------
diff --git a/distribution-bin/src/main/resources-hadoop2/notices/oro-2.0.8.jar.src b/distribution-bin/src/main/resources-hadoop2/notices/oro-2.0.8.jar.src
new file mode 100644
index 0000000..e69de29

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e5ae88af/distribution-bin/src/main/resources-hadoop2/notices/snappy-java-1.0.4.1.jar.src
----------------------------------------------------------------------
diff --git a/distribution-bin/src/main/resources-hadoop2/notices/snappy-java-1.0.4.1.jar.src b/distribution-bin/src/main/resources-hadoop2/notices/snappy-java-1.0.4.1.jar.src
new file mode 100644
index 0000000..1930170
--- /dev/null
+++ b/distribution-bin/src/main/resources-hadoop2/notices/snappy-java-1.0.4.1.jar.src
@@ -0,0 +1,16 @@
+This product includes software developed by Google
+ Snappy: http://code.google.com/p/snappy/ (New BSD License)
+
+This product includes software developed by Apache
+ PureJavaCrc32C from apache-hadoop-common http://hadoop.apache.org/
+ (Apache 2.0 license)
+
+This library containd statically linked libstdc++. This inclusion is allowed by 
+"GCC RUntime Library Exception" 
+http://gcc.gnu.org/onlinedocs/libstdc++/manual/license.html
+
+== Contributors ==
+  * Tatu Saloranta  
+    * Providing benchmark suite
+  * Alec Wysoker
+    * Performance and memory usage improvement

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e5ae88af/distribution-bin/src/main/resources-hadoop2/notices/spatial4j-0.3.jar.src
----------------------------------------------------------------------
diff --git a/distribution-bin/src/main/resources-hadoop2/notices/spatial4j-0.3.jar.src b/distribution-bin/src/main/resources-hadoop2/notices/spatial4j-0.3.jar.src
new file mode 100644
index 0000000..e69de29

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e5ae88af/distribution-bin/src/main/resources-hadoop2/notices/zookeeper-3.4.5.jar.src
----------------------------------------------------------------------
diff --git a/distribution-bin/src/main/resources-hadoop2/notices/zookeeper-3.4.5.jar.src b/distribution-bin/src/main/resources-hadoop2/notices/zookeeper-3.4.5.jar.src
new file mode 100644
index 0000000..d9e0a49
--- /dev/null
+++ b/distribution-bin/src/main/resources-hadoop2/notices/zookeeper-3.4.5.jar.src
@@ -0,0 +1,5 @@
+Apache ZooKeeper
+Copyright 2009 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e5ae88af/distribution-src/pom.xml
----------------------------------------------------------------------
diff --git a/distribution-src/pom.xml b/distribution-src/pom.xml
new file mode 100644
index 0000000..31fd72e
--- /dev/null
+++ b/distribution-src/pom.xml
@@ -0,0 +1,82 @@
+<?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>distribution-src</artifactId>
+	<version>${projectVersion}</version>
+	<packaging>pom</packaging>
+	<name>Distribution Src</name>
+	<description>The Blur distribution-src module builds the source artifact.</description>
+
+	<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-src</id>
+							<phase>package</phase>
+							<goals>
+								<goal>single</goal>
+							</goals>
+							<configuration>
+								<finalName>apache-blur-${project.parent.version}</finalName>
+								<descriptors>
+									<descriptor>src/assemble/src.xml</descriptor>
+								</descriptors>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+		</plugins>
+	</build>
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e5ae88af/distribution-src/src/assemble/src.xml
----------------------------------------------------------------------
diff --git a/distribution-src/src/assemble/src.xml b/distribution-src/src/assemble/src.xml
new file mode 100644
index 0000000..c7479d4
--- /dev/null
+++ b/distribution-src/src/assemble/src.xml
@@ -0,0 +1,40 @@
+<!--
+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>src</id>
+  <formats>
+    <format>tar.gz</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>${project.parent.basedir}</directory>
+      <outputDirectory>apache-blur-${projectVersion}-src</outputDirectory>
+      <excludes>
+        <exclude>**/.empty</exclude>
+        <exclude>**/target/**</exclude>
+	<exclude>**/node_modules/**</exclude>
+	<exclude>**/contrib/blur-console/src/main/webapp/libs/**</exclude>
+      </excludes>
+    </fileSet>
+  </fileSets>  
+</assembly>
+

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e5ae88af/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/pom.xml b/distribution/pom.xml
deleted file mode 100644
index 104bbcd..0000000
--- a/distribution/pom.xml
+++ /dev/null
@@ -1,270 +0,0 @@
-<?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.2.4-incubating-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
-
-	<artifactId>apache-blur</artifactId>
-	<version>${projectVersion}</version>
-	<packaging>pom</packaging>
-	<name>Distribution</name>
-	<description>The Blur distribution module builds the source and binary artifacts.</description>
-
-	<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>
-				<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>
-							<mainClass>org.apache.blur.doc.CreateCSDDescriptor</mainClass>
-							<arguments>
-								<argument>${project.build.scriptSourceDirectory}/../../assemble/cdh/csd/descriptor/service.sdl.template</argument>
-								<argument>${project.build.directory}/service.sdl</argument>
-								<argument>${project.version}</argument>
-							</arguments>
-						</configuration>
-					</execution>
-					<execution>
-						<id>create-parcel-json</id>
-						<phase>package</phase>
-						<goals>
-							<goal>java</goal>
-						</goals>
-						<configuration>
-							<mainClass>org.apache.blur.doc.ParcelJsonTemplate</mainClass>
-							<arguments>
-								<argument>${project.build.scriptSourceDirectory}/../../assemble/cdh/parcel/meta/parcel.json.template</argument>
-								<argument>${project.build.directory}/parcel.json</argument>
-								<argument>${project.version}</argument>
-							</arguments>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-	<profiles>
-		<profile>
-			<id>hadoop1</id>
-			<activation>
-				<property>
-					<name>hadoop1</name>
-				</property>
-			</activation>
-			<properties>
-				<bin.assembly.file>src/assemble/bin-hadoop1.xml</bin.assembly.file>
-			</properties>
-			<build>
-				<plugins>
-					<plugin>
-						<artifactId>maven-assembly-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>distro-assembly-src</id>
-								<phase>package</phase>
-								<goals>
-									<goal>single</goal>
-								</goals>
-								<configuration>
-									<finalName>apache-blur-${project.parent.version}</finalName>
-									<descriptors>
-										<descriptor>src/assemble/src.xml</descriptor>
-									</descriptors>
-								</configuration>
-							</execution>
-							<execution>
-								<id>distro-assembly-bin</id>
-								<phase>package</phase>
-								<goals>
-									<goal>single</goal>
-								</goals>
-								<configuration>
-									<descriptors>
-										<descriptor>${bin.assembly.file}</descriptor>
-									</descriptors>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-		<profile>
-			<id>hadoop2-mr1</id>
-			<activation>
-				<property>
-					<name>hadoop2-mr1</name>
-				</property>
-			</activation>
-			<properties>
-				<bin.assembly.file>src/assemble/bin-hadoop2.xml</bin.assembly.file>
-			</properties>
-			<build>
-				<plugins>
-					<plugin>
-						<artifactId>maven-assembly-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>distro-assembly-src</id>
-								<phase>package</phase>
-								<goals>
-									<goal>single</goal>
-								</goals>
-								<configuration>
-									<finalName>apache-blur-${project.parent.version}</finalName>
-									<descriptors>
-										<descriptor>src/assemble/src.xml</descriptor>
-									</descriptors>
-								</configuration>
-							</execution>
-							<execution>
-								<id>distro-assembly-bin</id>
-								<phase>package</phase>
-								<goals>
-									<goal>single</goal>
-								</goals>
-								<configuration>
-									<descriptors>
-										<descriptor>${bin.assembly.file}</descriptor>
-									</descriptors>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-		<profile>
-			<id>hadoop2</id>
-			<activation>
-				<property>
-					<name>hadoop2</name>
-				</property>
-			</activation>
-			<properties>
-				<bin.assembly.file>src/assemble/bin-hadoop2.xml</bin.assembly.file>
-				<csd.assembly.file>src/assemble/csd-hadoop2.xml</csd.assembly.file>
-				<parcel.assembly.file>src/assemble/parcel-hadoop2.xml</parcel.assembly.file>
-			</properties>
-			<build>
-				<plugins>
-					<plugin>
-						<artifactId>maven-assembly-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>distro-assembly-src</id>
-								<phase>package</phase>
-								<goals>
-									<goal>single</goal>
-								</goals>
-								<configuration>
-									<finalName>apache-blur-${project.parent.version}</finalName>
-									<descriptors>
-										<descriptor>src/assemble/src.xml</descriptor>
-									</descriptors>
-								</configuration>
-							</execution>
-							<execution>
-								<id>distro-assembly-bin</id>
-								<phase>package</phase>
-								<goals>
-									<goal>single</goal>
-								</goals>
-								<configuration>
-									<descriptors>
-										<descriptor>${bin.assembly.file}</descriptor>
-									</descriptors>
-								</configuration>
-							</execution>
-							<execution>
-								<id>distro-assembly-parcel</id>
-								<phase>package</phase>
-								<goals>
-									<goal>single</goal>
-								</goals>
-								<configuration>
-									<descriptors>
-										<descriptor>${parcel.assembly.file}</descriptor>
-									</descriptors>
-									<finalName>blur-${project.version}.parcel</finalName>
-									<appendAssemblyId>false</appendAssemblyId>
-									<ignoreDirFormatExtensions>false</ignoreDirFormatExtensions>
-								</configuration>
-							</execution>
-							<execution>
-								<id>distro-assembly-csd</id>
-								<phase>package</phase>
-								<goals>
-									<goal>single</goal>
-								</goals>
-								<configuration>
-									<descriptors>
-										<descriptor>${csd.assembly.file}</descriptor>
-									</descriptors>
-									<finalName>BLUR-${project.version}</finalName>
-									<appendAssemblyId>false</appendAssemblyId>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e5ae88af/distribution/run_parcel_server.sh
----------------------------------------------------------------------
diff --git a/distribution/run_parcel_server.sh b/distribution/run_parcel_server.sh
deleted file mode 100755
index 1cec125..0000000
--- a/distribution/run_parcel_server.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/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`
-
-BLUR_VERSION=`mvn help:evaluate -Dexpression=project.version -Dhadoop2 | grep -Ev '(^\[|Download\w+:)'`
-echo "BLUR_VERSION=${BLUR_VERSION}"
-TARGET="${PROJECT_DIR}/target"
-
-LAST_UPDATED_SEC=`date +%s`
-LAST_UPDATED="${LAST_UPDATED_SEC}0000"
-
-PARCEL="${TARGET}/blur-${BLUR_VERSION}.parcel.tar.gz"
-PARCEL_SHA="${PARCEL}.sha"
-BLUR_CSD="${TARGET}/BLUR-${BLUR_VERSION}.jar"
-
-HTTP_DIR="${TARGET}/http"
-MANIFEST="${HTTP_DIR}/manifest.json"
-
-rm -r $HTTP_DIR
-mkdir $HTTP_DIR
-
-sha1sum $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="blur-${BLUR_VERSION}-${DISTRO}.parcel"
-	DISTRO_PARCEL_SHA="blur-${BLUR_VERSION}-${DISTRO}.parcel.sha"
-	ln $PARCEL "${HTTP_DIR}/${DISTRO_PARCEL}"
-	ln $PARCEL_SHA "${HTTP_DIR}/${DISTRO_PARCEL_SHA}"
-	echo "{\"parcelName\":\"${DISTRO_PARCEL}\",\"components\": [{\"name\" : \"blur\",\"version\" : \"${BLUR_VERSION}\",\"pkg_version\": \"${BLUR_VERSION}\"}],\"hash\":\"${HASH}\"}" >> $MANIFEST
-done
-echo "]}" >> $MANIFEST
-CSD_BLUR_VERSION=`echo ${BLUR_VERSION} | tr - .`
-ln $BLUR_CSD "${HTTP_DIR}/BLUR-${CSD_BLUR_VERSION}.jar"
-cd ${HTTP_DIR}
-python -m SimpleHTTPServer
-
-

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e5ae88af/distribution/src/assemble/bin-hadoop1.xml
----------------------------------------------------------------------
diff --git a/distribution/src/assemble/bin-hadoop1.xml b/distribution/src/assemble/bin-hadoop1.xml
deleted file mode 100644
index 7fd3d15..0000000
--- a/distribution/src/assemble/bin-hadoop1.xml
+++ /dev/null
@@ -1,143 +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.
--->
-<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>bin</id>
-  <formats>
-    <format>tar.gz</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-
-  <dependencySets>
-    <dependencySet>
-      <useProjectArtifact>false</useProjectArtifact>
-      <outputDirectory>apache-blur-${project.version}-bin/lib</outputDirectory>
-      <unpack>false</unpack>
-      <includes>
-        <include>org.apache.blur:*</include>
-        <include>org.apache.zookeeper:zookeeper</include>
-        <include>org.slf4j:slf4j-api</include>
-        <include>org.slf4j:slf4j-log4j12</include>
-        <include>org.json:json</include>
-        <include>log4j:log4j</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>com.github.amccurry:lucene-document-security</include>
-      </includes>
-    </dependencySet>
-    <dependencySet>
-      <useProjectArtifact>false</useProjectArtifact>
-      <outputDirectory>apache-blur-${project.version}-bin/lib/hadoop-${hadoop.version}</outputDirectory>
-      <unpack>false</unpack>
-      <includes>
-        <include>org.apache.hadoop:*</include>
-      </includes>
-    </dependencySet>
-    <dependencySet>
-      <useProjectArtifact>false</useProjectArtifact>
-      <outputDirectory>apache-blur-${project.version}-bin/lib/hadoop-${hadoop.version}/lib</outputDirectory>
-      <unpack>false</unpack>
-      <excludes>
-        <exclude>org.apache.blur:*</exclude>
-
-        <!-- No need to package eclipse stuff in there -->
-        <exclude>org.eclipse.jdt:core</exclude>
-
-        <!-- Removing dup -->
-        <exclude>org.apache.hadoop:*</exclude>
-
-        <exclude>org.apache.zookeeper:zookeeper</exclude>
-        <exclude>org.slf4j:slf4j-api</exclude>
-        <exclude>org.slf4j:slf4j-log4j12</exclude>
-        <exclude>org.json:json</exclude>
-        <exclude>log4j:log4j</exclude>
-        <exclude>com.yammer.metrics:*</exclude>
-        <exclude>com.google.guava:guava</exclude>
-        <exclude>org.apache.httpcomponents:*</exclude>
-        <exclude>org.apache.lucene:*</exclude>
-        <exclude>com.spatial4j:spatial4j</exclude>
-        <exclude>commons-cli:commons-cli</exclude>
-        <exclude>com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru</exclude>
-        <exclude>jline:jline</exclude>
-        <exclude>com.fasterxml.jackson.core:*</exclude>
-        <exclude>org.apache.commons:commons-collections4</exclude>
-        <exclude>org.eclipse.jetty:*</exclude>
-      </excludes>
-    </dependencySet>
-  </dependencySets>
-
-  <fileSets>
-      <!--
-         Adds startup scripts to the root directory of zip package. The startup
-         scripts are located to src/main/scripts directory as stated by Maven
-         conventions.
-     -->
-    <fileSet>
-      <directory>${project.build.scriptSourceDirectory}</directory>
-      <outputDirectory>apache-blur-${project.version}-bin</outputDirectory>
-      <excludes>
-        <exclude>**/.empty</exclude>
-      </excludes>
-    </fileSet>
-    <fileSet>
-      <directory>${project.build.scriptSourceDirectory}/../../../../docs</directory>
-      <outputDirectory>apache-blur-${project.version}-bin/docs</outputDirectory>
-      <excludes>
-        <exclude>**/.empty</exclude>
-      </excludes>
-    </fileSet>
-    <fileSet>
-      <directory>${project.build.scriptSourceDirectory}/../../../../target/staging</directory>
-      <outputDirectory>apache-blur-${project.version}-bin/docs/site</outputDirectory>
-      <excludes>
-        <exclude>**/.empty</exclude>
-      </excludes>
-    </fileSet>
-    <fileSet>
-      <directory>${project.build.scriptSourceDirectory}/../../../../</directory>
-      <outputDirectory>apache-blur-${project.version}-bin/</outputDirectory>
-      <includes>
-        <include>DISCLAIMER</include>
-        <include>README</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-
-  <files>
-    <file>
-      <source>${project.build.scriptSourceDirectory}/../resources-hadoop1/NOTICE-bin.txt</source>
-      <outputDirectory>apache-blur-${project.version}-bin</outputDirectory>
-      <destName>NOTICE</destName>
-    </file>
-    <file>
-      <source>${project.build.scriptSourceDirectory}/../resources-hadoop1/LICENSE-bin.txt</source>
-      <outputDirectory>apache-blur-${project.version}-bin</outputDirectory>
-      <destName>LICENSE</destName>
-    </file>
-  </files>
-</assembly>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e5ae88af/distribution/src/assemble/bin-hadoop2.xml
----------------------------------------------------------------------
diff --git a/distribution/src/assemble/bin-hadoop2.xml b/distribution/src/assemble/bin-hadoop2.xml
deleted file mode 100644
index 0ca85d9..0000000
--- a/distribution/src/assemble/bin-hadoop2.xml
+++ /dev/null
@@ -1,144 +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.
--->
-<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>bin</id>
-  <formats>
-    <format>tar.gz</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-
-  <dependencySets>
-    <dependencySet>
-      <useProjectArtifact>false</useProjectArtifact>
-      <outputDirectory>apache-blur-${project.version}-bin/lib</outputDirectory>
-      <unpack>false</unpack>
-      <includes>
-        <include>org.apache.blur:*</include>
-
-        <include>org.apache.zookeeper:zookeeper</include>
-        <include>org.slf4j:slf4j-api</include>
-        <include>org.slf4j:slf4j-log4j12</include>
-        <include>org.json:json</include>
-        <include>log4j:log4j</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>com.github.amccurry:lucene-document-security</include>
-      </includes>
-    </dependencySet>
-    <dependencySet>
-      <useProjectArtifact>false</useProjectArtifact>
-      <outputDirectory>apache-blur-${project.version}-bin/lib/hadoop-${hadoop.version}</outputDirectory>
-      <unpack>false</unpack>
-      <includes>
-        <include>org.apache.hadoop:*</include>
-      </includes>
-    </dependencySet>
-    <dependencySet>
-      <useProjectArtifact>false</useProjectArtifact>
-      <outputDirectory>apache-blur-${project.version}-bin/lib/hadoop-${hadoop.version}/lib</outputDirectory>
-      <unpack>false</unpack>
-      <excludes>
-        <exclude>org.apache.blur:*</exclude>
-
-        <!-- No need to package eclipse stuff in there -->
-        <exclude>org.eclipse.jdt:core</exclude>
-
-        <!-- Removing dup -->
-        <exclude>org.apache.hadoop:*</exclude>
-
-        <exclude>org.apache.zookeeper:zookeeper</exclude>
-        <exclude>org.slf4j:slf4j-api</exclude>
-        <exclude>org.slf4j:slf4j-log4j12</exclude>
-        <exclude>org.json:json</exclude>
-        <exclude>log4j:log4j</exclude>
-        <exclude>com.yammer.metrics:*</exclude>
-        <exclude>com.google.guava:guava</exclude>
-        <exclude>org.apache.httpcomponents:*</exclude>
-        <exclude>org.apache.lucene:*</exclude>
-        <exclude>com.spatial4j:spatial4j</exclude>
-        <exclude>commons-cli:commons-cli</exclude>
-        <exclude>com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru</exclude>
-        <exclude>jline:jline</exclude>
-        <exclude>com.fasterxml.jackson.core:*</exclude>
-        <exclude>org.apache.commons:commons-collections4</exclude>
-        <exclude>org.eclipse.jetty:*</exclude>
-      </excludes>
-    </dependencySet>
-  </dependencySets>
-
-  <fileSets>
-      <!--
-         Adds startup scripts to the root directory of zip package. The startup
-         scripts are located to src/main/scripts directory as stated by Maven
-         conventions.
-     -->
-    <fileSet>
-      <directory>${project.build.scriptSourceDirectory}</directory>
-      <outputDirectory>apache-blur-${project.version}-bin</outputDirectory>
-      <excludes>
-        <exclude>**/.empty</exclude>
-      </excludes>
-    </fileSet>
-    <fileSet>
-      <directory>${project.build.scriptSourceDirectory}/../../../../docs</directory>
-      <outputDirectory>apache-blur-${project.version}-bin/docs</outputDirectory>
-      <excludes>
-        <exclude>**/.empty</exclude>
-      </excludes>
-    </fileSet>
-    <fileSet>
-      <directory>${project.build.scriptSourceDirectory}/../../../../target/staging</directory>
-      <outputDirectory>apache-blur-${project.version}-bin/docs/site</outputDirectory>
-      <excludes>
-        <exclude>**/.empty</exclude>
-      </excludes>
-    </fileSet>
-    <fileSet>
-      <directory>${project.build.scriptSourceDirectory}/../../../../</directory>
-      <outputDirectory>apache-blur-${project.version}-bin/</outputDirectory>
-      <includes>
-        <include>DISCLAIMER</include>
-        <include>README</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-
-  <files>
-    <file>
-      <source>${project.build.scriptSourceDirectory}/../resources-hadoop2/NOTICE-bin.txt</source>
-      <outputDirectory>apache-blur-${project.version}-bin</outputDirectory>
-      <destName>NOTICE</destName>
-    </file>
-    <file>
-      <source>${project.build.scriptSourceDirectory}/../resources-hadoop2/LICENSE-bin.txt</source>
-      <outputDirectory>apache-blur-${project.version}-bin</outputDirectory>
-      <destName>LICENSE</destName>
-    </file>
-  </files>
-</assembly>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e5ae88af/distribution/src/assemble/cdh/README.txt
----------------------------------------------------------------------
diff --git a/distribution/src/assemble/cdh/README.txt b/distribution/src/assemble/cdh/README.txt
deleted file mode 100644
index 588cbfa..0000000
--- a/distribution/src/assemble/cdh/README.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-== 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/distribution/src/assemble/cdh/csd/descriptor/service.sdl.template
----------------------------------------------------------------------
diff --git a/distribution/src/assemble/cdh/csd/descriptor/service.sdl.template b/distribution/src/assemble/cdh/csd/descriptor/service.sdl.template
deleted file mode 100644
index af96568..0000000
--- a/distribution/src/assemble/cdh/csd/descriptor/service.sdl.template
+++ /dev/null
@@ -1,170 +0,0 @@
-{
-  "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/distribution/src/assemble/cdh/csd/scripts/control.sh
----------------------------------------------------------------------
diff --git a/distribution/src/assemble/cdh/csd/scripts/control.sh b/distribution/src/assemble/cdh/csd/scripts/control.sh
deleted file mode 100644
index b5c18e6..0000000
--- a/distribution/src/assemble/cdh/csd/scripts/control.sh
+++ /dev/null
@@ -1,128 +0,0 @@
-#!/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/distribution/src/assemble/cdh/parcel/meta/blur_parcel_env.sh
----------------------------------------------------------------------
diff --git a/distribution/src/assemble/cdh/parcel/meta/blur_parcel_env.sh b/distribution/src/assemble/cdh/parcel/meta/blur_parcel_env.sh
deleted file mode 100644
index ff839e7..0000000
--- a/distribution/src/assemble/cdh/parcel/meta/blur_parcel_env.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/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/distribution/src/assemble/cdh/parcel/meta/parcel.json.template
----------------------------------------------------------------------
diff --git a/distribution/src/assemble/cdh/parcel/meta/parcel.json.template b/distribution/src/assemble/cdh/parcel/meta/parcel.json.template
deleted file mode 100644
index 67ae8f2..0000000
--- a/distribution/src/assemble/cdh/parcel/meta/parcel.json.template
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-	"schema_version": 1,
-	"name": "blur",
-	"version" : "|||BLUR-VERSION|||",
-	"setActiveSymlink": true,
-	
-	"depends": "",
-	"replaces":"blur",
-	"conflicts":"",
-	
-	"provides": [
-		"blurcontroller",
-		"blurshard",
-		"blurconsole"
-	],
-	
-	"scripts": {
-		"defines":"blur_parcel_env.sh"
-	},
-	
-	"components": [
-		{
-			"name" : "blur",
-			"version" : "|||BLUR-VERSION|||",
-			"pkg_version": "|||BLUR-VERSION|||"
-		}
-	],
-	
-	"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/distribution/src/assemble/csd-hadoop2.xml
----------------------------------------------------------------------
diff --git a/distribution/src/assemble/csd-hadoop2.xml b/distribution/src/assemble/csd-hadoop2.xml
deleted file mode 100644
index 13e638e..0000000
--- a/distribution/src/assemble/csd-hadoop2.xml
+++ /dev/null
@@ -1,55 +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.
--->
-<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.build.scriptSourceDirectory}/../../assemble/cdh/csd/scripts</directory>
-      <outputDirectory>scripts</outputDirectory>
-      <excludes>
-        <exclude>**/.empty</exclude>
-      </excludes>
-    </fileSet>
-  </fileSets>
-
-  <files>
-    <file>
-      <source>${project.build.directory}/service.sdl</source>
-      <outputDirectory>descriptor</outputDirectory>
-      <destName>service.sdl</destName>
-    </file>  
-    <file>
-      <source>${project.build.scriptSourceDirectory}/../resources-hadoop2/NOTICE-bin.txt</source>
-      <outputDirectory></outputDirectory>
-      <destName>NOTICE</destName>
-    </file>
-    <file>
-      <source>${project.build.scriptSourceDirectory}/../resources-hadoop2/LICENSE-bin.txt</source>
-      <outputDirectory></outputDirectory>
-      <destName>LICENSE</destName>
-    </file>
-  </files>
-</assembly>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e5ae88af/distribution/src/assemble/parcel-hadoop2.xml
----------------------------------------------------------------------
diff --git a/distribution/src/assemble/parcel-hadoop2.xml b/distribution/src/assemble/parcel-hadoop2.xml
deleted file mode 100644
index 50a290b..0000000
--- a/distribution/src/assemble/parcel-hadoop2.xml
+++ /dev/null
@@ -1,103 +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.
--->
-<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>tar.gz</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  
-  <dependencySets>
-    <dependencySet>
-      <useProjectArtifact>false</useProjectArtifact>
-      <outputDirectory>blur-${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.build.scriptSourceDirectory}/conf</directory>
-      <outputDirectory>blur-${project.version}/conf</outputDirectory>
-      <excludes>
-        <exclude>**/.empty</exclude>
-        <exclude>**/log4j*.xml</exclude>
-      </excludes>
-    </fileSet> 
-    <fileSet>
-      <directory>${project.build.scriptSourceDirectory}/bin</directory>
-      <outputDirectory>blur-${project.version}/bin</outputDirectory>
-      <excludes>
-        <exclude>**/.empty</exclude>
-      </excludes>
-    </fileSet>       
-    <fileSet>
-      <directory>${project.build.scriptSourceDirectory}/../../assemble/cdh/parcel/meta</directory>
-      <outputDirectory>blur-${project.version}/meta</outputDirectory>
-      <excludes>
-        <exclude>**/.empty</exclude>
-        <exclude>**/parcel.json.template</exclude>
-      </excludes>
-    </fileSet>
-    <fileSet>
-      <directory>${project.build.scriptSourceDirectory}/../../../../</directory>
-      <outputDirectory>blur-${project.version}/</outputDirectory>
-      <includes>
-        <include>DISCLAIMER</include>
-        <include>README</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-
-  <files>
-    <file>
-      <source>${project.build.directory}/parcel.json</source>
-      <outputDirectory>blur-${project.version}/meta</outputDirectory>
-      <destName>parcel.json</destName>
-    </file>
-    <file>
-      <source>${project.build.scriptSourceDirectory}/../resources-hadoop2/NOTICE-bin.txt</source>
-      <outputDirectory>blur-${project.version}</outputDirectory>
-      <destName>NOTICE</destName>
-    </file>
-    <file>
-      <source>${project.build.scriptSourceDirectory}/../resources-hadoop2/LICENSE-bin.txt</source>
-      <outputDirectory>blur-${project.version}</outputDirectory>
-      <destName>LICENSE</destName>
-    </file>
-  </files>
-</assembly>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/e5ae88af/distribution/src/assemble/src.xml
----------------------------------------------------------------------
diff --git a/distribution/src/assemble/src.xml b/distribution/src/assemble/src.xml
deleted file mode 100644
index a94f787..0000000
--- a/distribution/src/assemble/src.xml
+++ /dev/null
@@ -1,52 +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.
--->
-<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>src</id>
-  <formats>
-    <format>tar.gz</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <fileSets>
-    <fileSet>
-      <directory>${project.parent.basedir}</directory>
-      <outputDirectory>apache-blur-${project.parent.version}-src</outputDirectory>
-      <excludes>
-        <exclude>**/.empty</exclude>
-        <exclude>**/target/**</exclude>
-	<exclude>**/node_modules/**</exclude>
-	<exclude>**/contrib/blur-console/src/main/webapp/libs/**</exclude>
-      </excludes>
-    </fileSet>
-  </fileSets>
-  <!--files>
-    <file>
-      <source>src/main/resources/NOTICE-src.txt</source>
-      <outputDirectory>apache-blur-${project.version}-src</outputDirectory>
-      <destName>NOTICE</destName>
-    </file>
-    <file>
-      <source>src/main/resources/LICENSE-src.txt</source>
-      <outputDirectory>apache-blur-${project.version}-src</outputDirectory>
-      <destName>LICENSE</destName>
-    </file>
-  </files-->    
-</assembly>
-


Mime
View raw message