Author: chirino
Date: Sat Oct 23 19:44:06 2010
New Revision: 1026670
URL: http://svn.apache.org/viewvc?rev=1026670&view=rev
Log:
better windows setup
Added:
activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo.cmd
(with props)
Removed:
activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo.bat
Modified:
activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/unix-bin.xml
(contents, props changed)
activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/windows-bin.xml
(contents, props changed)
Modified:
activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/unix-bin.xml
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/unix-bin.xml?rev=1026670&r1=1026669&r2=1026670&view=diff
==============================================================================
---
activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/unix-bin.xml
(original)
+++
activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/unix-bin.xml
Sat Oct 23 19:44:06 2010
@@ -39,6 +39,7 @@
<filtered>true</filtered>
<excludes>
<exclude>*.bat</exclude>
+ <exclude>*.cmd</exclude>
</excludes>
</fileSet>
Propchange:
activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/unix-bin.xml
------------------------------------------------------------------------------
svn:executable = *
Modified:
activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/windows-bin.xml
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/windows-bin.xml?rev=1026670&r1=1026669&r2=1026670&view=diff
==============================================================================
---
activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/windows-bin.xml
(original)
+++
activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/windows-bin.xml
Sat Oct 23 19:44:06 2010
@@ -38,6 +38,7 @@
<filtered>true</filtered>
<includes>
<include>*.bat</include>
+ <include>*.cmd</include>
</includes>
</fileSet>
Propchange:
activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/windows-bin.xml
------------------------------------------------------------------------------
svn:executable = *
Added:
activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo.cmd
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo.cmd?rev=1026670&view=auto
==============================================================================
---
activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo.cmd
(added)
+++
activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo.cmd
Sat Oct 23 19:44:06 2010
@@ -0,0 +1,86 @@
+...@echo off
+rem ------------------------------------------------------------------------
+rem
+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.
+rem
+rem ------------------------------------------------------------------------
+
+setlocal
+
+if "%APOLLO_HOME%"=="" set APOLLO_HOME=%~dp0..
+if exist "%APOLLO_HOME%\bin\apollo.cmd" goto CHECK_JAVA
+
+:NO_HOME
+echo APOLLO_HOME environment variable is set incorrectly. Please set
APOLLO_HOME.
+goto END
+
+:CHECK_JAVA
+set _JAVACMD=%JAVACMD%
+
+if "%JAVA_HOME%" == "" goto NO_JAVA_HOME
+if not exist "%JAVA_HOME%\bin\java.exe" goto NO_JAVA_HOME
+if "%_JAVACMD%" == "" set _JAVACMD=%JAVA_HOME%\bin\java.exe
+goto RUN_JAVA
+
+:NO_JAVA_HOME
+if "%_JAVACMD%" == "" set _JAVACMD=java.exe
+echo.
+echo Warning: JAVA_HOME environment variable is not set.
+echo.
+
+:RUN_JAVA
+
+if "%APOLLO_BASE%" == "" set APOLLO_BASE=%APOLLO_HOME%
+
+set CLASSPATH=%APOLLO_BASE%\etc
+
+rem if not exist "%APOLLO_HOME%\lib\patches" goto NO_LIB_PATCHES
+rem for %%i in ("%APOLLO_HOME%\lib\patches\*.jar") do call :ADD_CLASSPATH %%i
+rem :NO_LIB_PATCHES
+
+for %%i in ("%APOLLO_HOME%\lib\*.jar") do call :ADD_CLASSPATH %%i
+
+if "%APOLLO_OPTS%" == "" set APOLLO_OPTS=-server -Xmx1G
+
+set JVM_FLAGS=%APOLLO_OPTS%
+
+if "x%APOLLO_DEBUG%" == "x" goto noDEBUG
+ set JVM_FLAGS=%JVM_FLAGS% -Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspEND=n,address=5005
+:noDEBUG
+
+if "x%APOLLO_PROFILE%" == "x" goto noPROFILE
+ set JVM_FLAGS=-agentlib:yjpagent %JVM_FLAGS%
+:noPROFILE
+
+if "%JMX_OPTS%" == "" set JMX_OPTS=-Dcom.sun.management.jmxremote
+rem set JMX_OPTS=-Dcom.sun.management.jmxremote.port=1099
-Dcom.sun.management.jmxremote.authenticate=false
-Dcom.sun.management.jmxremote.ssl=false
+set JVM_FLAGS=%JVM_FLAGS% %JMX_OPTS%
+
+set JVM_FLAGS=%JVM_FLAGS% -Dapollo.home="%APOLLO_HOME%"
-Dapollo.base="%APOLLO_BASE%"
+set JVM_FLAGS=%JVM_FLAGS% -classpath "%CLASSPATH%"
+
+rem echo "%_JAVACMD%" %JVM_FLAGS% org.apache.activemq.apollo.cli.Apollo %*
+"%_JAVACMD%" %JVM_FLAGS% org.apache.activemq.apollo.cli.Apollo %*
+
+:END
+endlocal
+GOTO :EOF
+
+:ADD_CLASSPATH
+ set CLASSPATH=%CLASSPATH%;%1
+ GOTO :EOF
+
+:EOF
\ No newline at end of file
Propchange:
activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo.cmd
------------------------------------------------------------------------------
svn:executable = *
