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 98433108F8 for ; Thu, 10 Apr 2014 03:20:50 +0000 (UTC) Received: (qmail 38406 invoked by uid 500); 10 Apr 2014 03:20:50 -0000 Delivered-To: apmail-zookeeper-commits-archive@zookeeper.apache.org Received: (qmail 38304 invoked by uid 500); 10 Apr 2014 03:20:44 -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 38295 invoked by uid 99); 10 Apr 2014 03:20:41 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Apr 2014 03:20:41 +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; Thu, 10 Apr 2014 03:20:40 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8F25223888D7; Thu, 10 Apr 2014 03:20:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1586200 - /zookeeper/trunk/bin/zkEnv.cmd Date: Thu, 10 Apr 2014 03:20:17 -0000 To: commits@zookeeper.apache.org From: michim@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140410032017.8F25223888D7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: michim Date: Thu Apr 10 03:20:17 2014 New Revision: 1586200 URL: http://svn.apache.org/r1586200 Log: zkEnv.cmd: Set svn:eol-style property to 'native'. Modified: zookeeper/trunk/bin/zkEnv.cmd (contents, props changed) Modified: zookeeper/trunk/bin/zkEnv.cmd URL: http://svn.apache.org/viewvc/zookeeper/trunk/bin/zkEnv.cmd?rev=1586200&r1=1586199&r2=1586200&view=diff ============================================================================== --- zookeeper/trunk/bin/zkEnv.cmd (original) +++ zookeeper/trunk/bin/zkEnv.cmd Thu Apr 10 03:20:17 2014 @@ -1,47 +1,48 @@ -@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 +@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 + Propchange: zookeeper/trunk/bin/zkEnv.cmd ------------------------------------------------------------------------------ svn:eol-style = native