geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r567873 - in /geronimo/sandbox/server-gshell-launcher/assemblies/geronimo-jetty6-javaee5-gshell/src/main: assembly/bin.xml scripts/startup scripts/startup.bat
Date Mon, 20 Aug 2007 23:11:50 GMT
Author: jdillon
Date: Mon Aug 20 16:11:50 2007
New Revision: 567873

URL: http://svn.apache.org/viewvc?rev=567873&view=rev
Log:
Add helper scripts to invoke the start-server gshell command

Added:
    geronimo/sandbox/server-gshell-launcher/assemblies/geronimo-jetty6-javaee5-gshell/src/main/scripts/startup
    geronimo/sandbox/server-gshell-launcher/assemblies/geronimo-jetty6-javaee5-gshell/src/main/scripts/startup.bat
  (with props)
Modified:
    geronimo/sandbox/server-gshell-launcher/assemblies/geronimo-jetty6-javaee5-gshell/src/main/assembly/bin.xml

Modified: geronimo/sandbox/server-gshell-launcher/assemblies/geronimo-jetty6-javaee5-gshell/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/server-gshell-launcher/assemblies/geronimo-jetty6-javaee5-gshell/src/main/assembly/bin.xml?rev=567873&r1=567872&r2=567873&view=diff
==============================================================================
--- geronimo/sandbox/server-gshell-launcher/assemblies/geronimo-jetty6-javaee5-gshell/src/main/assembly/bin.xml
(original)
+++ geronimo/sandbox/server-gshell-launcher/assemblies/geronimo-jetty6-javaee5-gshell/src/main/assembly/bin.xml
Mon Aug 20 16:11:50 2007
@@ -41,19 +41,21 @@
             <directory>src/main/scripts</directory>
             <outputDirectory>bin</outputDirectory>
             <includes>
-                <include>gsh.bat</include>
+                <include>gsh</include>
+                <include>startup</include>
             </includes>
-            <lineEnding>dos</lineEnding>
+            <lineEnding>unix</lineEnding>
+            <fileMode>0755</fileMode>
         </fileSet>
         
         <fileSet>
             <directory>src/main/scripts</directory>
             <outputDirectory>bin</outputDirectory>
             <includes>
-                <include>gsh</include>
+                <include>gsh.bat</include>
+                <include>startup.bat</include>
             </includes>
-            <lineEnding>unix</lineEnding>
-            <fileMode>0755</fileMode>
+            <lineEnding>dos</lineEnding>
         </fileSet>
         
         <fileSet>
@@ -66,6 +68,11 @@
             <outputDirectory>/</outputDirectory>
             <excludes>
                 <exclude>META-INF/**</exclude>
+                
+                <!--
+                NOTE: Special handling of bin/* scripts from the boilerplate below
+                -->
+                <exclude>bin/**</exclude>
             </excludes>
         </fileSet>
         
@@ -90,6 +97,13 @@
             <includes>
                 <include>*.sh</include>
             </includes>
+            <excludes>
+                <!--
+                HACK: Keep out the old startup scripts for now.
+                -->
+                <exclude>startup*</exclude>
+                <exclude>geronimo*</exclude>
+            </excludes>
             <lineEnding>unix</lineEnding>
             <fileMode>0755</fileMode>
         </fileSet>
@@ -101,6 +115,13 @@
                 <include>*.bat</include>
                 <include>*.txt</include>
             </includes>
+            <excludes>
+                <!--
+                HACK: Keep out the old startup scripts for now.
+                -->
+                <exclude>startup*</exclude>
+                <exclude>geronimo*</exclude>
+            </excludes>
             <lineEnding>dos</lineEnding>
         </fileSet>
         

Added: geronimo/sandbox/server-gshell-launcher/assemblies/geronimo-jetty6-javaee5-gshell/src/main/scripts/startup
URL: http://svn.apache.org/viewvc/geronimo/sandbox/server-gshell-launcher/assemblies/geronimo-jetty6-javaee5-gshell/src/main/scripts/startup?rev=567873&view=auto
==============================================================================
--- geronimo/sandbox/server-gshell-launcher/assemblies/geronimo-jetty6-javaee5-gshell/src/main/scripts/startup
(added)
+++ geronimo/sandbox/server-gshell-launcher/assemblies/geronimo-jetty6-javaee5-gshell/src/main/scripts/startup
Mon Aug 20 16:11:50 2007
@@ -0,0 +1,28 @@
+#!/bin/sh
+##
+## Licensed to the Apache Software Foundation (ASF) under one
+## or more contributor license agreements.  See the NOTICE file
+## distributed with this work for additional information
+## regarding copyright ownership.  The ASF licenses this file
+## to you under the Apache License, Version 2.0 (the
+## "License"); you may not use this file except in compliance
+## with the License.  You may obtain a copy of the License at
+##
+##  http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing,
+## software distributed under the License is distributed on an
+## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+## KIND, either express or implied.  See the License for the
+## specific language governing permissions and limitations
+## under the License.
+##
+
+##
+## $Rev: 539227 $ $Date: 2007-05-17 19:48:49 -0700 (Thu, 17 May 2007) $
+##
+
+DIRNAME=`dirname "$0"`
+
+exec "$DIRNAME/gsh" start-server "$@"
+

Added: geronimo/sandbox/server-gshell-launcher/assemblies/geronimo-jetty6-javaee5-gshell/src/main/scripts/startup.bat
URL: http://svn.apache.org/viewvc/geronimo/sandbox/server-gshell-launcher/assemblies/geronimo-jetty6-javaee5-gshell/src/main/scripts/startup.bat?rev=567873&view=auto
==============================================================================
--- geronimo/sandbox/server-gshell-launcher/assemblies/geronimo-jetty6-javaee5-gshell/src/main/scripts/startup.bat
(added)
+++ geronimo/sandbox/server-gshell-launcher/assemblies/geronimo-jetty6-javaee5-gshell/src/main/scripts/startup.bat
Mon Aug 20 16:11:50 2007
@@ -0,0 +1,37 @@
+@if "%DEBUG%" == "" @echo off
+rem 
+rem Licensed to the Apache Software Foundation (ASF) under one
+rem or more contributor license agreements.  See the NOTICE file
+rem distributed with this work for additional information
+rem regarding copyright ownership.  The ASF licenses this file
+rem to you under the Apache License, Version 2.0 (the
+rem "License"); you may not use this file except in compliance
+rem with 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,
+rem software distributed under the License is distributed on an
+rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+rem KIND, either express or implied.  See the License for the
+rem specific language governing permissions and limitations
+rem under the License.
+rem 
+
+rem 
+rem $Rev$ $Date$
+rem 
+
+if "%OS%"=="Windows_NT" setlocal
+
+:begin
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.\
+
+"%DIRNAME%\gsh.bat" %*
+
+:end
+
+if "%OS%"=="Windows_NT" endlocal
+

Propchange: geronimo/sandbox/server-gshell-launcher/assemblies/geronimo-jetty6-javaee5-gshell/src/main/scripts/startup.bat
------------------------------------------------------------------------------
    svn:eol-style = CRLF

Propchange: geronimo/sandbox/server-gshell-launcher/assemblies/geronimo-jetty6-javaee5-gshell/src/main/scripts/startup.bat
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/server-gshell-launcher/assemblies/geronimo-jetty6-javaee5-gshell/src/main/scripts/startup.bat
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message