geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r575179 - in /geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal: ./ src/main/assembly/ src/main/resources/ src/main/underlay/bin/
Date Thu, 13 Sep 2007 06:01:37 GMT
Author: jdillon
Date: Wed Sep 12 23:01:33 2007
New Revision: 575179

URL: http://svn.apache.org/viewvc?rev=575179&view=rev
Log:
Update the minimal boilerplate to install gshell bits, and use the assembly plugin to facilitate
more of the dirty work

Added:
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/assembly/
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/assembly/boilerplate.xml
  (with props)
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/start-server
      - copied unchanged from r575169, geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/startup
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/start-server.bat
      - copied, changed from r575169, geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/startup.bat
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/startup.bat
  (with props)
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/startup.sh
  (with props)
Removed:
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/startup
Modified:
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml?rev=575179&r1=575178&r2=575179&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml Wed Sep 12 23:01:33
2007
@@ -39,6 +39,140 @@
         Provides boilerplate files for all Geronimo minimal server (Little-G) assemblies.
     </description>
 
+    <dependencies>
+        <!-- lib/gshell Dependencies -->
+        
+        <dependency>
+            <groupId>org.apache.geronimo.gshell</groupId>
+            <artifactId>gshell-bootstrap</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.gshell</groupId>
+            <artifactId>gshell-core</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.gshell</groupId>
+            <artifactId>gshell-cli</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl104-over-slf4j</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.gshell.commands</groupId>
+            <artifactId>gshell-builtins</artifactId>
+        </dependency>
+        
+        <!-- lib Dependencies -->
+        
+        <dependency>
+            <groupId>asm</groupId>
+            <artifactId>asm</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>asm</groupId>
+            <artifactId>asm-commons</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>cglib</groupId>
+            <artifactId>cglib-nodep</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>commons-cli</groupId>
+            <artifactId>commons-cli</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>xpp3</groupId>
+            <artifactId>xpp3</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>xstream</groupId>
+            <artifactId>xstream</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-cli</artifactId>
+            <version>${version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+            <version>${version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-deploy-jsr88-bootstrapper</artifactId>
+            <version>${version}</version>
+        </dependency>
+        
+        <!--
+        FIXME: Bad idea for plugins
+        -->
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>woodstox</groupId>
+            <artifactId>wstx-asl</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-activation_1.1_spec</artifactId>
+        </dependency>
+        
+        <!-- lib/endorsed Dependencies -->
+        
+        <dependency>
+            <groupId>org.apache.yoko</groupId>
+            <artifactId>yoko-spec-corba</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.yoko</groupId>
+            <artifactId>yoko-rmi-spec</artifactId>
+        </dependency>
+    </dependencies>
+    
     <build>
         <plugins>
             <plugin>
@@ -46,115 +180,14 @@
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>install-lib</id>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>asm</groupId>
-                                    <artifactId>asm</artifactId>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>asm</groupId>
-                                    <artifactId>asm-commons</artifactId>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>cglib</groupId>
-                                    <artifactId>cglib-nodep</artifactId>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>commons-cli</groupId>
-                                    <artifactId>commons-cli</artifactId>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>commons-logging</groupId>
-                                    <artifactId>commons-logging</artifactId>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>log4j</groupId>
-                                    <artifactId>log4j</artifactId>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>xpp3</groupId>
-                                    <artifactId>xpp3</artifactId>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>xstream</groupId>
-                                    <artifactId>xstream</artifactId>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
-                                    <artifactId>geronimo-cli</artifactId>
-                                    <version>${version}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
-                                    <artifactId>geronimo-kernel</artifactId>
-                                    <version>${version}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
-                                    <artifactId>geronimo-deploy-jsr88-bootstrapper</artifactId>
-                                    <version>${version}</version>
-                                </artifactItem>
-                                <!-- TODO bad idea for plugins -->
-                                <artifactItem>
-                                    <groupId>javax.xml.bind</groupId>
-                                    <artifactId>jaxb-api</artifactId>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>com.sun.xml.bind</groupId>
-                                    <artifactId>jaxb-impl</artifactId>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.specs</groupId>
-                                    <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>woodstox</groupId>
-                                    <artifactId>wstx-asl</artifactId>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.specs</groupId>
-                                    <artifactId>geronimo-activation_1.1_spec</artifactId>
-                                </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>${project.build.directory}/classes/lib</outputDirectory>
-                        </configuration>
-                    </execution>
-
-                    <!-- HACK - Added by G3153 to get minimal assemblies working again.
 Needs to be removed as part of G3155 -->
-                    <execution>
-                        <id>install-lib-endorsed</id>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.yoko</groupId>
-                                    <artifactId>yoko-spec-corba</artifactId>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.yoko</groupId>
-                                    <artifactId>yoko-rmi-spec</artifactId>
-                                </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>${project.build.directory}/classes/lib/endorsed</outputDirectory>
-                        </configuration>
-                    </execution>
-
-                    <execution>
                         <id>unpack-schemas</id>
-                        <phase>compile</phase>
+                        <phase>generate-resources</phase>
                         <goals>
                             <goal>unpack</goal>
                         </goals>
                         <configuration>
+                            <outputDirectory>${project.build.directory}/schema</outputDirectory>
+                            
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.modules</groupId>
@@ -207,19 +240,18 @@
                                     <version>${version}</version>
                                 </artifactItem>
                             </artifactItems>
-                            <outputDirectory>${project.build.directory}/scratch/schema</outputDirectory>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
-
+            
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
                     <execution>
                         <id>flatten-schemas</id>
-                        <phase>compile</phase>
+                        <phase>process-resources</phase>
                         <goals>
                             <goal>run</goal>
                         </goals>
@@ -227,13 +259,52 @@
                             <tasks>
                                 <mkdir dir="${project.build.directory}/classes/schema"/>
                                 <copy todir="${project.build.directory}/classes/schema">
-                                    <fileset dir="${project.build.directory}/scratch/schema">
+                                    <fileset dir="${project.build.directory}/schema">
                                         <include name="**/*.xsd"/>
                                         <include name="**/*.dtd"/>
                                     </fileset>
                                     <mapper type="flatten"/>
                                 </copy>
                             </tasks>
+                        </configuration>
+                    </execution>
+                    
+                    <execution>
+                        <id>install-underlay</id>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <mkdir dir="${project.build.directory}/classes"/>
+                                <copy todir="${project.build.directory}/classes">
+                                    <fileset dir="${project.build.directory}/${project.build.finalName}/${project.build.finalName}">
+                                        <include name="**"/>
+                                    </fileset>
+                                </copy>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>boilerplate</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>directory-inline</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}</outputDirectory>
+                            <appendAssemblyId>false</appendAssemblyId>
+                            <descriptors>
+                                <descriptor>${pom.basedir}/src/main/assembly/boilerplate.xml</descriptor>
+                            </descriptors>
                         </configuration>
                     </execution>
                 </executions>

Added: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/assembly/boilerplate.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/assembly/boilerplate.xml?rev=575179&view=auto
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/assembly/boilerplate.xml
(added)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/assembly/boilerplate.xml
Wed Sep 12 23:01:33 2007
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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$ $Date$ -->
+
+<assembly>
+    <id>boilerplate</id>
+    
+    <fileSets>
+        <fileSet>
+            <directory>src/main/underlay</directory>
+            <outputDirectory>/</outputDirectory>
+        </fileSet>
+        
+        <!--
+        <fileSet>
+            <directory>src/main/underlay/bin</directory>
+            <outputDirectory>bin</outputDirectory>
+            <includes>
+                <include>gsh</include>
+                <include>startup</include>
+            </includes>
+            <lineEnding>unix</lineEnding>
+            <fileMode>0755</fileMode>
+        </fileSet>
+        
+        <fileSet>
+            <directory>src/main/underlay/bin</directory>
+            <outputDirectory>bin</outputDirectory>
+            <includes>
+                <include>gsh.bat</include>
+                <include>startup.bat</include>
+            </includes>
+            <lineEnding>dos</lineEnding>
+        </fileSet>
+        
+        <fileSet>
+            <directory>src/main/underlay/etc</directory>
+            <outputDirectory>etc</outputDirectory>
+        </fileSet>
+        -->
+    </fileSets>
+    
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>lib/gshell</outputDirectory>
+            <includes>
+                <include>org.slf4j:slf4j-api</include>
+                <include>org.slf4j:slf4j-log4j12</include>
+                <include>org.slf4j:jcl104-over-slf4j</include>
+                <include>org.apache.geronimo.gshell:gshell-command-api</include>
+                <include>org.apache.geronimo.gshell:gshell-cli</include>
+                <include>org.apache.geronimo.gshell:gshell-core</include>
+                <include>org.apache.geronimo.gshell:gshell-parser</include>
+                <include>org.apache.geronimo.gshell.support:gshell-ansi</include>
+                <include>org.apache.geronimo.gshell.support:gshell-clp</include>
+                <include>org.apache.geronimo.gshell.support:gshell-prefs</include>
+                <include>org.apache.geronimo.gshell.support:gshell-i18n</include>
+                <include>org.apache.geronimo.gshell.support:gshell-common</include>
+                <include>org.apache.geronimo.gshell:gshell-diet-log4j</include>
+                <include>org.apache.geronimo.gshell.commands:gshell-builtins</include>
+                <include>org.codehaus.plexus:plexus-utils</include>
+                <include>org.codehaus.plexus:plexus-component-api</include>
+                <include>org.codehaus.plexus:plexus-container-default</include>
+                <include>org.codehaus.plexus:plexus-expression-evaluator</include>
+                <include>jline:jline</include>
+                <include>com.thoughtworks.xstream:xstream</include>
+                <include>org.codehaus.groovy:groovy-all</include>
+                <include>org.apache.ant:ant</include>
+                <include>org.apache.ant:ant-launcher</include>
+            </includes>
+        </dependencySet>
+
+        <dependencySet>
+            <outputDirectory>lib/boot</outputDirectory>
+            <includes>
+                <include>org.codehaus.plexus:plexus-classworlds</include>
+            </includes>
+        </dependencySet>
+        
+        <dependencySet>
+            <outputDirectory>lib/boot</outputDirectory>
+            <!--
+            Strip off the version number to keep platform scripts simpler.
+            -->
+            <outputFileNameMapping>gshell-bootstrap.jar</outputFileNameMapping>
+            <includes>
+                <include>org.apache.geronimo.gshell:gshell-bootstrap</include>
+            </includes>
+        </dependencySet>
+        
+        <dependencySet>
+            <outputDirectory>lib</outputDirectory>
+            <includes>
+                <include>asm:asm</include>
+                <include>asm:asm-commons</include>
+                <include>cglib:cglib-nodep</include>
+                <include>commons-cli:commons-cli</include>
+                <include>log4j:log4j</include>
+                <include>xpp3:xpp3</include>
+                <include>xstream:xstream</include>
+                <include>javax.xml.bind:jaxb-api</include>
+                <include>com.sun.xml.bind:jaxb-impl</include>
+                <include>woodstox:xstx-asl</include>
+                <include>org.apache.geronimo.modules:geronimo-cli</include>
+                <include>org.apache.geronimo.modules:geronimo-kernel</include>
+                <include>org.apache.geronimo.modules:geronimo-deploy-jsr88-bootstrapper</include>
+                <include>org.apache.geronimo.specs:geronimo-stax-api_1.0_spec</include>
+                <include>org.apache.geronimo.specs:geronimo-activation_1.1_spec</include>
+            </includes>
+        </dependencySet>
+        
+        <dependencySet>
+            <outputDirectory>lib/endorsed</outputDirectory>
+            <includes>
+                <include>org.apache.yoko:yoko-spec-corba</include>
+                <include>org.apache.yoko:yoko-rmi-spec</include>
+            </includes>
+        </dependencySet>
+        
+    </dependencySets>
+
+</assembly>

Propchange: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/assembly/boilerplate.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/assembly/boilerplate.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/assembly/boilerplate.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/start-server.bat
(from r575169, geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/startup.bat)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/start-server.bat?p2=geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/start-server.bat&p1=geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/startup.bat&r1=575169&r2=575179&rev=575179&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/startup.bat
(original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/start-server.bat
Wed Sep 12 23:01:33 2007
@@ -29,7 +29,7 @@
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.\
 
-"%DIRNAME%\gsh.bat" %*
+"%DIRNAME%\gsh.bat" start-server %*
 
 :end
 

Added: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/startup.bat
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/startup.bat?rev=575179&view=auto
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/startup.bat
(added)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/startup.bat
Wed Sep 12 23:01:33 2007
@@ -0,0 +1,99 @@
+@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 $Rev$ $Date$
+@REM --------------------------------------------------------------------
+
+@REM --------------------------------------------------------------------
+@REM Startup batch file for Geronimo that starts Geronimo in a new window.
+@REM
+@REM This batch file calls the geronimo.bat script passing "start" as the
+@REM first argument followed by the arguments supplied by the caller.
+@REM
+@REM This batch file is based upon Tomcat's startup.bat file to enable
+@REM those familiar with Tomcat to quickly get started with Geronimo.
+@REM
+@REM Alternatively you can use the more comprehensive geronimo.bat file
+@REM directly.
+@REM
+@REM Invocation Syntax:
+@REM
+@REM   startup [geronimo_args ...]
+@REM
+@REM Environment Variable Prequisites:
+@REM
+@REM   Refer to the documentation in the geronimo.bat file for information
+@REM   on environment variables etc.
+@REM
+@REM --------------------------------------------------------------------
+
+@if "%GERONIMO_BATCH_ECHO%" == "on"  echo on
+@if not "%GERONIMO_BATCH_ECHO%" == "on"  echo off
+
+if "%OS%" == "Windows_NT" goto okOsCheck
+echo Cannot process Geronimo command - you are running an unsupported operating system.
+set ERRORLEVEL=1
+goto end
+
+:okOsCheck
+@setlocal enableextensions
+@set ERRORLEVEL=0
+
+if not "%GERONIMO_HOME%" == "" goto resolveHome
+@REM %~dp0 is expanded pathname of the current script
+set GERONIMO_HOME=%~dp0..
+
+@REM resolve .. and remove any trailing slashes
+:resolveHome
+set CURRENT_DIR=%cd%
+cd /d %GERONIMO_HOME%
+set GERONIMO_HOME=%cd%
+cd /d %CURRENT_DIR%
+
+:gotHome
+if exist "%GERONIMO_HOME%\bin\geronimo.bat" goto okHome
+echo The GERONIMO_HOME environment variable is not defined correctly
+echo This environment variable is needed to run this program
+set ERRORLEVEL=1
+goto end
+:okHome
+
+set EXECUTABLE=%GERONIMO_HOME%\bin\geronimo.bat
+
+@REM Check that target executable exists
+if exist "%EXECUTABLE%" goto okExec
+echo Cannot find %EXECUTABLE%
+echo This file is needed to run this program
+set ERRORLEVEL=1
+goto end
+:okExec
+
+@REM Get remaining unshifted command line arguments and save them in the
+set CMD_LINE_ARGS=
+:setArgs
+if ""%1""=="""" goto doneSetArgs
+set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
+shift
+goto setArgs
+:doneSetArgs
+
+call "%EXECUTABLE%" start %CMD_LINE_ARGS%
+
+:end
+@REM pause the batch file if GERONIMO_BATCH_PAUSE is set to 'on'
+if "%GERONIMO_BATCH_PAUSE%" == "on" pause
+@endlocal

Propchange: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/startup.bat
------------------------------------------------------------------------------
    svn:eol-style = CRLF

Propchange: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/startup.bat
------------------------------------------------------------------------------
    svn:executable = *

Propchange: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/startup.bat
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/startup.bat
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/startup.sh
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/startup.sh?rev=575179&view=auto
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/startup.sh
(added)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/startup.sh
Wed Sep 12 23:01:33 2007
@@ -0,0 +1,82 @@
+#!/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$ $Date$
+# --------------------------------------------------------------------
+
+# --------------------------------------------------------------------
+# Startup script file for Geronimo that starts Geronimo in the background.
+#
+# This script calls the geronimo.sh script passing "start" as the
+# first argument followed by the arguments supplied by the caller.
+#
+# This script is based upon Tomcat's startup.sh file to enable
+# those familiar with Tomcat to quickly get started with Geronimo.
+# 
+# Alternatively you can use the more comprehensive geronimo.sh file 
+# directly.
+#
+# Invocation Syntax:
+#
+#   startup.sh [geronimo_args ...]
+#
+# Environment Variable Prequisites:
+#
+#   Refer to the documentation in the geronimo.sh file for information
+#   on environment variables etc.
+#
+# --------------------------------------------------------------------
+
+os400=false
+case "`uname`" in
+CYGWIN*) cygwin=true;;
+OS400*) os400=true;;
+esac
+
+# resolve links - $0 may be a softlink
+PRG="$0"
+
+while [ -h "$PRG" ] ; do
+  ls=`ls -ld "$PRG"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    PRG="$link"
+  else
+    PRG=`dirname "$PRG"`/"$link"
+  fi
+done
+ 
+PRGDIR=`dirname "$PRG"`
+EXECUTABLE=geronimo.sh
+
+# Check that target executable exists
+if $os400; then
+  # -x will Only work on the os400 if the files are: 
+  # 1. owned by the user
+  # 2. owned by the PRIMARY group of the user
+  # this will not work if the user belongs in secondary groups
+  eval
+else
+  if [ ! -x "$PRGDIR"/"$EXECUTABLE" ]; then
+    echo "Cannot find $PRGDIR/$EXECUTABLE"
+    echo "This file is needed to run this program"
+    exit 1
+  fi
+fi 
+
+exec "$PRGDIR"/"$EXECUTABLE" start "$@"

Propchange: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/startup.sh
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/startup.sh
------------------------------------------------------------------------------
    svn:executable = *

Propchange: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/startup.sh
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL



Mime
View raw message