geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r988394 - in /geronimo/server/trunk/plugins/procrun: pom.xml src/main/resources/bin/service_pr.bat src/main/resources/server/ src/main/resources/server/MANIFEST.MF src/main/resources/shutdown/ src/main/resources/shutdown/MANIFEST.MF
Date Tue, 24 Aug 2010 05:44:34 GMT
Author: genspring
Date: Tue Aug 24 05:44:33 2010
New Revision: 988394

URL: http://svn.apache.org/viewvc?rev=988394&view=rev
Log:
GERONIMO-5531 Run server as windows service update in G3.0   Patch from Viola.

Added:
    geronimo/server/trunk/plugins/procrun/src/main/resources/server/
    geronimo/server/trunk/plugins/procrun/src/main/resources/server/MANIFEST.MF
    geronimo/server/trunk/plugins/procrun/src/main/resources/shutdown/
    geronimo/server/trunk/plugins/procrun/src/main/resources/shutdown/MANIFEST.MF
Modified:
    geronimo/server/trunk/plugins/procrun/pom.xml
    geronimo/server/trunk/plugins/procrun/src/main/resources/bin/service_pr.bat

Modified: geronimo/server/trunk/plugins/procrun/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/procrun/pom.xml?rev=988394&r1=988393&r2=988394&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/procrun/pom.xml (original)
+++ geronimo/server/trunk/plugins/procrun/pom.xml Tue Aug 24 05:44:33 2010
@@ -43,6 +43,25 @@
 
     <build>
         <plugins>
+        <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+        <execution>
+        <id>test-resources</id>
+        <phase>validate</phase>
+        <goals>
+        <goal>run</goal>
+        </goals>
+        <configuration>
+        <tasks>
+        <jar destfile="${basedir}/src/main/resources/bin/server.jar" manifest="${basedir}/src/main/resources/server/MANIFEST.MF"></jar>
+        <jar destfile="${basedir}/src/main/resources/bin/shutdown.jar" manifest="${basedir}/src/main/resources/shutdown/MANIFEST.MF"></jar>
+        </tasks>
+        </configuration>
+        </execution>
+        </executions>
+        </plugin>
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>

Modified: geronimo/server/trunk/plugins/procrun/src/main/resources/bin/service_pr.bat
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/procrun/src/main/resources/bin/service_pr.bat?rev=988394&r1=988393&r2=988394&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/procrun/src/main/resources/bin/service_pr.bat (original)
+++ geronimo/server/trunk/plugins/procrun/src/main/resources/bin/service_pr.bat Tue Aug 24
05:44:33 2010
@@ -196,7 +196,7 @@ set SHUTDOWN_ARGS=--user#system#--passwo
 :doneSetArgs
 
 @REM Setup the Java programming language agent
-set JAVA_AGENT_JAR=%GERONIMO_HOME%\bin\jpa.jar
+set JAVA_AGENT_JAR="%GERONIMO_HOME%\lib\agent\transformer.jar"
 set JAVA_AGENT_OPTS=
 if exist "%JAVA_AGENT_JAR%" set JAVA_AGENT_OPTS=-javaagent:^"%JAVA_AGENT_JAR%^"
 
@@ -212,7 +212,7 @@ set PR_STDERROR=%PR_LOGPATH%\geronimosrv
 @REM set jvm arguments to avoid killing the service when logging off, when using Sun JDK.
 set JVMARGS=-Xrs
 
-"%EXECUTABLE%" //IS//%SERVICE_NAME% --StartImage %JAVA_EXE% --StartPath "%GERONIMO_HOME%"
--StartMode exe --StartParams %JVMARGS%#%JAVA_AGENT_OPTS%#-Djava.endorsed.dirs="%GERONIMO_HOME%\lib\endorsed';'%JRE_HOME%\lib\endorsed"#-Djava.ext.dirs="%GERONIMO_HOME%\lib\ext';'%JRE_HOME%\lib\ext"#-Dorg.apache.geronimo.home.dir="%GERONIMO_HOME%"#-Djava.io.tmpdir="%GERONIMO_TMPDIR%"#-jar#"%GERONIMO_HOME%\bin\server.jar"#%STARTUP_ARGS%
--StopImage %JAVA_EXE% --StopPath "%GERONIMO_HOME%" --StopMode exe --StopParams %JAVA_AGENT_OPTS%#-Djava.endorsed.dirs="%GERONIMO_HOME%\lib\endorsed';'%JRE_HOME%\lib\endorsed"#-Djava.ext.dirs="%GERONIMO_HOME%\lib\ext';'%JRE_HOME%\lib\ext"#-Dorg.apache.geronimo.home.dir="%GERONIMO_HOME%"#-Djava.io.tmpdir="%GERONIMO_TMPDIR%"#-jar#"%GERONIMO_HOME%\bin\shutdown.jar"#%SHUTDOWN_ARGS%
+"%EXECUTABLE%" //IS//%SERVICE_NAME% --StartImage %JAVA_EXE% --StartPath "%GERONIMO_HOME%"
--StartMode exe --StartParams %JVMARGS%#%JAVA_AGENT_OPTS%#-Djava.endorsed.dirs="%GERONIMO_HOME%\lib\endorsed';'%JRE_HOME%\lib\endorsed"#-Djava.ext.dirs="%GERONIMO_HOME%\lib\ext';'%JRE_HOME%\lib\ext"#-Dorg.apache.geronimo.home.dir="%GERONIMO_HOME%"#-Dkaraf.startLocalConsole=false#-Dkaraf.startRemoteShell=true#-Dkaraf.home="%GERONIMO_HOME%"#-Dkaraf.base="%GERONIMO_HOME%"#-Djava.io.tmpdir="%GERONIMO_TMPDIR%"#-jar#"%GERONIMO_HOME%\bin\server.jar"#%STARTUP_ARGS%
--StopImage %JAVA_EXE% --StopPath "%GERONIMO_HOME%" --StopMode exe --StopParams %JAVA_AGENT_OPTS%#-Djava.endorsed.dirs="%GERONIMO_HOME%\lib\endorsed';'%JRE_HOME%\lib\endorsed"#-Djava.ext.dirs="%GERONIMO_HOME%\lib\ext';'%JRE_HOME%\lib\ext"#-Dorg.apache.geronimo.home.dir="%GERONIMO_HOME%"#-Dkaraf.startLocalConsole=false#-Dkaraf.startRemoteShell=false#-Dkaraf.home="%GERONIMO_HOME%"#-Dkaraf.base="%GERONIMO_HOME%"#-Djava.io.tmpdir="%GERON
 IMO_TMPDIR%"#-jar#"%GERONIMO_HOME%\bin\shutdown.jar"#%SHUTDOWN_ARGS%
 if not errorlevel 1 goto installed
 echo Failed to install "%SERVICE_NAME%" service. Refer to the log in var/log/geronimosrv.log
 goto end

Added: geronimo/server/trunk/plugins/procrun/src/main/resources/server/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/procrun/src/main/resources/server/MANIFEST.MF?rev=988394&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/procrun/src/main/resources/server/MANIFEST.MF (added)
+++ geronimo/server/trunk/plugins/procrun/src/main/resources/server/MANIFEST.MF Tue Aug 24
05:44:33 2010
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Archiver-Version: Plexus Archiver
+Created-By: Apache Maven
+Built-By: root
+Build-Jdk: 1.6.0_20
+Main-Class: org.apache.geronimo.cli.daemon.DaemonCLI
+Endorsed-Dirs: lib/endorsed
+Extension-Dirs: lib/ext
+Class-Path: ../lib/commons-cli.jar ../lib/geronimo-cli.jar ../lib/geronimo-hook.jar ../lib/geronimo-main.jar
../lib/geronimo-rmi-loader.jar ../lib/karaf-jaas-boot.jar
+

Added: geronimo/server/trunk/plugins/procrun/src/main/resources/shutdown/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/procrun/src/main/resources/shutdown/MANIFEST.MF?rev=988394&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/procrun/src/main/resources/shutdown/MANIFEST.MF (added)
+++ geronimo/server/trunk/plugins/procrun/src/main/resources/shutdown/MANIFEST.MF Tue Aug
24 05:44:33 2010
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Archiver-Version: Plexus Archiver
+Created-By: Apache Maven
+Built-By: root
+Build-Jdk: 1.6.0_20
+Main-Class: org.apache.geronimo.cli.shutdown.ShutdownCLI
+Endorsed-Dirs: lib/endorsed
+Extension-Dirs: lib/ext
+Class-Path: ../lib/commons-cli.jar ../lib/geronimo-cli.jar ../lib/geronimo-hook.jar ../lib/geronimo-main.jar
../lib/geronimo-rmi-loader.jar ../lib/karaf-jaas-boot.jar
+



Mime
View raw message