From c88c245094876c38e1bb0f459ab22af03a19c50f Mon Sep 17 00:00:00 2001 From: hypercubus Date: Tue, 24 Aug 2004 12:25:46 +0000 Subject: [PATCH] * moving wrapper scripts to installer/resources * added wrapper files to the 'installer' target of the global build.xml --- build.xml | 10 +- installer/lib/wrapper/wrapper.conf | 131 ------------------ .../{lib/wrapper => resources}/i2prouter | 0 .../{lib/wrapper => resources}/i2prouter.bat | 0 .../install_i2p_service_unix | 0 .../install_i2p_service_winnt.bat | 0 .../uninstall_i2p_service_unix | 0 .../uninstall_i2p_service_winnt.bat | 0 8 files changed, 9 insertions(+), 132 deletions(-) delete mode 100644 installer/lib/wrapper/wrapper.conf rename installer/{lib/wrapper => resources}/i2prouter (100%) rename installer/{lib/wrapper => resources}/i2prouter.bat (100%) rename installer/{lib/wrapper => resources}/install_i2p_service_unix (100%) rename installer/{lib/wrapper => resources}/install_i2p_service_winnt.bat (100%) rename installer/{lib/wrapper => resources}/uninstall_i2p_service_unix (100%) rename installer/{lib/wrapper => resources}/uninstall_i2p_service_winnt.bat (100%) diff --git a/build.xml b/build.xml index 6ac35b510..8c5fd91a0 100644 --- a/build.xml +++ b/build.xml @@ -219,8 +219,16 @@ - + + + + + + + + + diff --git a/installer/lib/wrapper/wrapper.conf b/installer/lib/wrapper/wrapper.conf deleted file mode 100644 index e197b931a..000000000 --- a/installer/lib/wrapper/wrapper.conf +++ /dev/null @@ -1,131 +0,0 @@ -#******************************************************************** -# Wrapper Properties -#******************************************************************** -# Java Application -wrapper.java.command=java - -# Java Main class. This class must implement the WrapperListener interface -# or guarantee that the WrapperManager class is initialized. Helper -# classes are provided to do this for you. See the Integration section -# of the documentation for details. -wrapper.java.mainclass=org.tanukisoftware.wrapper.WrapperSimpleApp - -# Java Classpath (include wrapper.jar) Add class path elements as -# needed starting from 1 -wrapper.java.classpath.1=lib/ant.jar -wrapper.java.classpath.2=lib/heartbeat.jar -wrapper.java.classpath.3=lib/i2p.jar -wrapper.java.classpath.4=lib/i2ptunnel.jar -wrapper.java.classpath.5=lib/jasper-compiler.jar -wrapper.java.classpath.6=lib/jasper-runtime.jar -wrapper.java.classpath.7=lib/javax.servlet.jar -wrapper.java.classpath.8=lib/jnet.jar -wrapper.java.classpath.9=lib/mstreaming.jar -wrapper.java.classpath.10=lib/netmonitor.jar -wrapper.java.classpath.11=lib/org.mortbay.jetty.jar -wrapper.java.classpath.12=lib/router.jar -wrapper.java.classpath.13=lib/routerconsole.jar -wrapper.java.classpath.14=lib/sam.jar -wrapper.java.classpath.15=lib/wrapper.jar -wrapper.java.classpath.16=lib/xercesImpl.jar -wrapper.java.classpath.17=lib/xml-apis.jar -wrapper.java.classpath.18=lib/jbigi.jar - -# Java Library Path (location of Wrapper.DLL or libwrapper.so) -wrapper.java.library.path.1=. -wrapper.java.library.path.2=lib - -# Java Additional Parameters -wrapper.java.additional.1=-DloggerFilenameOverride=logs/log-router-@.txt - -# Initial Java Heap Size (in MB) -#wrapper.java.initmemory=4 - -# Maximum Java Heap Size (in MB) -#wrapper.java.maxmemory=32 - -# Application parameters. Add parameters as needed starting from 1 -wrapper.app.parameter.1=net.i2p.router.Router - -#******************************************************************** -# Wrapper Logging Properties -#******************************************************************** -# Format of output for the console. (See docs for formats) -wrapper.console.format=PM - -# Log Level for console output. (See docs for log levels) -wrapper.console.loglevel=INFO - -# Log file to use for wrapper output logging. -wrapper.logfile=logs/wrapper.log - -# Format of output for the log file. (See docs for formats) -wrapper.logfile.format=LPTM - -# Log Level for log file output. (See docs for log levels) -wrapper.logfile.loglevel=INFO - -# Maximum size that the log file will be allowed to grow to before -# the log is rolled. Size is specified in bytes. The default value -# of 0, disables log rolling. May abbreviate with the 'k' (kb) or -# 'm' (mb) suffix. For example: 10m = 10 megabytes. -wrapper.logfile.maxsize=1m - -# Maximum number of rolled log files which will be allowed before old -# files are deleted. The default value of 0 implies no limit. -wrapper.logfile.maxfiles=2 - -# Log Level for sys/event log output. (See docs for log levels) -wrapper.syslog.loglevel=NONE - -# choose what to do if the JVM kills itself based on the exit code -wrapper.on_exit.default=SHUTDOWN -wrapper.on_exit.0=SHUTDOWN -wrapper.on_exit.1=SHUTDOWN -# OOM -wrapper.on_exit.10=RESTART -# graceful shutdown -wrapper.on_exit.2=SHUTDOWN -# hard shutdown -wrapper.on_exit.3=SHUTDOWN - -# the router may take a few seconds to save state, etc -wrapper.jvm_exit.timeout=60 - -# the router may take a few seconds to save state, etc -wrapper.jvm_exit.timeout=30 - -# give the OS 30s to clear all the old sockets / etc before restarting -#wrapper.restart.delay=30 - -# use the wrapper's internal timer thread. otherwise this would -# force a restart of the router during daylight savings time as well -# as any time that the OS clock changes -wrapper.use_system_time=false - -#******************************************************************** -# Wrapper NT Service Properties -#******************************************************************** -# WARNING - Do not modify any of these properties when an application -# using this configuration file has been installed as a service. -# Please uninstall the service before modifying this section. The -# service can then be reinstalled. - -# Name of the service -wrapper.ntservice.name=i2p - -# Display name of the service -wrapper.ntservice.displayname=I2P Service - -# Description of the service -wrapper.ntservice.description=The I2P router service - -# Service dependencies. Add dependencies as needed starting from 1 -wrapper.ntservice.dependency.1= - -# Mode in which the service is installed. AUTO_START or DEMAND_START -wrapper.ntservice.starttype=AUTO_START - -# Allow the service to interact with the desktop. -wrapper.ntservice.interactive=true - diff --git a/installer/lib/wrapper/i2prouter b/installer/resources/i2prouter similarity index 100% rename from installer/lib/wrapper/i2prouter rename to installer/resources/i2prouter diff --git a/installer/lib/wrapper/i2prouter.bat b/installer/resources/i2prouter.bat similarity index 100% rename from installer/lib/wrapper/i2prouter.bat rename to installer/resources/i2prouter.bat diff --git a/installer/lib/wrapper/install_i2p_service_unix b/installer/resources/install_i2p_service_unix similarity index 100% rename from installer/lib/wrapper/install_i2p_service_unix rename to installer/resources/install_i2p_service_unix diff --git a/installer/lib/wrapper/install_i2p_service_winnt.bat b/installer/resources/install_i2p_service_winnt.bat similarity index 100% rename from installer/lib/wrapper/install_i2p_service_winnt.bat rename to installer/resources/install_i2p_service_winnt.bat diff --git a/installer/lib/wrapper/uninstall_i2p_service_unix b/installer/resources/uninstall_i2p_service_unix similarity index 100% rename from installer/lib/wrapper/uninstall_i2p_service_unix rename to installer/resources/uninstall_i2p_service_unix diff --git a/installer/lib/wrapper/uninstall_i2p_service_winnt.bat b/installer/resources/uninstall_i2p_service_winnt.bat similarity index 100% rename from installer/lib/wrapper/uninstall_i2p_service_winnt.bat rename to installer/resources/uninstall_i2p_service_winnt.bat