Author: giacomo
Date: Sat Nov 6 14:43:39 2004
New Revision: 56782
Modified:
cocoon/trunk/src/blocks/hsqldb/conf/hsqldb.xconf
cocoon/trunk/src/blocks/hsqldb/java/org/apache/cocoon/components/hsqldb/ServerImpl.java
Log:
uses the RunnableManager with the daemon thread pool now
Modified: cocoon/trunk/src/blocks/hsqldb/conf/hsqldb.xconf
==============================================================================
--- cocoon/trunk/src/blocks/hsqldb/conf/hsqldb.xconf (original)
+++ cocoon/trunk/src/blocks/hsqldb/conf/hsqldb.xconf Sat Nov 6 14:43:39 2004
@@ -30,6 +30,7 @@
<parameter name="port" value="9002"/>
<parameter name="silent" value="true"/>
<parameter name="trace" value="false"/>
+ <parameter name="thread-pool-name" value="daemon"/>
</hsqldb-server>
</xconf>
Modified:
cocoon/trunk/src/blocks/hsqldb/java/org/apache/cocoon/components/hsqldb/ServerImpl.java
==============================================================================
---
cocoon/trunk/src/blocks/hsqldb/java/org/apache/cocoon/components/hsqldb/ServerImpl.java
(original)
+++
cocoon/trunk/src/blocks/hsqldb/java/org/apache/cocoon/components/hsqldb/ServerImpl.java
Sat Nov 6 14:43:39 2004
@@ -23,6 +23,7 @@
import java.sql.SQLException;
import java.sql.Statement;
+import org.apache.avalon.framework.CascadingRuntimeException;
import org.apache.avalon.framework.activity.Startable;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
@@ -30,16 +31,21 @@
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.parameters.Parameterizable;
import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.Constants;
+import org.apache.cocoon.components.thread.RunnableManager;
+import org.apache.cocoon.components.thread.ThreadPool;
/**
* This class runs an instance of HSQLDB Server.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Vadim Gritsenko</a>
- * @version CVS $Id: ServerImpl.java,v 1.3 2004/03/05 13:01:56 bdelacretaz Exp
$
+ * @version CVS $Id$
*/
public class ServerImpl extends AbstractLogEnabled
implements Server,
@@ -47,6 +53,7 @@
Contextualizable,
ThreadSafe,
Runnable,
+ Serviceable,
Startable {
/** Port which HSQLDB server will listen to */
@@ -55,9 +62,15 @@
/** Arguments for running the server */
private String arguments[] = new String[10];
+ /** The threadpool name to be used for daemon thread */
+ private String m_daemonThreadPoolName = "daemon";
+
/** Check if the server has already been started */
private boolean started = false;
+ /** The [EMAIL PROTECTED] ServiceManager} instance */
+ private ServiceManager m_serviceManager;
+
/**
* Initialize the ServerImpl.
* A few options can be used :
@@ -83,6 +96,7 @@
+ ", silent: " + arguments[3]
+ ", trace: " +arguments[5]);
}
+ m_daemonThreadPoolName = params.getParameter( "thread-pool-name",
m_daemonThreadPoolName );
}
/** Contextualize this class */
@@ -108,6 +122,15 @@
getLogger().error("IOException - Could not get database directory
", e);
}
}
+ /**
+ * @param serviceManager The <@link ServiceManager} instance
+ * @throws ServiceException In case we cannot find a service needed
+ */
+ public void service( ServiceManager serviceManager )
+ throws ServiceException
+ {
+ m_serviceManager = serviceManager;
+ }
/** Start the server */
public void start() {
@@ -118,12 +141,24 @@
getLogger().info("HSQLDB backup file has been deleted.");
}
- Thread server = new Thread(this);
- this.getLogger().debug("Intializing hsqldb server thread");
- server.setPriority(Thread.currentThread().getPriority());
- server.setDaemon(true);
- server.setName("hsqldb server");
- server.start();
+ RunnableManager runnableManager = null;
+ try
+ {
+ this.getLogger().debug("Intializing hsqldb server thread");
+ runnableManager =
(RunnableManager)m_serviceManager.lookup(RunnableManager.ROLE);
+ runnableManager.execute( m_daemonThreadPoolName, this );
+ }
+ catch( final ServiceException se )
+ {
+ throw new CascadingRuntimeException( "Cannot get
RunnableManager", se );
+ }
+ finally
+ {
+ if( null != runnableManager )
+ {
+ m_serviceManager.release( runnableManager );
+ }
+ }
}
}
