incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [1/5] git commit: Minor fixes for release.
Date Tue, 07 Jul 2015 19:01:06 GMT
Repository: incubator-blur
Updated Branches:
  refs/heads/blur-0.2.4-parcel 42052a858 -> 3499d679a


Minor fixes for release.


Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/8f4c6da5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/8f4c6da5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/8f4c6da5

Branch: refs/heads/blur-0.2.4-parcel
Commit: 8f4c6da5de5d017c59c625119bac40e054d4ade0
Parents: 2b31cd8
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Wed Jul 1 21:13:33 2015 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Wed Jul 1 21:13:33 2015 -0400

----------------------------------------------------------------------
 LICENSE                                            |  2 +-
 NOTICE                                             |  2 +-
 distribution/src/main/scripts/bin/stop-shards.sh   |  4 +++-
 distribution/src/main/scripts/conf/consoles        | 15 +++++++++++++++
 distribution/src/main/scripts/conf/controllers     | 15 +++++++++++++++
 distribution/src/main/scripts/conf/default_zoo.cfg | 15 +++++++++++++++
 distribution/src/main/scripts/conf/shards          | 15 +++++++++++++++
 distribution/src/main/scripts/conf/zookeepers      | 15 +++++++++++++++
 pom.xml                                            |  7 -------
 9 files changed, 80 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/8f4c6da5/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index dbdda7f..401ee55 100644
--- a/LICENSE
+++ b/LICENSE
@@ -224,7 +224,7 @@ Apache Thrift v0.9.0
 ==========================================================================
 The MIT License applies to the following libraries:
 
-Bootstrap 3
+Bootstrap 3.2.0
 ./blur-console/src/main/webapp/libs/bootstrap/fonts/glyphicons-halflings-regular.eot
 ./blur-console/src/main/webapp/libs/bootstrap/fonts/glyphicons-halflings-regular.svg
 ./blur-console/src/main/webapp/libs/bootstrap/fonts/glyphicons-halflings-regular.ttf

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/8f4c6da5/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index e9328e4..a1b9557 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
 Apache Blur
-Copyright 2012-2013 The Apache Software Foundation
+Copyright 2012-2015 The Apache Software Foundation
 
 This product includes software developed by The Apache Software
 Foundation (http://www.apache.org/).

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/8f4c6da5/distribution/src/main/scripts/bin/stop-shards.sh
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/bin/stop-shards.sh b/distribution/src/main/scripts/bin/stop-shards.sh
index 8f16076..a755194 100755
--- a/distribution/src/main/scripts/bin/stop-shards.sh
+++ b/distribution/src/main/scripts/bin/stop-shards.sh
@@ -18,7 +18,9 @@
 bin=`dirname "$0"`
 bin=`cd "$bin"; pwd`
 
-. "$bin"/blur-config.sh
+if [[ -z $BLUR_CLASSPATH ]] ; then
+	. "$bin"/blur-config.sh
+fi
 PROC_NAME="Shutdown"
 nohup "$JAVA_HOME"/bin/java -Dblur.name=SHUTDOWN_PROC -Djava.library.path=$JAVA_LIBRARY_PATH
-Dblur.logs.dir=$BLUR_LOGS -Dblur.log.file=blur-$USER-$PROC_NAME -cp $BLUR_CLASSPATH org.apache.blur.thrift.Shutdown
> "$BLUR_LOGS/blur-$USER-$PROC_NAME.out" 2>&1 < /dev/null &
 SHUTDOWN_PID=$!

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/8f4c6da5/distribution/src/main/scripts/conf/consoles
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/conf/consoles b/distribution/src/main/scripts/conf/consoles
index 2fbb50c..63fb8bb 100644
--- a/distribution/src/main/scripts/conf/consoles
+++ b/distribution/src/main/scripts/conf/consoles
@@ -1 +1,16 @@
+# 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.
+
 localhost

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/8f4c6da5/distribution/src/main/scripts/conf/controllers
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/conf/controllers b/distribution/src/main/scripts/conf/controllers
index 2fbb50c..63fb8bb 100644
--- a/distribution/src/main/scripts/conf/controllers
+++ b/distribution/src/main/scripts/conf/controllers
@@ -1 +1,16 @@
+# 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.
+
 localhost

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/8f4c6da5/distribution/src/main/scripts/conf/default_zoo.cfg
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/conf/default_zoo.cfg b/distribution/src/main/scripts/conf/default_zoo.cfg
index 92026f9..ef4ac4f 100644
--- a/distribution/src/main/scripts/conf/default_zoo.cfg
+++ b/distribution/src/main/scripts/conf/default_zoo.cfg
@@ -1,3 +1,18 @@
+# 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.
+
 # The number of milliseconds of each tick
 tickTime=2000
 # The max session timeout is 180 seconds

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/8f4c6da5/distribution/src/main/scripts/conf/shards
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/conf/shards b/distribution/src/main/scripts/conf/shards
index 2fbb50c..63fb8bb 100644
--- a/distribution/src/main/scripts/conf/shards
+++ b/distribution/src/main/scripts/conf/shards
@@ -1 +1,16 @@
+# 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.
+
 localhost

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/8f4c6da5/distribution/src/main/scripts/conf/zookeepers
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/conf/zookeepers b/distribution/src/main/scripts/conf/zookeepers
index 47b0bee..0db83e2 100644
--- a/distribution/src/main/scripts/conf/zookeepers
+++ b/distribution/src/main/scripts/conf/zookeepers
@@ -1,2 +1,17 @@
+# 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.
+
 #NOTE: There is additional setup in the default_zoo.cfg file needed for multiple instances
of ZooKeeper.  See ZooKeeper documentation.
 localhost

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/8f4c6da5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b9602a6..23e2479 100644
--- a/pom.xml
+++ b/pom.xml
@@ -376,13 +376,6 @@ under the License.
 						<exclude>**/src/main/resources*/NOTICE-bin.txt</exclude>
 						<exclude>**/src/main/resources*/notices/*.src</exclude>
 
-						<!-- Default configuration files used by Blur -->
-						<exclude>**/src/main/scripts/conf/controllers</exclude>
-                                                <exclude>**/src/main/scripts/conf/consoles</exclude>
-						<exclude>**/src/main/scripts/conf/default_zoo.cfg</exclude>
-						<exclude>**/src/main/scripts/conf/shards</exclude>
-						<exclude>**/src/main/scripts/conf/zookeepers</exclude>
-
 						<!-- Generate by Thrift -->
 						<exclude>**/src/main/scripts/interface/gen-html/Blur.html</exclude>
 						<exclude>**/src/main/scripts/interface/gen-html/index.html</exclude>


Mime
View raw message