You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by mt...@apache.org on 2010/10/17 13:13:49 UTC
svn commit: r1023459 - in /commons/proper/daemon/trunk/src:
java/org/apache/commons/daemon/Main.java
java/org/apache/commons/daemon/support/DaemonWrapper.java
samples/SimpleApplication.sh
Author: mturk
Date: Sun Oct 17 11:13:49 2010
New Revision: 1023459
URL: http://svn.apache.org/viewvc?rev=1023459&view=rev
Log:
Rename experimental Main to be like remaining daemon classes
Added:
commons/proper/daemon/trunk/src/java/org/apache/commons/daemon/support/DaemonWrapper.java
- copied, changed from r1023453, commons/proper/daemon/trunk/src/java/org/apache/commons/daemon/Main.java
Removed:
commons/proper/daemon/trunk/src/java/org/apache/commons/daemon/Main.java
Modified:
commons/proper/daemon/trunk/src/samples/SimpleApplication.sh
Copied: commons/proper/daemon/trunk/src/java/org/apache/commons/daemon/support/DaemonWrapper.java (from r1023453, commons/proper/daemon/trunk/src/java/org/apache/commons/daemon/Main.java)
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/java/org/apache/commons/daemon/support/DaemonWrapper.java?p2=commons/proper/daemon/trunk/src/java/org/apache/commons/daemon/support/DaemonWrapper.java&p1=commons/proper/daemon/trunk/src/java/org/apache/commons/daemon/Main.java&r1=1023453&r2=1023459&rev=1023459&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/java/org/apache/commons/daemon/Main.java (original)
+++ commons/proper/daemon/trunk/src/java/org/apache/commons/daemon/support/DaemonWrapper.java Sun Oct 17 11:13:49 2010
@@ -17,12 +17,13 @@
/* @version $Id: Main.java 937350 2010-04-23 16:03:39Z mturk $ */
-package org.apache.commons.daemon;
+package org.apache.commons.daemon.support;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Arrays;
-import org.apache.commons.daemon.support.DaemonConfiguration;
+import org.apache.commons.daemon.Daemon;
+import org.apache.commons.daemon.DaemonContext;
/**
* Implementation of the Daemon that allows running
@@ -33,7 +34,7 @@ import org.apache.commons.daemon.support
* @version 1.0 <i>(SVN $Revision: 925053 $)</i>
* @author Mladen Turk
*/
-public class Main implements Daemon
+public class DaemonWrapper implements Daemon
{
private final static String ARGS = "args";
@@ -48,7 +49,7 @@ public class Main implements Daemon
private final Invoker startup;
private final Invoker shutdown;
- public Main()
+ public DaemonWrapper()
{
super();
config = new DaemonConfiguration();
@@ -154,7 +155,7 @@ public class Main implements Daemon
public void destroy()
{
// Nothing for the moment
- System.err.println("Main: instance " + this.hashCode() + " destroy");
+ System.err.println("DaemonWrapper: instance " + this.hashCode() + " destroy");
}
// Internal class for wrapping the start/stop methods
@@ -224,7 +225,7 @@ public class Main implements Daemon
call = "main";
// Get the ClassLoader loading this class
- ClassLoader cl = Main.class.getClassLoader();
+ ClassLoader cl = DaemonWrapper.class.getClassLoader();
if (cl == null)
throw new NullPointerException("Cannot retrieve ClassLoader instance");
Class[] ca = new Class[1];
Modified: commons/proper/daemon/trunk/src/samples/SimpleApplication.sh
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/samples/SimpleApplication.sh?rev=1023459&r1=1023458&r2=1023459&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/samples/SimpleApplication.sh (original)
+++ commons/proper/daemon/trunk/src/samples/SimpleApplication.sh Sun Oct 17 11:13:49 2010
@@ -31,7 +31,7 @@ case "$1" in
-nodetach \
-errfile "&2" \
-pidfile `pwd`/$PROGRAM.pid \
- org.apache.commons.daemon.Main \
+ org.apache.commons.daemon.support.DaemonWrapper \
-start $PROGRAM \
-start-method main \
$*
@@ -46,7 +46,7 @@ case "$1" in
-nodetach \
-errfile "&2" \
-pidfile `pwd`/$PROGRAM.pid \
- org.apache.commons.daemon.Main \
+ org.apache.commons.daemon.support.DaemonWrapper \
-start $PROGRAM \
-start-method main \
$*