Return-Path: X-Original-To: apmail-zookeeper-commits-archive@www.apache.org Delivered-To: apmail-zookeeper-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EFD2211C36 for ; Fri, 4 Apr 2014 01:25:06 +0000 (UTC) Received: (qmail 83222 invoked by uid 500); 4 Apr 2014 01:25:06 -0000 Delivered-To: apmail-zookeeper-commits-archive@zookeeper.apache.org Received: (qmail 83191 invoked by uid 500); 4 Apr 2014 01:25:06 -0000 Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ Delivered-To: mailing list commits@zookeeper.apache.org Received: (qmail 83179 invoked by uid 99); 4 Apr 2014 01:25:05 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Apr 2014 01:25:05 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Apr 2014 01:25:03 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5881C23888FE; Fri, 4 Apr 2014 01:24:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1584497 [1/9] - in /zookeeper/trunk: bin/ src/c/ src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/ src/contrib/zooinspector/ src/contrib/zooinspector/lib/ src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/ src/c... Date: Fri, 04 Apr 2014 01:24:38 -0000 To: commits@zookeeper.apache.org From: michim@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140404012440.5881C23888FE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: michim Date: Fri Apr 4 01:24:37 2014 New Revision: 1584497 URL: http://svn.apache.org/r1584497 Log: Set svn:eol-style property to native. Modified: zookeeper/trunk/bin/README.txt (contents, props changed) zookeeper/trunk/bin/zkCli.cmd (contents, props changed) zookeeper/trunk/bin/zkServer.cmd (contents, props changed) zookeeper/trunk/src/c/c-doc.Doxyfile (contents, props changed) zookeeper/trunk/src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/date.format.js (contents, props changed) zookeeper/trunk/src/contrib/zooinspector/README.txt (contents, props changed) zookeeper/trunk/src/contrib/zooinspector/build.xml (contents, props changed) zookeeper/trunk/src/contrib/zooinspector/ivy.xml (contents, props changed) zookeeper/trunk/src/contrib/zooinspector/lib/log4j.properties (contents, props changed) zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/ZooInspector.java (contents, props changed) zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/encryption/BasicDataEncryptionManager.java (contents, props changed) zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/encryption/DataEncryptionManager.java (contents, props changed) zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/NodeViewersChangeListener.java (contents, props changed) zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorAboutDialog.java (contents, props changed) zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorConnectionPropertiesDialog.java (contents, props changed) zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorNodeViewersDialog.java (contents, props changed) zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorNodeViewersPanel.java (contents, props changed) zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorPanel.java (contents, props changed) zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorTreeViewer.java (contents, props changed) zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/about.html (contents, props changed) zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeViewerACL.java (contents, props changed) zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeViewerData.java (contents, props changed) zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeViewerMetaData.java (contents, props changed) zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/nodeviewer/ZooInspectorNodeViewer.java (contents, props changed) zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/logger/LoggerFactory.java (contents, props changed) zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/NodeListener.java (contents, props changed) zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/Pair.java (contents, props changed) zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorManager.java (contents, props changed) zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorManagerImpl.java (contents, props changed) zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorNodeManager.java (contents, props changed) zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/retry/ZooKeeperRetry.java (contents, props changed) zookeeper/trunk/src/contrib/zooinspector/zooInspector.cmd (contents, props changed) zookeeper/trunk/src/java/main/org/apache/zookeeper/server/SnapshotFormatter.java (contents, props changed) zookeeper/trunk/src/java/test/org/apache/zookeeper/server/PrepRequestProcessorTest.java (contents, props changed) zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FLEPredicateTest.java (contents, props changed) zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ReconfigTest.java (contents, props changed) zookeeper/trunk/src/java/test/org/apache/zookeeper/test/SessionInvalidationTest.java (contents, props changed) Modified: zookeeper/trunk/bin/README.txt URL: http://svn.apache.org/viewvc/zookeeper/trunk/bin/README.txt?rev=1584497&r1=1584496&r2=1584497&view=diff ============================================================================== --- zookeeper/trunk/bin/README.txt (original) +++ zookeeper/trunk/bin/README.txt Fri Apr 4 01:24:37 2014 @@ -1,6 +1,6 @@ -This directory contain scripts that allow easy access (classpath in particular) -to the ZooKeeper server and command line client. - -Files ending in .sh are unix and cygwin compatible - -Files ending in .cmd are msdos/windows compatible +This directory contain scripts that allow easy access (classpath in particular) +to the ZooKeeper server and command line client. + +Files ending in .sh are unix and cygwin compatible + +Files ending in .cmd are msdos/windows compatible Propchange: zookeeper/trunk/bin/README.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: zookeeper/trunk/bin/zkCli.cmd URL: http://svn.apache.org/viewvc/zookeeper/trunk/bin/zkCli.cmd?rev=1584497&r1=1584496&r2=1584497&view=diff ============================================================================== --- zookeeper/trunk/bin/zkCli.cmd (original) +++ zookeeper/trunk/bin/zkCli.cmd Fri Apr 4 01:24:37 2014 @@ -1,24 +1,24 @@ -@echo off -REM Licensed to the Apache Software Foundation (ASF) under one or more -REM contributor license agreements. See the NOTICE file distributed with -REM this work for additional information regarding copyright ownership. -REM The ASF licenses this file to You under the Apache License, Version 2.0 -REM (the "License"); you may not use this file except in compliance with -REM the License. You may obtain a copy of the License at -REM -REM http://www.apache.org/licenses/LICENSE-2.0 -REM -REM Unless required by applicable law or agreed to in writing, software -REM distributed under the License is distributed on an "AS IS" BASIS, -REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -REM See the License for the specific language governing permissions and -REM limitations under the License. - -setlocal -call "%~dp0zkEnv.cmd" - -set ZOOMAIN=org.apache.zookeeper.ZooKeeperMain -call %JAVA% "-Dzookeeper.log.dir=%ZOO_LOG_DIR%" "-Dzookeeper.root.logger=%ZOO_LOG4J_PROP%" -cp "%CLASSPATH%" %ZOOMAIN% %* - -endlocal - +@echo off +REM Licensed to the Apache Software Foundation (ASF) under one or more +REM contributor license agreements. See the NOTICE file distributed with +REM this work for additional information regarding copyright ownership. +REM The ASF licenses this file to You under the Apache License, Version 2.0 +REM (the "License"); you may not use this file except in compliance with +REM the License. You may obtain a copy of the License at +REM +REM http://www.apache.org/licenses/LICENSE-2.0 +REM +REM Unless required by applicable law or agreed to in writing, software +REM distributed under the License is distributed on an "AS IS" BASIS, +REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +REM See the License for the specific language governing permissions and +REM limitations under the License. + +setlocal +call "%~dp0zkEnv.cmd" + +set ZOOMAIN=org.apache.zookeeper.ZooKeeperMain +call %JAVA% "-Dzookeeper.log.dir=%ZOO_LOG_DIR%" "-Dzookeeper.root.logger=%ZOO_LOG4J_PROP%" -cp "%CLASSPATH%" %ZOOMAIN% %* + +endlocal + Propchange: zookeeper/trunk/bin/zkCli.cmd ------------------------------------------------------------------------------ svn:eol-style = native Modified: zookeeper/trunk/bin/zkServer.cmd URL: http://svn.apache.org/viewvc/zookeeper/trunk/bin/zkServer.cmd?rev=1584497&r1=1584496&r2=1584497&view=diff ============================================================================== --- zookeeper/trunk/bin/zkServer.cmd (original) +++ zookeeper/trunk/bin/zkServer.cmd Fri Apr 4 01:24:37 2014 @@ -1,24 +1,24 @@ -@echo off -REM Licensed to the Apache Software Foundation (ASF) under one or more -REM contributor license agreements. See the NOTICE file distributed with -REM this work for additional information regarding copyright ownership. -REM The ASF licenses this file to You under the Apache License, Version 2.0 -REM (the "License"); you may not use this file except in compliance with -REM the License. You may obtain a copy of the License at -REM -REM http://www.apache.org/licenses/LICENSE-2.0 -REM -REM Unless required by applicable law or agreed to in writing, software -REM distributed under the License is distributed on an "AS IS" BASIS, -REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -REM See the License for the specific language governing permissions and -REM limitations under the License. - -setlocal -call "%~dp0zkEnv.cmd" - -set ZOOMAIN=org.apache.zookeeper.server.quorum.QuorumPeerMain -echo on -call %JAVA% "-Dzookeeper.log.dir=%ZOO_LOG_DIR%" "-Dzookeeper.root.logger=%ZOO_LOG4J_PROP%" -cp "%CLASSPATH%" %ZOOMAIN% "%ZOOCFG%" %* - -endlocal +@echo off +REM Licensed to the Apache Software Foundation (ASF) under one or more +REM contributor license agreements. See the NOTICE file distributed with +REM this work for additional information regarding copyright ownership. +REM The ASF licenses this file to You under the Apache License, Version 2.0 +REM (the "License"); you may not use this file except in compliance with +REM the License. You may obtain a copy of the License at +REM +REM http://www.apache.org/licenses/LICENSE-2.0 +REM +REM Unless required by applicable law or agreed to in writing, software +REM distributed under the License is distributed on an "AS IS" BASIS, +REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +REM See the License for the specific language governing permissions and +REM limitations under the License. + +setlocal +call "%~dp0zkEnv.cmd" + +set ZOOMAIN=org.apache.zookeeper.server.quorum.QuorumPeerMain +echo on +call %JAVA% "-Dzookeeper.log.dir=%ZOO_LOG_DIR%" "-Dzookeeper.root.logger=%ZOO_LOG4J_PROP%" -cp "%CLASSPATH%" %ZOOMAIN% "%ZOOCFG%" %* + +endlocal Propchange: zookeeper/trunk/bin/zkServer.cmd ------------------------------------------------------------------------------ svn:eol-style = native