Browse Source

ZOOKEEPER-1771. ZooInspector authentication (Benjamin Jaton via phunt) part 2 - fix license headers

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1530158 13f79535-47bb-0310-9956-ffa450edef68
Patrick D. Hunt 11 years ago
parent
commit
b848a573d4

+ 15 - 0
src/contrib/zooinspector/config/defaultConnectionSettings.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.
+#
 #Default connection for ZooInspector
 hosts=localhost\:2181
 encryptionManager=org.apache.zookeeper.inspector.encryption.BasicDataEncryptionManager

+ 14 - 0
src/contrib/zooinspector/config/defaultNodeViewers.cfg

@@ -1,3 +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.
 org.apache.zookeeper.inspector.gui.nodeviewer.NodeViewerData
 org.apache.zookeeper.inspector.gui.nodeviewer.NodeViewerMetaData
 org.apache.zookeeper.inspector.gui.nodeviewer.NodeViewerACL

+ 1 - 1
src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorManagerImpl.java

@@ -732,7 +732,7 @@ public class ZooInspectorManagerImpl implements ZooInspectorManager {
                 try {
                     while (buff.ready()) {
                         String line = buff.readLine();
-                        if (line != null && line.length() > 0) {
+                        if (line != null && line.length() > 0 && !line.startsWith("#")) {
                             result.add(line);
                         }
                     }