Author: phunt
Date: Tue Oct 8 05:34:46 2013
New Revision: 1530158
URL: http://svn.apache.org/r1530158
Log:
ZOOKEEPER-1771. ZooInspector authentication (Benjamin Jaton via phunt) part 2 -
fix license headers
Modified:
zookeeper/trunk/src/contrib/zooinspector/config/defaultConnectionSettings.cfg
zookeeper/trunk/src/contrib/zooinspector/config/defaultNodeViewers.cfg
zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorManagerImpl.java
Modified:
zookeeper/trunk/src/contrib/zooinspector/config/defaultConnectionSettings.cfg
URL:
http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/zooinspector/config/defaultConnectionSettings.cfg?rev=1530158&r1=1530157&r2=1530158&view=diff
==============================================================================
---
zookeeper/trunk/src/contrib/zooinspector/config/defaultConnectionSettings.cfg
(original)
+++
zookeeper/trunk/src/contrib/zooinspector/config/defaultConnectionSettings.cfg
Tue Oct 8 05:34:46 2013
@@ -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
Modified: zookeeper/trunk/src/contrib/zooinspector/config/defaultNodeViewers.cfg
URL:
http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/zooinspector/config/defaultNodeViewers.cfg?rev=1530158&r1=1530157&r2=1530158&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/zooinspector/config/defaultNodeViewers.cfg
(original)
+++ zookeeper/trunk/src/contrib/zooinspector/config/defaultNodeViewers.cfg Tue
Oct 8 05:34:46 2013
@@ -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
Modified:
zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorManagerImpl.java
URL:
http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorManagerImpl.java?rev=1530158&r1=1530157&r2=1530158&view=diff
==============================================================================
---
zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorManagerImpl.java
(original)
+++
zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorManagerImpl.java
Tue Oct 8 05:34:46 2013
@@ -732,7 +732,7 @@ public class ZooInspectorManagerImpl imp
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);
}
}
