Author: bleny Date: 2010-06-28 12:23:31 +0200 (Mon, 28 Jun 2010) New Revision: 91 Url: http://nuiton.org/repositories/revision/diswork/91 Log: menage eclipse Removed: trunk/diswork-daemon/.project Modified: trunk/diswork-daemon/pom.xml trunk/diswork-daemon/src/main/java/org/nuiton/diswork/daemon/DisworkDaemonRunner.java trunk/diswork-daemon/src/main/java/org/nuiton/diswork/daemon/DisworkSimpleClient.java trunk/diswork-daemon/src/main/java/org/nuiton/diswork/daemon/JobDescription.java Deleted: trunk/diswork-daemon/.project =================================================================== --- trunk/diswork-daemon/.project 2010-06-27 06:35:18 UTC (rev 90) +++ trunk/diswork-daemon/.project 2010-06-28 10:23:31 UTC (rev 91) @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>diswork-daemon</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.maven.ide.eclipse.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.maven.ide.eclipse.maven2Nature</nature> - </natures> -</projectDescription> Modified: trunk/diswork-daemon/pom.xml =================================================================== --- trunk/diswork-daemon/pom.xml 2010-06-27 06:35:18 UTC (rev 90) +++ trunk/diswork-daemon/pom.xml 2010-06-28 10:23:31 UTC (rev 91) @@ -31,21 +31,13 @@ <artifactId>commons-io</artifactId> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> </dependency> <dependency> - <groupId>commons-digester</groupId> - <artifactId>commons-digester</artifactId> + <groupId>commons-daemon</groupId> + <artifactId>commons-daemon</artifactId> </dependency> - <dependency> - <groupId>org.freemarker</groupId> - <artifactId>freemarker</artifactId> - </dependency> <!-- test --> <dependency> Modified: trunk/diswork-daemon/src/main/java/org/nuiton/diswork/daemon/DisworkDaemonRunner.java =================================================================== --- trunk/diswork-daemon/src/main/java/org/nuiton/diswork/daemon/DisworkDaemonRunner.java 2010-06-27 06:35:18 UTC (rev 90) +++ trunk/diswork-daemon/src/main/java/org/nuiton/diswork/daemon/DisworkDaemonRunner.java 2010-06-28 10:23:31 UTC (rev 91) @@ -24,24 +24,46 @@ */ package org.nuiton.diswork.daemon; +import org.apache.commons.daemon.Daemon; +import org.apache.commons.daemon.DaemonContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.diswork.fs.DisworkFileSystemConfig; /** + * This class is used to run diswork daemon. It can be used to run a deamon + * using a simple command-line. * + * This class can be used to run a diswork daemon as a service on the OS. + * Thus, it will be started when the machine boot and stopped just before the + * computer is shut down. + * * @author bleny */ -public class DisworkDaemonRunner { +public class DisworkDaemonRunner implements Daemon { private static final Log log = LogFactory.getLog(DisworkDaemonRunner.class); + + protected static DisworkConfig config; + protected static DisworkDaemon daemon; + /** * @param args */ public static void main(String[] args) throws Exception { - - DisworkConfig config = new DisworkConfig(); + DisworkDaemonRunner instance = new DisworkDaemonRunner(); + instance.init(args); + instance.start(); + } + + /** + * set <code>config</code> according args + * @param args + * @throws DisworkException + */ + protected void init(String[] args) throws DisworkException { + config = new DisworkConfig(); config.setFileSystemConfig( DisworkFileSystemConfig.newKademliaDisworkConfig()); if (args.length == 2) { @@ -50,7 +72,28 @@ Integer.parseInt(args[1]))); } config.setActivityStrategy("unlimited"); - config.fileSystemConfig.setBlockSize(65000); - DisworkDaemon daemon = new DisworkDaemon(config); } + + // constructor need to have empty params + public DisworkDaemonRunner() {} + + @Override + public void destroy() { + // nothing to do + } + + @Override + public void init(DaemonContext context) throws Exception { + init(context.getArguments()); + } + + @Override + public void start() throws Exception { + daemon = new DisworkDaemon(config); + } + + @Override + public void stop() throws Exception { + daemon.close(); + } } Modified: trunk/diswork-daemon/src/main/java/org/nuiton/diswork/daemon/DisworkSimpleClient.java =================================================================== --- trunk/diswork-daemon/src/main/java/org/nuiton/diswork/daemon/DisworkSimpleClient.java 2010-06-27 06:35:18 UTC (rev 90) +++ trunk/diswork-daemon/src/main/java/org/nuiton/diswork/daemon/DisworkSimpleClient.java 2010-06-28 10:23:31 UTC (rev 91) @@ -71,6 +71,7 @@ while(! daemon.isFinished(job)) { Thread.sleep(5 * 1000); + System.out.print("."); } System.out.println(IOUtils.toString(daemon.getResults(job).get("output.txt"))); @@ -136,7 +137,6 @@ DisworkFileSystemConfig.newKademliaDisworkConfig(args[0], port)); config.setActivityStrategy("none"); config.setUsedPort(30000); - config.fileSystemConfig.setBlockSize(65000); daemon = new DisworkDaemon(config); //userPrompt(); Modified: trunk/diswork-daemon/src/main/java/org/nuiton/diswork/daemon/JobDescription.java =================================================================== --- trunk/diswork-daemon/src/main/java/org/nuiton/diswork/daemon/JobDescription.java 2010-06-27 06:35:18 UTC (rev 90) +++ trunk/diswork-daemon/src/main/java/org/nuiton/diswork/daemon/JobDescription.java 2010-06-28 10:23:31 UTC (rev 91) @@ -81,7 +81,7 @@ protected String applicationName; /** the version of the application - * can't be null applicationName is set + * can't be null if applicationName is set */ protected String applicationVersion; @@ -97,7 +97,7 @@ /** the name of some input files and the URI where to get it */ protected Map<String, URL> inputUrls = new HashMap<String, URL>(); - /** */ + /** data needed for the job, provided through the file-system */ protected Map<String, InputStream> inputData = new HashMap<String, InputStream>(); /** file where to read the standard input, may be null */