asterixdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mb...@apache.org
Subject [34/35] asterixdb git commit: AsterixDB Rat Execution Audit & Fixes
Date Wed, 29 Mar 2017 02:37:15 GMT
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/82464fb4/asterixdb/asterix-app/pom.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/pom.xml b/asterixdb/asterix-app/pom.xml
index 70312e2..0975118 100644
--- a/asterixdb/asterix-app/pom.xml
+++ b/asterixdb/asterix-app/pom.xml
@@ -82,25 +82,6 @@
         <artifactId>maven-resources-plugin</artifactId>
         <executions>
           <execution>
-            <id>copy-external-library</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>src/test/resources/externallib</outputDirectory>
-              <overwrite>true</overwrite>
-              <resources>
-                <resource>
-                  <directory>../asterix-external-data/target</directory>
-                  <includes>
-                    <include>testlib-zip-binary-assembly.zip</include>
-                  </includes>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-          <execution>
             <id>copy-external-data-resources</id>
             <phase>generate-resources</phase>
             <goals>
@@ -113,7 +94,7 @@
                 <resource>
                   <directory>../asterix-external-data/src/test/resources</directory>
                   <includes>
-                    <include>beer.csv</include>
+                    <include>openbeerdb/beer.csv</include>
                     <include>change_feed.csv</include>
                   </includes>
                 </resource>
@@ -148,6 +129,21 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-external-testlib</id>
+            <phase>pre-integration-test</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <includeClassifiers>testlib</includeClassifiers>
+              <outputDirectory>target/data/externallib</outputDirectory>
+              <overwrite>true</overwrite>
+              <stripVersion>true</stripVersion>
+            </configuration>
+          </execution>
+        </executions>
         <configuration>
           <ignoredUsedUndeclaredDependencies combine.children="append">
             <ignoredUsedUndeclaredDependency>commons-logging:commons-logging-api:*</ignoredUsedUndeclaredDependency>
@@ -157,8 +153,84 @@
             <usedDependency>org.apache.hadoop:hadoop-common</usedDependency>
             <usedDependency>org.apache.asterix:asterix-external-data</usedDependency>
           </usedDependencies>
+          <ignoredUnusedDeclaredDependencies>
+            <ignoredUnusedDeclaredDependency>org.apache.asterix:asterix-external-data:zip:*</ignoredUnusedDeclaredDependency>
+          </ignoredUnusedDeclaredDependencies>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>default</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>check</goal>
+            </goals>
+            <configuration>
+              <licenses combine.children="append">
+                <license implementation="org.apache.rat.analysis.license.MITLicense"/>
+              </licenses>
+              <excludes combine.children="append">
+                <exclude>src/test/resources/**/results_parser_sqlpp/**</exclude>
+                <exclude>src/test/resources/**/results/**</exclude>
+                <exclude>src/test/resources/fuzzyjoin/pub/fuzzy-join-aql*.dot</exclude>
+                <exclude>src/test/resources/fuzzyjoin/pub/fuzzy-join-aql*.json</exclude>
+                <exclude>data/**</exclude>
+                <exclude>src/main/resources/queryui/**</exclude>
+                <exclude>src/main/resources/webui/**</exclude>
+                <exclude>src/test/resources/**/only*.xml</exclude>
+              </excludes>
+            </configuration>
+          </execution>
+          <execution>
+            <id>webqueryui</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>check</goal>
+            </goals>
+            <configuration>
+              <reportFile>${project.build.directory}/webqueryui-rat.txt</reportFile>
+              <licenses combine.children="append">
+                <license implementation="org.apache.rat.analysis.license.MITLicense"/>
+                <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
+                  <licenseFamilyCategory>MIT</licenseFamilyCategory>
+                  <licenseFamilyName>JQuery</licenseFamilyName>
+                  <patterns>(c) jQuery Foundation | jquery.org/license</patterns>
+                </license>
+                <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
+                  <licenseFamilyCategory>MIT</licenseFamilyCategory>
+                  <licenseFamilyName>Bootstrap</licenseFamilyName>
+                  <patterns>Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)</patterns>
+                </license>
+                <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
+                  <licenseFamilyCategory>MIT</licenseFamilyCategory>
+                  <licenseFamilyName>AngularJS</licenseFamilyName>
+                  <patterns>http://angularjs.org | (c) 2010-2016 Google, Inc. | License: MIT</patterns>
+                </license>
+              </licenses>
+              <licenseFamilies combine.children="append">
+                <licenseFamily implementation="org.apache.rat.license.MITLicenseFamily"/>
+                <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
+                  <familyName>JQuery</familyName>
+                </licenseFamily>
+                <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
+                  <familyName>Bootstrap</familyName>
+                </licenseFamily>
+                <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
+                  <familyName>AngularJS</familyName>
+                </licenseFamily>
+              </licenseFamilies>
+              <includes>
+                <include>src/main/resources/queryui/**</include>
+                <include>src/main/resources/webui/**</include>
+              </includes>
+              <excludes>src/main/resources/queryui/fonts/glyphicons-halflings-regular.svg</excludes>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
     <pluginManagement>
       <plugins>
@@ -292,6 +364,14 @@
       <groupId>org.apache.asterix</groupId>
       <artifactId>asterix-external-data</artifactId>
       <version>${project.version}</version>
+      <type>zip</type>
+      <classifier>testlib</classifier>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.asterix</groupId>
+      <artifactId>asterix-external-data</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.hyracks</groupId>

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/82464fb4/asterixdb/asterix-app/scripts/asterix/startallncs.sh
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/scripts/asterix/startallncs.sh b/asterixdb/asterix-app/scripts/asterix/startallncs.sh
deleted file mode 100644
index 94d49ac..0000000
--- a/asterixdb/asterix-app/scripts/asterix/startallncs.sh
+++ /dev/null
@@ -1,27 +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.
-ssh asterix-001 ~/hyracks-asterix/bin/startnc.sh
-ssh asterix-002 ~/hyracks-asterix/bin/startnc.sh
-ssh asterix-003 ~/hyracks-asterix/bin/startnc.sh
-ssh asterix-004 ~/hyracks-asterix/bin/startnc.sh
-ssh asterix-005 ~/hyracks-asterix/bin/startnc.sh
-ssh asterix-006 ~/hyracks-asterix/bin/startnc.sh
-ssh asterix-007 ~/hyracks-asterix/bin/startnc.sh
-ssh asterix-008 ~/hyracks-asterix/bin/startnc.sh
-ssh asterix-009 ~/hyracks-asterix/bin/startnc.sh
-ssh asterix-010 ~/hyracks-asterix/bin/startnc.sh

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/82464fb4/asterixdb/asterix-app/scripts/asterix/startcc.sh
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/scripts/asterix/startcc.sh b/asterixdb/asterix-app/scripts/asterix/startcc.sh
deleted file mode 100755
index cdd537b..0000000
--- a/asterixdb/asterix-app/scripts/asterix/startcc.sh
+++ /dev/null
@@ -1,24 +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.
-
-HYRACKS_HOME=/home/onose/src/hyracks
-
-export JAVA_OPTS="-Djava.rmi.server.hostname=128.195.52.122 -DAsterixConfigFileName=test.properties -Djava.net.preferIPv4Stack=true"
-
-$HYRACKS_HOME/hyracks-server/target/hyracks-server-0.1.3.1-binary-assembly/bin/hyrackscc -port 2222 &> logs/cc.log &

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/82464fb4/asterixdb/asterix-app/scripts/asterix/startnc.sh
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/scripts/asterix/startnc.sh b/asterixdb/asterix-app/scripts/asterix/startnc.sh
deleted file mode 100644
index 43f9e2a..0000000
--- a/asterixdb/asterix-app/scripts/asterix/startnc.sh
+++ /dev/null
@@ -1,31 +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 JAVA_HOME=/usr/local/java/vms/java
-
-LOGSDIR=/home/onose/hyracks-asterix/logs
-HYRACKS_HOME=/home/onose/src/hyracks
-
-IPADDR=`/sbin/ifconfig eth0 | grep "inet addr" | awk '{print $2}' | cut -f 2 -d ':'`
-NODEID=`ypcat hosts | grep asterix | grep -w $IPADDR | awk '{print $2}'`
-
-export JAVA_OPTS="-Xmx10g -Djava.net.preferIPv4Stack=true -Djava.io.tmpdir=/mnt/data/sdd/space/onose/tmp"
-
-echo $HYRACKS_HOME/hyracks-server/target/hyracks-server-0.1.3.1-binary-assembly/bin/hyracksnc -cluster-address 10.1.0.1 -cluster-port 2222 -data-listen-address $IPADDR -node-id $NODEID
-$HYRACKS_HOME/hyracks-server/target/hyracks-server-0.1.3.1-binary-assembly/bin/hyracksnc -cluster-address 10.1.0.1 -cluster-port 2222 -data-listen-address $IPADDR -node-id $NODEID &> $LOGSDIR/$NODEID.log &

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/82464fb4/asterixdb/asterix-app/scripts/asterix/stopallncs.sh
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/scripts/asterix/stopallncs.sh b/asterixdb/asterix-app/scripts/asterix/stopallncs.sh
deleted file mode 100644
index b04927f..0000000
--- a/asterixdb/asterix-app/scripts/asterix/stopallncs.sh
+++ /dev/null
@@ -1,27 +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.
-ssh asterix-001 ~/hyracks-asterix/bin/stopnc.sh
-ssh asterix-002 ~/hyracks-asterix/bin/stopnc.sh
-ssh asterix-003 ~/hyracks-asterix/bin/stopnc.sh
-ssh asterix-004 ~/hyracks-asterix/bin/stopnc.sh
-ssh asterix-005 ~/hyracks-asterix/bin/stopnc.sh
-ssh asterix-006 ~/hyracks-asterix/bin/stopnc.sh
-ssh asterix-007 ~/hyracks-asterix/bin/stopnc.sh
-ssh asterix-008 ~/hyracks-asterix/bin/stopnc.sh
-ssh asterix-009 ~/hyracks-asterix/bin/stopnc.sh
-ssh asterix-010 ~/hyracks-asterix/bin/stopnc.sh

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/82464fb4/asterixdb/asterix-app/scripts/asterix/stopcc.sh
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/scripts/asterix/stopcc.sh b/asterixdb/asterix-app/scripts/asterix/stopcc.sh
deleted file mode 100644
index 0a6c289..0000000
--- a/asterixdb/asterix-app/scripts/asterix/stopcc.sh
+++ /dev/null
@@ -1,23 +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.
-
-PID=`ps -ef | awk '/java.*CCDriver/ {print $2}'`
-
-echo $PID
-kill -9 $PID

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/82464fb4/asterixdb/asterix-app/scripts/asterix/stopnc.sh
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/scripts/asterix/stopnc.sh b/asterixdb/asterix-app/scripts/asterix/stopnc.sh
deleted file mode 100644
index c569911..0000000
--- a/asterixdb/asterix-app/scripts/asterix/stopnc.sh
+++ /dev/null
@@ -1,23 +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.
-
-PID=`ps -ef | awk '/java.*NCDriver/ {print $2}'`
-
-echo $PID
-kill -9 $PID

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/82464fb4/asterixdb/asterix-app/scripts/asterix/test.properties
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/scripts/asterix/test.properties b/asterixdb/asterix-app/scripts/asterix/test.properties
deleted file mode 100644
index d9bfb23..0000000
--- a/asterixdb/asterix-app/scripts/asterix/test.properties
+++ /dev/null
@@ -1,24 +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.
-MetadataNode=nc1
-NewUniverse=true
-nc1.stores=/tmp/nc1data/
-nc2.stores=/tmp/nc2data/
-nc3.stores=/tmp/nc3data/
-nc4.stores=/tmp/nc4data/
-nc5.stores=/tmp/nc5data/

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/82464fb4/asterixdb/asterix-app/scripts/idefix/deploy.hcli
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/scripts/idefix/deploy.hcli b/asterixdb/asterix-app/scripts/idefix/deploy.hcli
deleted file mode 100644
index da73c8e..0000000
--- a/asterixdb/asterix-app/scripts/idefix/deploy.hcli
+++ /dev/null
@@ -1,2 +0,0 @@
-connect to "localhost";
-create application asterix "/home/nicnic/workspace/asterix/trunk/asterix/asterix-app/target/asterix-app-0.0.2-SNAPSHOT-binary-assembly.zip";

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/82464fb4/asterixdb/asterix-app/scripts/idefix/startcc.sh
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/scripts/idefix/startcc.sh b/asterixdb/asterix-app/scripts/idefix/startcc.sh
deleted file mode 100644
index c0afbf2..0000000
--- a/asterixdb/asterix-app/scripts/idefix/startcc.sh
+++ /dev/null
@@ -1,23 +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.
-#/bin/bash
-
-export JAVA_OPTS="-DAsterixConfigFileName=test.properties -Djava.util.logging.config.file=/home/nicnic/Work/Asterix/hyracks/logging.properties"
-export HYRACKS_HOME="/home/nicnic/workspace/hyracks/tags/hyracks-0.1.5"
-bash ${HYRACKS_HOME}/hyracks-server/target/appassembler/bin/hyrackscc
-#bash /home/nicnic/workspace/hyracks/trunk/hyracks/hyracks-server/target/appassembler/bin/hyrackscc

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/82464fb4/asterixdb/asterix-app/scripts/idefix/startnc1.sh
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/scripts/idefix/startnc1.sh b/asterixdb/asterix-app/scripts/idefix/startnc1.sh
deleted file mode 100644
index ae15596..0000000
--- a/asterixdb/asterix-app/scripts/idefix/startnc1.sh
+++ /dev/null
@@ -1,25 +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.
-#/bin/bash
-
-#export JAVA_OPTS="-Xmx1024m -DAsterixConfigFileName=asterix-idefix.properties"
-#export JAVA_OPTS="-agentlib:hprof=cpu=samples,file=/tmp/q9.dump -Xmx1024m -DAsterixConfigFileName=asterix-idefix.properties"
-export JAVA_OPTS="-DAsterixConfigFileName=test.properties -Djava.util.logging.config.file=/home/nicnic/Work/Asterix/hyracks/logging.properties"
-export HYRACKS_HOME="/home/nicnic/workspace/hyracks/tags/hyracks-0.1.5"
-
-bash ${HYRACKS_HOME}/hyracks-server/target/appassembler/bin/hyracksnc -cluster-address 127.0.0.1 -data-listen-address 127.0.0.1 -node-id "nc1" $*

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/82464fb4/asterixdb/asterix-app/scripts/idefix/startnc2.sh
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/scripts/idefix/startnc2.sh b/asterixdb/asterix-app/scripts/idefix/startnc2.sh
deleted file mode 100644
index 4a3e370..0000000
--- a/asterixdb/asterix-app/scripts/idefix/startnc2.sh
+++ /dev/null
@@ -1,24 +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.
-#/bin/bash
-
-export JAVA_OPTS="-DAsterixConfigFileName=test.properties -Djava.util.logging.config.file=/home/nicnic/Work/Asterix/hyracks/logging.properties"
-export HYRACKS_HOME="/home/nicnic/workspace/hyracks/tags/hyracks-0.1.5"
-
-bash ${HYRACKS_HOME}/hyracks-server/target/appassembler/bin/hyracksnc -cluster-address 127.0.0.1 -data-listen-address 127.0.0.1 -node-id "nc2" $*
-

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/82464fb4/asterixdb/asterix-app/scripts/idefix/stopallncs.sh
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/scripts/idefix/stopallncs.sh b/asterixdb/asterix-app/scripts/idefix/stopallncs.sh
deleted file mode 100644
index c569911..0000000
--- a/asterixdb/asterix-app/scripts/idefix/stopallncs.sh
+++ /dev/null
@@ -1,23 +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.
-
-PID=`ps -ef | awk '/java.*NCDriver/ {print $2}'`
-
-echo $PID
-kill -9 $PID

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/82464fb4/asterixdb/asterix-app/scripts/idefix/stopcc.sh
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/scripts/idefix/stopcc.sh b/asterixdb/asterix-app/scripts/idefix/stopcc.sh
deleted file mode 100644
index 0a6c289..0000000
--- a/asterixdb/asterix-app/scripts/idefix/stopcc.sh
+++ /dev/null
@@ -1,23 +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.
-
-PID=`ps -ef | awk '/java.*CCDriver/ {print $2}'`
-
-echo $PID
-kill -9 $PID

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/82464fb4/asterixdb/asterix-app/scripts/idefix/undeploy.hcli
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/scripts/idefix/undeploy.hcli b/asterixdb/asterix-app/scripts/idefix/undeploy.hcli
deleted file mode 100644
index c23a026..0000000
--- a/asterixdb/asterix-app/scripts/idefix/undeploy.hcli
+++ /dev/null
@@ -1,2 +0,0 @@
-connect to "localhost";
-destroy application asterix;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/82464fb4/asterixdb/asterix-app/scripts/rainbow/execute.sh
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/scripts/rainbow/execute.sh b/asterixdb/asterix-app/scripts/rainbow/execute.sh
deleted file mode 100644
index 46788a9..0000000
--- a/asterixdb/asterix-app/scripts/rainbow/execute.sh
+++ /dev/null
@@ -1,19 +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.
-#/bin/sh
-export JAVA_OPTS="-DAsterixConfigFileName=asterix-rainbow.properties"; /home/onose/asterix-app-0.0.2-SNAPSHOT-binary-assembly/bin/asterix-cmd  -hyracks-port 2222 -execute true $*

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/82464fb4/asterixdb/asterix-app/scripts/rainbow/startallncs.sh
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/scripts/rainbow/startallncs.sh b/asterixdb/asterix-app/scripts/rainbow/startallncs.sh
deleted file mode 100644
index 4acf726..0000000
--- a/asterixdb/asterix-app/scripts/rainbow/startallncs.sh
+++ /dev/null
@@ -1,22 +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.
-ssh rainbow-01 ~/hyracks-rainbow/bin/startnc.sh
-ssh rainbow-02 ~/hyracks-rainbow/bin/startnc.sh
-ssh rainbow-03 ~/hyracks-rainbow/bin/startnc.sh
-ssh rainbow-04 ~/hyracks-rainbow/bin/startnc.sh
-ssh rainbow-05 ~/hyracks-rainbow/bin/startnc.sh

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/82464fb4/asterixdb/asterix-app/scripts/rainbow/startcc.sh
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/scripts/rainbow/startcc.sh b/asterixdb/asterix-app/scripts/rainbow/startcc.sh
deleted file mode 100755
index eb26647..0000000
--- a/asterixdb/asterix-app/scripts/rainbow/startcc.sh
+++ /dev/null
@@ -1,24 +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.
-
-HYRACKS_HOME=/home/onose/src/hyracks
-
-export JAVA_OPTS="-Djava.rmi.server.hostname=128.195.52.177 -DAsterixConfigFileName=asterix-rainbow.properties"
-
-$HYRACKS_HOME/hyracks-server/target/hyracks-server-0.1.3.1-binary-assembly/bin/hyrackscc -port 2222 &> logs/cc.log &

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/82464fb4/asterixdb/asterix-app/scripts/rainbow/startnc.sh
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/scripts/rainbow/startnc.sh b/asterixdb/asterix-app/scripts/rainbow/startnc.sh
deleted file mode 100644
index 3d7b75e..0000000
--- a/asterixdb/asterix-app/scripts/rainbow/startnc.sh
+++ /dev/null
@@ -1,31 +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 JAVA_HOME=/usr/local/java/vms/java
-
-LOGSDIR=/home/onose/hyracks-rainbow/logs
-HYRACKS_HOME=/home/onose/src/hyracks
-
-IPADDR=`/sbin/ifconfig eth0 | grep "inet addr" | awk '{print $2}' | cut -f 2 -d ':'`
-NODEID=`ypcat hosts | grep rainbow | grep -w $IPADDR | awk '{print $2}'`
-
-export JAVA_OPTS="-DNodeControllerDataPath=/tmp/ncX/"
-
-echo $HYRACKS_HOME/hyracks-server/target/hyracks-server-0.1.3.1-binary-assembly/bin/hyracksnc -cluster-address 128.195.52.177 -cluster-port 2222 -data-listen-address $IPADDR -node-id $NODEID
-$HYRACKS_HOME/hyracks-server/target/hyracks-server-0.1.3.1-binary-assembly/bin/hyracksnc -cluster-address 128.195.52.177 -cluster-port 2222 -data-listen-address $IPADDR -node-id $NODEID &> $LOGSDIR/$NODEID.log &

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/82464fb4/asterixdb/asterix-app/scripts/rainbow/stopallncs.sh
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/scripts/rainbow/stopallncs.sh b/asterixdb/asterix-app/scripts/rainbow/stopallncs.sh
deleted file mode 100644
index 6658268..0000000
--- a/asterixdb/asterix-app/scripts/rainbow/stopallncs.sh
+++ /dev/null
@@ -1,22 +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.
-ssh rainbow-01 ~/hyracks-rainbow/bin/stopnc.sh
-ssh rainbow-02 ~/hyracks-rainbow/bin/stopnc.sh
-ssh rainbow-03 ~/hyracks-rainbow/bin/stopnc.sh
-ssh rainbow-04 ~/hyracks-rainbow/bin/stopnc.sh
-ssh rainbow-05 ~/hyracks-rainbow/bin/stopnc.sh

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/82464fb4/asterixdb/asterix-app/scripts/rainbow/stopcc.sh
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/scripts/rainbow/stopcc.sh b/asterixdb/asterix-app/scripts/rainbow/stopcc.sh
deleted file mode 100644
index 0a6c289..0000000
--- a/asterixdb/asterix-app/scripts/rainbow/stopcc.sh
+++ /dev/null
@@ -1,23 +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.
-
-PID=`ps -ef | awk '/java.*CCDriver/ {print $2}'`
-
-echo $PID
-kill -9 $PID

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/82464fb4/asterixdb/asterix-app/scripts/rainbow/stopnc.sh
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/scripts/rainbow/stopnc.sh b/asterixdb/asterix-app/scripts/rainbow/stopnc.sh
deleted file mode 100644
index c569911..0000000
--- a/asterixdb/asterix-app/scripts/rainbow/stopnc.sh
+++ /dev/null
@@ -1,23 +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.
-
-PID=`ps -ef | awk '/java.*NCDriver/ {print $2}'`
-
-echo $PID
-kill -9 $PID

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/82464fb4/asterixdb/asterix-app/src/main/appended-resources/META-INF/LICENSE
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/main/appended-resources/META-INF/LICENSE b/asterixdb/asterix-app/src/main/appended-resources/META-INF/LICENSE
index 9da59a1..68b143c 100644
--- a/asterixdb/asterix-app/src/main/appended-resources/META-INF/LICENSE
+++ b/asterixdb/asterix-app/src/main/appended-resources/META-INF/LICENSE
@@ -53,41 +53,25 @@
        located at:
          webui/static/js/bootstrap.min.js,
          webui/static/css/bootstrap-responsive.min.css,
+         webui/static/css/bootstrap.min.css,
+         webui/static/img/glyphicons-halflings-white.png,
        and
-         webui/static/css/bootstrap.min.css
+         webui/static/img/glyphicons-halflings.png
 
    are available under the following license:
 ---
    Copyright 2012 Twitter, Inc.
    http://www.apache.org/licenses/LICENSE-2.0.txt
----
-   Portions of the AsterixDB WebUI
-       located at:
-         webui/static/js/smoothie.js,
-       and
-         feed/smoothie.js
-
-   are available under the following license:
----
-   Copyright (c) 2010-2013, Joe Walnes
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
 
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
+   Credit for webui/static/img/glyphicons-halflings-white.png,
+          and webui/static/img/glyphicons-halflings.png
 
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+   GLYPHICONS Halflings font is also released as an extension of a Bootstrap
+   (www.getbootstrap.com) for free and it is released under the same license as
+   Bootstrap. While you are not required to include attribution on your
+   Bootstrap-based projects, I would certainly appreciate any form of support,
+   even a nice Tweet is enough. Of course if you want, you can say thank you and
+   support me by buying more icons on GLYPHICONS.com.
 ---
    Portions of the AsterixDB QueryUI
        located at:
@@ -115,8 +99,13 @@
        located at:
          queryui/js/bootstrap.min.js,
          queryui/css/bootstrap.min.css,
+         queryui/css/bootstrap-theme.min.css,
+         queryui/fonts/glyphicons-halflings-regular.eot,
+         queryui/fonts/glyphicons-halflings-regular.svg,
+         queryui/fonts/glyphicons-halflings-regular.ttf,
+         queryui/fonts/glyphicons-halflings-regular.woff,
        and
-         queryui/css/bootstrap-theme.min.css
+         queryui/fonts/glyphicons-halflings-regular.woff2
 
    are available under the following license:
 ---
@@ -144,7 +133,7 @@
 
    queryui/css/bootstrap.min.css also contains normalize.css v3.0.3
    (http://github.com/necolas/normalize.css), having the following copyright:
-
+   --
    Copyright © Nicolas Gallagher and Jonathan Neal
 
    Permission is hereby granted, free of charge, to any person obtaining a copy of
@@ -163,6 +152,21 @@
    COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
    IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
    CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+   --
+
+   Credit for font files: queryui/fonts/glyphicons-halflings-regular.eot,
+                          queryui/fonts/glyphicons-halflings-regular.svg,
+                          queryui/fonts/glyphicons-halflings-regular.ttf,
+                          queryui/fonts/glyphicons-halflings-regular.woff,
+                        and
+                          queryui/fonts/glyphicons-halflings-regular.woff2
+
+   GLYPHICONS Halflings font is also released as an extension of a Bootstrap
+   (www.getbootstrap.com) for free and it is released under the same license as
+   Bootstrap. While you are not required to include attribution on your
+   Bootstrap-based projects, I would certainly appreciate any form of support,
+   even a nice Tweet is enough. Of course if you want, you can say thank you and
+   support me by buying more icons on GLYPHICONS.com.
 ---
 
    Portions of the AsterixDB QueryUI

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/82464fb4/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/FeedServlet.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/FeedServlet.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/FeedServlet.java
deleted file mode 100644
index 0b4a088..0000000
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/FeedServlet.java
+++ /dev/null
@@ -1,98 +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.asterix.api.http.server;
-
-import java.awt.image.BufferedImage;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.util.concurrent.ConcurrentMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.imageio.ImageIO;
-
-import org.apache.hyracks.http.api.IServletRequest;
-import org.apache.hyracks.http.api.IServletResponse;
-import org.apache.hyracks.http.server.AbstractServlet;
-import org.apache.hyracks.http.server.utils.HttpUtil;
-
-import io.netty.handler.codec.http.HttpResponseStatus;
-
-public class FeedServlet extends AbstractServlet {
-    private static final Logger LOGGER = Logger.getLogger(FeedServlet.class.getName());
-
-    public FeedServlet(ConcurrentMap<String, Object> ctx, String[] paths) {
-        super(ctx, paths);
-    }
-
-    @Override
-    protected void get(IServletRequest request, IServletResponse response) {
-        try {
-            response.setStatus(HttpResponseStatus.OK);
-            String resourcePath;
-            String requestURI = request.getHttpRequest().uri();
-
-            if ("/".equals(requestURI)) {
-                HttpUtil.setContentType(response, HttpUtil.ContentType.TEXT_HTML);
-                resourcePath = "/feed/home.html";
-            } else {
-                resourcePath = requestURI;
-            }
-
-            InputStream is = FeedServlet.class.getResourceAsStream(resourcePath);
-            if (is == null) {
-                response.setStatus(HttpResponseStatus.NOT_FOUND);
-                return;
-            }
-
-            // Special handler for font files and .png resources
-            if (resourcePath.endsWith(".png")) {
-
-                BufferedImage img = ImageIO.read(is);
-                OutputStream outputStream = response.outputStream();
-                String formatName = "png";
-                HttpUtil.setContentType(response, HttpUtil.ContentType.IMG_PNG);
-                ImageIO.write(img, formatName, outputStream);
-                return;
-            }
-
-            HttpUtil.setContentType(response, HttpUtil.ContentType.TEXT_HTML, HttpUtil.Encoding.UTF8);
-            InputStreamReader isr = new InputStreamReader(is);
-            StringBuilder sb = new StringBuilder();
-            BufferedReader br = new BufferedReader(isr);
-            String line = br.readLine();
-
-            while (line != null) {
-                sb.append(line + "\n");
-                line = br.readLine();
-            }
-
-            PrintWriter out = response.writer();
-            out.println(sb.toString());
-        } catch (IOException e) {
-            LOGGER.log(Level.WARNING, "Failure handling request", e);
-            response.setStatus(HttpResponseStatus.INTERNAL_SERVER_ERROR);
-            return;
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/82464fb4/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalLibraryUtils.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalLibraryUtils.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalLibraryUtils.java
index 4680465..b4e1c75 100755
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalLibraryUtils.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalLibraryUtils.java
@@ -20,6 +20,7 @@ package org.apache.asterix.app.external;
 
 import java.io.File;
 import java.io.FilenameFilter;
+import java.io.IOException;
 import java.net.URL;
 import java.rmi.RemoteException;
 import java.util.ArrayList;
@@ -49,6 +50,7 @@ import org.apache.asterix.metadata.entities.Function;
 import org.apache.asterix.metadata.entities.Library;
 import org.apache.asterix.metadata.utils.MetadataUtil;
 import org.apache.asterix.runtime.formats.NonTaggedDataFormat;
+import org.apache.hyracks.control.common.controllers.ControllerConfig;
 
 public class ExternalLibraryUtils {
 
@@ -217,22 +219,22 @@ public class ExternalLibraryUtils {
             }
 
             // Get the descriptor
-            String[] libraryDescriptors = libraryDir.list(new FilenameFilter() {
-                @Override
-                public boolean accept(File dir, String name) {
-                    return name.endsWith(".xml");
-                }
-            });
-            ExternalLibrary library = getLibrary(new File(libraryDir + File.separator + libraryDescriptors[0]));
+            String[] libraryDescriptors = libraryDir.list((dir, name) -> name.endsWith(".xml"));
+
+            if (libraryDescriptors == null) {
+                throw new IOException("Unable to list files in directory " + libraryDir);
+            }
 
             if (libraryDescriptors.length == 0) {
                 // should be fine. library was installed but its content was not added to metadata
                 MetadataManager.INSTANCE.commitTransaction(mdTxnCtx);
                 return;
             } else if (libraryDescriptors.length > 1) {
-                throw new Exception("More than 1 library descriptors defined");
+                throw new IllegalStateException("More than 1 library descriptors defined");
             }
 
+            ExternalLibrary library = getLibrary(new File(libraryDir + File.separator + libraryDescriptors[0]));
+
             // Get the dataverse
             Dataverse dv = MetadataManager.INSTANCE.getDataverse(mdTxnCtx, dataverse);
             if (dv == null) {
@@ -281,9 +283,8 @@ public class ExternalLibraryUtils {
             }
             MetadataManager.INSTANCE.commitTransaction(mdTxnCtx);
         } catch (Exception e) {
-            e.printStackTrace();
             if (LOGGER.isLoggable(Level.SEVERE)) {
-                LOGGER.info("Exception in installing library " + libraryName);
+                LOGGER.log(Level.SEVERE, "Exception in installing library " + libraryName, e);
             }
             MetadataManager.INSTANCE.abortTransaction(mdTxnCtx);
         }
@@ -391,19 +392,19 @@ public class ExternalLibraryUtils {
     }
 
     /**
-     * @return the directory "$(pwd)/library": This needs to be improved
+     * @return the directory "$(ControllerConfig.defaultDir)/library": This needs to be improved
      */
     protected static File getLibraryInstallDir() {
         String workingDir = System.getProperty("user.dir");
-        return new File(workingDir + File.separator + "library");
+        return new File(workingDir, "library");
     }
 
     /**
-     * @return the directory "$(pwd)/uninstall": This needs to be improved
+     * @return the directory "$(ControllerConfig.defaultDir)/uninstall": This needs to be improved
      */
     protected static File getLibraryUninstallDir() {
         String workingDir = System.getProperty("user.dir");
-        return new File(workingDir + File.separator + "uninstall");
+        return new File(workingDir, "uninstall");
     }
 
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/82464fb4/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplication.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplication.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplication.java
index a73a5cc..cb2bf64 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplication.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplication.java
@@ -35,7 +35,6 @@ import org.apache.asterix.api.http.server.ClusterControllerDetailsApiServlet;
 import org.apache.asterix.api.http.server.ConnectorApiServlet;
 import org.apache.asterix.api.http.server.DdlApiServlet;
 import org.apache.asterix.api.http.server.DiagnosticsApiServlet;
-import org.apache.asterix.api.http.server.FeedServlet;
 import org.apache.asterix.api.http.server.FullApiServlet;
 import org.apache.asterix.api.http.server.NodeControllerDetailsApiServlet;
 import org.apache.asterix.api.http.server.QueryApiServlet;
@@ -164,7 +163,6 @@ public class CCApplication extends BaseCCApplication {
     protected void configureServers() throws Exception {
         webManager.add(setupWebServer(AppContextInfo.INSTANCE.getExternalProperties()));
         webManager.add(setupJSONAPIServer(AppContextInfo.INSTANCE.getExternalProperties()));
-        webManager.add(setupFeedServer(AppContextInfo.INSTANCE.getExternalProperties()));
         webManager.add(setupQueryWebServer(AppContextInfo.INSTANCE.getExternalProperties()));
     }
 
@@ -238,14 +236,6 @@ public class CCApplication extends BaseCCApplication {
         return queryWebServer;
     }
 
-    protected HttpServer setupFeedServer(ExternalProperties externalProperties) throws Exception {
-        HttpServer feedServer = new HttpServer(webManager.getBosses(), webManager.getWorkers(),
-                externalProperties.getActiveServerPort());
-        feedServer.setAttribute(HYRACKS_CONNECTION_ATTR, getHcc());
-        feedServer.addServlet(new FeedServlet(feedServer.ctx(), new String[] { "/" }));
-        return feedServer;
-    }
-
     protected IServlet createServlet(ConcurrentMap<String, Object> ctx, String key, String... paths) {
         switch (key) {
             case Servlets.AQL:

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/82464fb4/asterixdb/asterix-app/src/main/resources/feed/dashboard.html
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/main/resources/feed/dashboard.html b/asterixdb/asterix-app/src/main/resources/feed/dashboard.html
deleted file mode 100644
index d82c23c..0000000
--- a/asterixdb/asterix-app/src/main/resources/feed/dashboard.html
+++ /dev/null
@@ -1,146 +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.
- !-->
-
-<html>
-  <head>
-    <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
-    <script type="text/javascript" src="/webui/static/js/smoothie.js"></script>
-    <script type="text/javascript">
-    $(document).ready(function() {
-        var feedSeries = new TimeSeries();
-      	var state = "ACTIVE";
-        var dataverse = "%s";
-        var dataset = "%s";
-        var feed = "%s";
-        var ingestLocations = "%s";
-        var computeLocations = "%s";
-        var storageLocations = "%s";
-        var ingestionPolicy = "%s";
-        var activeSince = "%s";
-        var targetUrl = "/feed/data?dataverse=" + dataverse + "&dataset=" + dataset + "&feed=" + feed;
-
-
-        var ingestionNodes = ingestLocations.split(",");
-        var numIngestionNodes = ingestionNodes.length;
-        var seriesOptions = { strokeStyle: 'rgba(0, 255, 0, 1)', fillStyle: 'rgba(0, 255, 0, 0.2)', lineWidth: 4 };
-        var ingestionTimeSeries = new Array();
-        var graphNames = new Array();
-
-        $.ajaxSetup({ cache: false });
-        setInterval(fetchFeedReport, 5000);
-        function fetchFeedReport() {
-          $.ajax({
-            url: '/feed/data?dataverse=' + dataverse + '&dataset=' + dataset + '&feed=' + feed,
-            method: 'GET',
-            dataType: 'json',
-            success: onFeedReportReceived
-            });
-         }
-
-         
-        function onFeedReportReceived(data) {
-            var status = data["status"];
-            if(status == ("ended")){
-              ingestLocations = " ";
-              computeLocations = " ";
-              storageLocations = " ";
-              ingestionPolicy = " ";
-              state = "INACTIVE";
-              document.location.reload(true);
-            } else {
-            	var type = data["type"];
-            	if (type == ("reload")) {
-              		ingestLocations  = data["ingestLocations"];
-              		computeLocations = data["computeLocations"];
-              		storageLocations = data["storageLocations"];
-              		document.location.reload(true);
-           		 } else {
-            		var report = data["value"];
-            		var tputArray = report.split("|");
-            		var covered = 0;
-            		var totalTput = 0;
-            		for( var i = 0; i < tputArray.length-1; i ++){
-               			ingestionTimeSeries[i].append(data["time"], tputArray[i]);
-               			covered++;
-               			totalTput += parseInt(tputArray[i]);
-            		}          
-            		for( var j = covered; j < numIngestionNodes; j++){
-                		ingestionTimeSeries[j].append(data["time"], 0);
-            		}          
-            		ingestionTimeSeries[numIngestionNodes].append(data["time"], totalTput);
-            	}
-            }
-        }
-
-        function myYRangeFunction(range) {
-           var min = 0;
-           var max = 5000;
-           return {min: min, max: max};
-        }
-
-        function initTimeline(ingestLocations) {
-
-          document.write("<i>" + "Feed Ingestion" + " "  + "<i>");
-          document.write("<br />" + "Ingestion Locations: " + ingestLocations.replace(",",", "));
-          document.write("<br />" + "Compute Locations: " + computeLocations.replace(",",", "));
-          document.write("<br />" + "Storage Locations: " + storageLocations.replace(",",", "));
-          document.write("<br />" + "Ingestion Policy: " + ingestionPolicy);
-          document.write("<br />" + "Status: " + state);
-          document.write("<br />");
-          document.write("<br />");
-    
-          for( var i = 0; i < numIngestionNodes; i++){
-              graphNames[i] = "Partition " + i;
-          }          
-
-          if(numIngestionNodes > 1){
-             graphNames[numIngestionNodes] = "IngestionThroughput";
-             drawCanvas(graphNames[numIngestionNodes]);
-             ingestionTimeSeries[numIngestionNodes] = new TimeSeries();
-             drawChart(graphNames[numIngestionNodes], ingestionTimeSeries[numIngestionNodes]);
-          }
-
-          for( var j = 0; j < numIngestionNodes; j++){
-             drawCanvas(graphNames[j]);
-             ingestionTimeSeries[j] = new TimeSeries();
-             drawChart(graphNames[j], ingestionTimeSeries[j]);
-          }
-        }
-
-        function drawCanvas(chartName) {
-          document.write("<br />");
-          document.write("<br />");
-          document.write("<i>" + chartName + "</i>");
-          document.write("<br />");
-          document.write("<canvas id="+ "\"" + chartName + "\"" + " " + "width=\"500\" height=\"250\"></canvas>");
-        }   
-
-        function drawChart(chartName, ingestionTimeSeries) {
-             var ingestionChart = new SmoothieChart({ timestampFormatter:SmoothieChart.timeFormatter, interpolation:'linear', minValue:0, millisPerPixel: 20, grid: { strokeStyle: '#555555', lineWidth: 1, millisPerLine: 1000, verticalSections: 10 }});
-             ingestionChart.addTimeSeries(ingestionTimeSeries, seriesOptions);
-             ingestionChart.streamTo(document.getElementById(chartName, 500));
-        }
-
-        initTimeline(ingestLocations);
-     });   
-    </script>
-  </head>
-  <body></body>
-</html>
-

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/82464fb4/asterixdb/asterix-app/src/main/resources/feed/home.html
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/main/resources/feed/home.html b/asterixdb/asterix-app/src/main/resources/feed/home.html
deleted file mode 100644
index 4d8e55fa..0000000
--- a/asterixdb/asterix-app/src/main/resources/feed/home.html
+++ /dev/null
@@ -1,85 +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.
- !-->
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<meta name="description" content="ASTERIX WEB PAGE" />
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<link href='http://fonts.googleapis.com/css?family=Bitter|PT+Sans+Caption|Open+Sans' rel='stylesheet' type='text/css'>
-<script src="/webui/static/js/jquery.min.js"></script>
-
-<link href="/webui/static/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
-<link href="/webui/static/css/bootstrap-responsive.min.css" rel="stylesheet" type="text/css" />
-
-<script src="/webui/static/js/bootstrap.min.js"></script>
-
-<link href="/webui/static/css/style.css" rel="stylesheet" type="text/css" />
-
-
-<meta charset=utf-8 />
-<title>AsterixDB Web Interface</title>
-</head>
-
-<body>
-  <div class="navbar navbar-fixed-top">
-    <div class="navbar-inner">
-      <div class="container">
-        <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-        </a>
-
-        <!-- Temporary logo placeholder -->
-        <a class="brand" href="#"><img src="/webui/static/img/finalasterixlogo.png"></a>
-
-        <div class="nav-collapse collapse">
-          <ul class="nav">
-            <li><a href="http://code.google.com/p/asterixdb/" target="_blank">
-                    Open source<img class="extarget" src="/webui/static/img/targetlink.png"/></a></li>
-            <li><a href="http://code.google.com/p/asterixdb/issues/list" target="_blank">
-                    File issues<img class="extarget" src="/webui/static/img/targetlink.png"/></a></li>
-            <li><a href="https://groups.google.com/forum/?fromgroups#!forum/asterixdb-users" target="_blank">
-                    Contact<img class="extarget" src="/webui/static/img/targetlink.png"/></a></li>
-          </ul>
-        </div><!--/.nav-collapse -->
-      </div>
-    </div>
-  </div>
-
-  <div class="content">
-    <div class="container">
-      <div class="row-fluid">
-       <div class="span12">
-       %s
-       </div>
-      </div>
-    </div>
-  </div>
-  <div class="footer">
-    <section class="line"><hr></section>
-    <section class="content">
-      <section class="left">
-      </section>
-      <section class="right">
-      </section>
-    </section>
-  </div>
-</body>
-</html>


Mime
View raw message