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 EABFE11C59 for ; Fri, 4 Apr 2014 01:30:55 +0000 (UTC) Received: (qmail 89902 invoked by uid 500); 4 Apr 2014 01:30:54 -0000 Delivered-To: apmail-zookeeper-commits-archive@zookeeper.apache.org Received: (qmail 89816 invoked by uid 500); 4 Apr 2014 01:30:53 -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 89685 invoked by uid 99); 4 Apr 2014 01:30:53 -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:30:53 +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:30:49 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B70B123889F1; Fri, 4 Apr 2014 01:30:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1584500 [1/9] - in /zookeeper/branches/branch-3.4: 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/in... Date: Fri, 04 Apr 2014 01:30:25 -0000 To: commits@zookeeper.apache.org From: michim@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140404013026.B70B123889F1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: michim Date: Fri Apr 4 01:30:24 2014 New Revision: 1584500 URL: http://svn.apache.org/r1584500 Log: Set svn:eol-style property to native. Modified: zookeeper/branches/branch-3.4/bin/README.txt (contents, props changed) zookeeper/branches/branch-3.4/bin/zkCli.cmd (contents, props changed) zookeeper/branches/branch-3.4/bin/zkEnv.cmd (contents, props changed) zookeeper/branches/branch-3.4/bin/zkServer.cmd (contents, props changed) zookeeper/branches/branch-3.4/src/c/c-doc.Doxyfile (contents, props changed) zookeeper/branches/branch-3.4/src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/date.format.js (contents, props changed) zookeeper/branches/branch-3.4/src/contrib/zooinspector/README.txt (contents, props changed) zookeeper/branches/branch-3.4/src/contrib/zooinspector/build.xml (contents, props changed) zookeeper/branches/branch-3.4/src/contrib/zooinspector/ivy.xml (contents, props changed) zookeeper/branches/branch-3.4/src/contrib/zooinspector/lib/log4j.properties (contents, props changed) zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/ZooInspector.java (contents, props changed) zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/encryption/BasicDataEncryptionManager.java (contents, props changed) zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/encryption/DataEncryptionManager.java (contents, props changed) zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/NodeViewersChangeListener.java (contents, props changed) zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorAboutDialog.java (contents, props changed) zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorConnectionPropertiesDialog.java (contents, props changed) zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorIconResources.java (contents, props changed) zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorNodeViewersDialog.java (contents, props changed) zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorNodeViewersPanel.java (contents, props changed) zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorPanel.java (contents, props changed) zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorTreeViewer.java (contents, props changed) zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/about.html (contents, props changed) zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeViewerACL.java (contents, props changed) zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeViewerData.java (contents, props changed) zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeViewerMetaData.java (contents, props changed) zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/nodeviewer/ZooInspectorNodeViewer.java (contents, props changed) zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/logger/LoggerFactory.java (contents, props changed) zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/NodeListener.java (contents, props changed) zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/Pair.java (contents, props changed) zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorManager.java (contents, props changed) zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorManagerImpl.java (contents, props changed) zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorNodeManager.java (contents, props changed) zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/retry/ZooKeeperRetry.java (contents, props changed) zookeeper/branches/branch-3.4/src/contrib/zooinspector/zooInspector-dev.sh (contents, props changed) zookeeper/branches/branch-3.4/src/contrib/zooinspector/zooInspector.cmd (contents, props changed) zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/SnapshotFormatter.java (contents, props changed) zookeeper/branches/branch-3.4/src/java/test/org/apache/zookeeper/server/PrepRequestProcessorTest.java (contents, props changed) zookeeper/branches/branch-3.4/src/java/test/org/apache/zookeeper/test/FLEPredicateTest.java (contents, props changed) zookeeper/branches/branch-3.4/src/java/test/org/apache/zookeeper/test/ObserverLETest.java (contents, props changed) zookeeper/branches/branch-3.4/src/java/test/org/apache/zookeeper/test/SessionInvalidationTest.java (contents, props changed) Modified: zookeeper/branches/branch-3.4/bin/README.txt URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/bin/README.txt?rev=1584500&r1=1584499&r2=1584500&view=diff ============================================================================== --- zookeeper/branches/branch-3.4/bin/README.txt (original) +++ zookeeper/branches/branch-3.4/bin/README.txt Fri Apr 4 01:30:24 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/branches/branch-3.4/bin/README.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: zookeeper/branches/branch-3.4/bin/zkCli.cmd URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/bin/zkCli.cmd?rev=1584500&r1=1584499&r2=1584500&view=diff ============================================================================== --- zookeeper/branches/branch-3.4/bin/zkCli.cmd (original) +++ zookeeper/branches/branch-3.4/bin/zkCli.cmd Fri Apr 4 01:30:24 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/branches/branch-3.4/bin/zkCli.cmd ------------------------------------------------------------------------------ svn:eol-style = native Modified: zookeeper/branches/branch-3.4/bin/zkEnv.cmd URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/bin/zkEnv.cmd?rev=1584500&r1=1584499&r2=1584500&view=diff ============================================================================== --- zookeeper/branches/branch-3.4/bin/zkEnv.cmd (original) +++ zookeeper/branches/branch-3.4/bin/zkEnv.cmd Fri Apr 4 01:30:24 2014 @@ -1,47 +1,47 @@ -@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. - -set ZOOCFGDIR=%~dp0%..\conf -set ZOO_LOG_DIR=%~dp0%.. -set ZOO_LOG4J_PROP=INFO,CONSOLE - -REM for sanity sake assume Java 1.6 -REM see: http://java.sun.com/javase/6/docs/technotes/tools/windows/java.html - -REM add the zoocfg dir to classpath -set CLASSPATH=%ZOOCFGDIR% - -REM make it work in the release -SET CLASSPATH=%~dp0..\*;%~dp0..\lib\*;%CLASSPATH% - -REM make it work for developers -SET CLASSPATH=%~dp0..\build\classes;%~dp0..\build\lib\*;%CLASSPATH% - -set ZOOCFG=%ZOOCFGDIR%\zoo.cfg - -@REM setup java environment variables - -if not defined JAVA_HOME ( - echo Error: JAVA_HOME is not set. - goto :eof -) - -if not exist %JAVA_HOME%\bin\java.exe ( - echo Error: JAVA_HOME is incorrectly set. - goto :eof -) - +@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. + +set ZOOCFGDIR=%~dp0%..\conf +set ZOO_LOG_DIR=%~dp0%.. +set ZOO_LOG4J_PROP=INFO,CONSOLE + +REM for sanity sake assume Java 1.6 +REM see: http://java.sun.com/javase/6/docs/technotes/tools/windows/java.html + +REM add the zoocfg dir to classpath +set CLASSPATH=%ZOOCFGDIR% + +REM make it work in the release +SET CLASSPATH=%~dp0..\*;%~dp0..\lib\*;%CLASSPATH% + +REM make it work for developers +SET CLASSPATH=%~dp0..\build\classes;%~dp0..\build\lib\*;%CLASSPATH% + +set ZOOCFG=%ZOOCFGDIR%\zoo.cfg + +@REM setup java environment variables + +if not defined JAVA_HOME ( + echo Error: JAVA_HOME is not set. + goto :eof +) + +if not exist %JAVA_HOME%\bin\java.exe ( + echo Error: JAVA_HOME is incorrectly set. + goto :eof +) + set JAVA=%JAVA_HOME%\bin\java \ No newline at end of file Propchange: zookeeper/branches/branch-3.4/bin/zkEnv.cmd ------------------------------------------------------------------------------ svn:eol-style = native Modified: zookeeper/branches/branch-3.4/bin/zkServer.cmd URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/bin/zkServer.cmd?rev=1584500&r1=1584499&r2=1584500&view=diff ============================================================================== --- zookeeper/branches/branch-3.4/bin/zkServer.cmd (original) +++ zookeeper/branches/branch-3.4/bin/zkServer.cmd Fri Apr 4 01:30:24 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/branches/branch-3.4/bin/zkServer.cmd ------------------------------------------------------------------------------ svn:eol-style = native