servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r541470 - in /incubator/servicemix/branches/osgi/servicemix-osgi/installers: pom.xml src/main/installers/inno-servicemix.iss src/main/installers/servicemix.bat src/main/installers/servicemix.sh
Date Thu, 24 May 2007 23:08:18 GMT
Author: gnodet
Date: Thu May 24 16:08:16 2007
New Revision: 541470

URL: http://svn.apache.org/viewvc?view=rev&rev=541470
Log:
Add batch files in the installers

Added:
    incubator/servicemix/branches/osgi/servicemix-osgi/installers/src/main/installers/servicemix.bat
  (with props)
Modified:
    incubator/servicemix/branches/osgi/servicemix-osgi/installers/pom.xml
    incubator/servicemix/branches/osgi/servicemix-osgi/installers/src/main/installers/inno-servicemix.iss
    incubator/servicemix/branches/osgi/servicemix-osgi/installers/src/main/installers/servicemix.sh

Modified: incubator/servicemix/branches/osgi/servicemix-osgi/installers/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/osgi/servicemix-osgi/installers/pom.xml?view=diff&rev=541470&r1=541469&r2=541470
==============================================================================
--- incubator/servicemix/branches/osgi/servicemix-osgi/installers/pom.xml (original)
+++ incubator/servicemix/branches/osgi/servicemix-osgi/installers/pom.xml Thu May 24 16:08:16
2007
@@ -85,7 +85,7 @@
           <application>
             <name>servicemix</name>
             <version>${pom.version}</version>
-            <copyrightYear>2006</copyrightYear>
+            <copyrightYear>2007</copyrightYear>
             <minimumJavaVersion>1.5</minimumJavaVersion>
             <url>http://incubator.apache.org/servicemix</url>
             <email>servicemix-dev@geronimo.apache.org</email>
@@ -102,6 +102,14 @@
               <destinationPath>conf/config.properties</destinationPath>
             </packagedFile>
             <packagedFile>
+              <source>servicemix.sh</source>
+              <destinationPath>bin/servicemix.sh</destinationPath>
+            </packagedFile>
+            <packagedFile>
+              <source>servicemix.bat</source>
+              <destinationPath>bin/servicemix.bat</destinationPath>
+            </packagedFile>
+            <packagedFile>
               <dependency>true</dependency>
               <source>org.apache.felix:org.apache.felix.main</source>
               <destinationPath>
@@ -193,9 +201,6 @@
               <daemonFramework>jsvc</daemonFramework>
             </izPackTarget>
             <izPackTarget>
-              <finalName>
-                servicemix-${pom.version}-solaris-sparc-setup.jar
-              </finalName>
               <id>solaris-jsvc-sparc</id>
               <izPackInstallFile>
                 src/main/installers/izpack-unix.xml
@@ -203,6 +208,9 @@
               <izPackShortcutsUnixFile>
                 src/main/installers/unix_shortcuts.xml
               </izPackShortcutsUnixFile>
+              <finalName>
+                servicemix-${pom.version}-solaris-sparc-setup.jar
+              </finalName>
               <osName>sunos</osName>
               <osFamily>unix</osFamily>
               <osArch>sparc</osArch>

Modified: incubator/servicemix/branches/osgi/servicemix-osgi/installers/src/main/installers/inno-servicemix.iss
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/osgi/servicemix-osgi/installers/src/main/installers/inno-servicemix.iss?view=diff&rev=541470&r1=541469&r2=541470
==============================================================================
--- incubator/servicemix/branches/osgi/servicemix-osgi/installers/src/main/installers/inno-servicemix.iss
(original)
+++ incubator/servicemix/branches/osgi/servicemix-osgi/installers/src/main/installers/inno-servicemix.iss
Thu May 24 16:08:16 2007
@@ -44,6 +44,8 @@
 ; bin directory targets
 Source: {#SourceBase}\bin\${app}w.exe; DestDir: {app}\bin; Tasks: ; Languages: 
 Source: {#SourceBase}\bin\${app}.exe; DestDir: {app}\bin
+Source: {#SourceBase}\bin\${app}.sh; DestDir: {app}\bin
+Source: {#SourceBase}\bin\${app}.bat; DestDir: {app}\bin
 Source: {#SourceBase}\bin\bootstrapper.jar; DestDir: {app}\bin; DestName: bootstrapper.jar
 Source: {#SourceBase}\bin\servicemix.jar; DestDir: {app}\bin; DestName: servicemix.jar
 Source: {#SourceBase}\bin\logger.jar; DestDir: {app}\bin; DestName: logger.jar

Added: incubator/servicemix/branches/osgi/servicemix-osgi/installers/src/main/installers/servicemix.bat
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/osgi/servicemix-osgi/installers/src/main/installers/servicemix.bat?view=auto&rev=541470
==============================================================================
--- incubator/servicemix/branches/osgi/servicemix-osgi/installers/src/main/installers/servicemix.bat
(added)
+++ incubator/servicemix/branches/osgi/servicemix-osgi/installers/src/main/installers/servicemix.bat
Thu May 24 16:08:16 2007
@@ -0,0 +1,128 @@
+@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 
+rem $Id: servicemix.bat 979 2005-11-30 22:50:55Z bsnyder $
+rem 
+
+if not "%ECHO%" == "" echo %ECHO%
+
+setlocal
+set DIRNAME=%~dp0%
+set PROGNAME=%~nx0%
+set ARGS=%*
+
+title ServiceMix
+
+goto BEGIN
+
+:warn
+    echo %PROGNAME%: %*
+goto :EOF
+
+:BEGIN
+
+rem # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+
+if not "%SERVICEMIX_HOME%" == "" (
+    call :warn Ignoring predefined value for SERVICEMIX_HOME
+)
+set SERVICEMIX_HOME=%DIRNAME%..
+if not exist "%SERVICEMIX_HOME%" (
+    call :warn SERVICEMIX_HOME is not valid: %SERVICEMIX_HOME%
+    goto END
+)
+
+set LOCAL_CLASSPATH=%CLASSPATH%
+set DEFAULT_JAVA_OPTS=-server -Xmx512M -Dderby.system.home="%SERVICEMIX_HOME%\var" -Dderby.storage.fileSyncTransactionLog=true
-Dcom.sun.management.jmxremote
+set CLASSPATH=%LOCAL_CLASSPATH%;%SERVICEMIX_HOME%\conf
+set DEFAULT_JAVA_DEBUG_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005
+
+if "%LOCAL_CLASSPATH%" == "" goto :SERVICEMIX_CLASSPATH_EMPTY
+    set CLASSPATH=%LOCAL_CLASSPATH%;%SERVICEMIX_HOME%\conf
+    goto :SERVICEMIX_CLASSPATH_END
+:SERVICEMIX_CLASSPATH_EMPTY
+    set CLASSPATH=%SERVICEMIX_HOME%\conf
+:SERVICEMIX_CLASSPATH_END
+
+rem Setup Servicemix Home
+if exist "%SERVICEMIX_HOME%\conf\servicemix-rc.cmd" call %SERVICEMIX_HOME%\conf\servicemix-rc.cmd
+if exist "%HOME%\servicemix-rc.cmd" call %HOME%\servicemix-rc.cmd
+
+rem Support for loading native libraries
+set PATH=%PATH%;%SERVICEMIX_HOME%\lib
+
+rem Setup the Java Virtual Machine
+if not "%JAVA%" == "" goto :Check_JAVA_END
+    set JAVA=java
+    if "%JAVA_HOME%" == "" call :warn JAVA_HOME not set; results may vary
+    if not "%JAVA_HOME%" == "" set JAVA=%JAVA_HOME%\bin\java
+    if not exist "%JAVA_HOME%" (
+        call :warn JAVA_HOME is not valid: %JAVA_HOME%
+        goto END
+    )
+:Check_JAVA_END
+
+if "%JAVA_OPTS%" == "" set JAVA_OPTS=%DEFAULT_JAVA_OPTS%
+
+if "%SERVICEMIX_DEBUG%" == "" goto :SERVICEMIX_DEBUG_END
+    rem Use the defaults if JAVA_DEBUG_OPTS was not set
+    if "%JAVA_DEBUG_OPTS%" == "" set JAVA_DEBUG_OPTS=%DEFAULT_JAVA_DEBUG_OPTS%
+    
+    set "JAVA_OPTS=%JAVA_DEBUG_OPTS% %JAVA_OPTS%"
+    call :warn Enabling Java debug options: %JAVA_DEBUG_OPTS%
+:SERVICEMIX_DEBUG_END
+
+if "%SERVICEMIX_PROFILER%" == "" goto :SERVICEMIX_PROFILER_END
+    set SERVICEMIX_PROFILER_SCRIPT=%SERVICEMIX_HOME%\conf\profiler\%SERVICEMIX_PROFILER%.cmd
+    
+    if exist "%SERVICEMIX_PROFILER_SCRIPT%" goto :SERVICEMIX_PROFILER_END
+    call :warn Missing configuration for profiler '%SERVICEMIX_PROFILER%': %SERVICEMIX_PROFILER_SCRIPT%
+    goto END
+:SERVICEMIX_PROFILER_END
+
+rem Setup the classpath
+set CLASSPATH=%CLASSPATH%;%SERVICEMIX_HOME%\lib\classworlds-1.0.1.jar
+
+rem Setup boot options
+set CLASSWORLDS_CONF=%SERVICEMIX_HOME%\conf\servicemix.conf
+set BOOT_OPTS=%BOOT_OPTS% -Dclassworlds.conf="%CLASSWORLDS_CONF%"
+set BOOT_OPTS=%BOOT_OPTS% -Dservicemix.home="%SERVICEMIX_HOME%"
+set BOOT_OPTS=%BOOT_OPTS% -Djava.endorsed.dirs="%SERVICEMIX_HOME%\lib\endorsed"
+
+rem Execute the JVM or the load the profiler
+if "%SERVICEMIX_PROFILER%" == "" goto :EXECUTE
+    rem Execute the profiler if it has been configured
+    call :warn Loading profiler script: %SERVICEMIX_PROFILER_SCRIPT%
+    call %SERVICEMIX_PROFILER_SCRIPT%
+
+:EXECUTE
+    rem Execute the Java Virtual Machine
+    cd "%SERVICEMIX_HOME%"
+    "%JAVA%" %JAVA_OPTS% -Dservicemix.home="%SERVICEMIX_HOME%" -jar "%SERVICEMIX_HOME%\bin\bootstrapper.jar"
"%SERVICEMIX_HOME%" start
+
+rem # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+
+:END
+
+endlocal
+
+if not "%PAUSE%" == "" pause
+
+:END_NO_PAUSE
+

Propchange: incubator/servicemix/branches/osgi/servicemix-osgi/installers/src/main/installers/servicemix.bat
------------------------------------------------------------------------------
    svn:eol-style = CRLF

Propchange: incubator/servicemix/branches/osgi/servicemix-osgi/installers/src/main/installers/servicemix.bat
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: incubator/servicemix/branches/osgi/servicemix-osgi/installers/src/main/installers/servicemix.sh
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/osgi/servicemix-osgi/installers/src/main/installers/servicemix.sh?view=diff&rev=541470&r1=541469&r2=541470
==============================================================================
--- incubator/servicemix/branches/osgi/servicemix-osgi/installers/src/main/installers/servicemix.sh
(original)
+++ incubator/servicemix/branches/osgi/servicemix-osgi/installers/src/main/installers/servicemix.sh
Thu May 24 16:08:16 2007
@@ -30,6 +30,11 @@
     export JAVA_MIN_MEM
 fi
 
+if [ "x$JAVA_MAX_MEM" = "x" ]; then
+    JAVA_MAX_MEM=512M
+    export JAVA_MAX_MEM
+fi
+
 detectOS() {
     # OS specific support (must be 'true' or 'false').
     cygwin=false;
@@ -84,6 +89,17 @@
     fi
 }
 
+locateHome() {
+    if [ "x$SERVICEMIX_HOME" != "x" ]; then
+        warn "Ignoring predefined value for SERVICEMIX_HOME"
+    fi
+    
+    SERVICEMIX_HOME=`cd $DIRNAME/..; pwd`
+    if [ ! -d "$SERVICEMIX_HOME" ]; then
+        die "SERVICEMIX_HOME is not valid: $SERVICEMIX_HOME"
+    fi
+}
+
 setupNativePath() {
     # Support for loading native libraries
     LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:$SERVICEMIX_HOME/lib"
@@ -118,7 +134,7 @@
 }
 
 detectJVM() {
-   echo "`$JAVA -version`"
+   #echo "`$JAVA -version`"
    # This service should call `java -version`, 
    # read stdout, and look for hints
    if $JAVA -version 2>&1 | grep "^IBM" ; then
@@ -132,15 +148,49 @@
    # echo "JVM vendor is $JVM_VENDOR"
 }
 
-locateHome() {
-    if [ "x$SERVICEMIX_HOME" != "x" ]; then
-        warn "Ignoring predefined value for SERVICEMIX_HOME"
+setupDebugOptions() {
+    if [ "x$JAVA_OPTS" = "x" ]; then
+        JAVA_OPTS="$DEFAULT_JAVA_OPTS"
+    fi
+    export JAVA_OPTS
+    
+    # Set Debug options if enabled
+    if [ "x$SERVICEMIX_DEBUG" != "x" ]; then
+        # Use the defaults if JAVA_DEBUG_OPTS was not set
+        if [ "x$JAVA_DEBUG_OPTS" = "x" ]; then
+            JAVA_DEBUG_OPTS="$DEFAULT_JAVA_DEBUG_OPTS"
+        fi
+        
+        JAVA_OPTS="$JAVA_DEBUG_OPTS $JAVA_OPTS"
+        warn "Enabling Java debug options: $JAVA_DEBUG_OPTS"
     fi
-    
-    SERVICEMIX_HOME=`cd $DIRNAME/..; pwd`
-    if [ ! -d "$SERVICEMIX_HOME" ]; then
-        die "SERVICEMIX_HOME is not valid: $SERVICEMIX_HOME"
+}
+
+setupDefaults() {
+    DEFAULT_JAVA_OPTS="-Xms$JAVA_MIN_MEM -Xmx$JAVA_MAX_MEM "
+
+    #Set the JVM_VENDOR specific JVM flags
+    if [ "$JVM_VENDOR" = "SUN" ]; then
+        DEFAULT_JAVA_OPTS="-server $DEFAULT_JAVA_OPTS"
+    elif [ "$JVM_VENDOR" = "IBM" ]; then
+        if $os400; then
+            DEFAULT_JAVA_OPTS="$DEFAULT_JAVA_OPTS"
+        elif $aix; then
+            DEFAULT_JAVA_OPTS="-Xverify:none -Xlp $DEFAULT_JAVA_OPTS"
+        else
+            DEFAULT_JAVA_OPTS="-Xverify:none $DEFAULT_JAVA_OPTS"
+        fi
     fi
+
+    # Add the conf directory so it picks up the Log4J config
+    CLASSPATH="$CLASSPATH:$SERVICEMIX_HOME/conf"
+    DEFAULT_JAVA_DEBUG_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005"
+    
+    ##
+    ## TODO: Move to conf/profiler/yourkit.{sh|cmd}
+    ##
+    # Uncomment to enable YourKit profiling
+    #DEFAULT_JAVA_DEBUG_OPTS="-Xrunyjpagent"
 }
 
 init() {
@@ -153,11 +203,21 @@
     # Locate the ServiceMix home directory
     locateHome
     
+    # Setup the native library path
+    setupNativePath
+    
     # Locate the Java VM to execute
     locateJava
     
     # Determine the JVM vendor
     detectJVM
+    
+    # Setup default options
+    setupDefaults
+    
+    # Install debug options
+    setupDebugOptions
+    
 }
 
 run() {
@@ -170,8 +230,12 @@
         CYGHOME=`cygpath --windows "$HOME"`
         JAR=`cygpath --windows "$JAR"`
     fi
-    cd $SERVICEMIX_HOME/conf
-    exec $JAVA -Dfelix.home=$SERVICEMIX_HOME -jar $JAR $SERVICEMIX_HOME start 
+    cd "$SERVICEMIX_HOME"
+    if [ "x$1" = "x" ] ; then
+        exec $JAVA $JAVA_OPTS -Dservicemix.home="$SERVICEMIX_HOME" -jar "$JAR" "$SERVICEMIX_HOME"
start 
+    else
+        exec $JAVA $JAVA_OPTS -Dservicemix.home="$SERVICEMIX_HOME" -jar "$JAR" "$SERVICEMIX_HOME"
"$1" 
+    fi
 }
 
 main() {



Mime
View raw message