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/20 07:21:16 UTC
svn commit: r1024526 - in /commons/proper/daemon/trunk/src/samples:
AloneService.java ServiceDaemon.java build.xml
Author: mturk
Date: Wed Oct 20 05:21:16 2010
New Revision: 1024526
URL: http://svn.apache.org/viewvc?rev=1024526&view=rev
Log:
DAEMON-144 Axe Commons Collections ExtendedProperties and use java.util one
Modified:
commons/proper/daemon/trunk/src/samples/AloneService.java
commons/proper/daemon/trunk/src/samples/ServiceDaemon.java
commons/proper/daemon/trunk/src/samples/build.xml
Modified: commons/proper/daemon/trunk/src/samples/AloneService.java
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/samples/AloneService.java?rev=1024526&r1=1024525&r2=1024526&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/samples/AloneService.java (original)
+++ commons/proper/daemon/trunk/src/samples/AloneService.java Wed Oct 20 05:21:16 2010
@@ -17,18 +17,18 @@
/* @version $Id$ */
+import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.PrintStream;
-import java.util.Iterator;
-
-import org.apache.commons.collections.ExtendedProperties;
+import java.util.Enumeration;
+import java.util.Properties;
/*
* That is like the ServiceDaemon but it does not use the Daemon interface.
*/
public class AloneService {
- private ExtendedProperties prop = null;
+ private Properties prop = null;
private Process proc[] = null;
private ServiceDaemonReadThread readout[] = null;
private ServiceDaemonReadThread readerr[] = null;
@@ -49,12 +49,18 @@ public class AloneService {
" init");
/* read the properties file */
- prop = new ExtendedProperties("startfile");
-
+ prop = new Properties();
+ try {
+ prop.load(new FileInputStream("startfile"));
+ }
+ catch (Exception e) {
+ // Cannot find startfile.properties.
+ // XXX: Should we print something?
+ }
/* create an array to store the processes */
int i=0;
- for (Iterator e = prop.getKeys(); e.hasNext() ;) {
- e.next();
+ for (Enumeration e = prop.keys(); e.hasMoreElements() ;) {
+ e.nextElement();
i++;
}
System.err.println("ServiceDaemon: init for " + i + " processes");
@@ -77,11 +83,11 @@ public class AloneService {
/* Start */
int i=0;
- for (Iterator e = prop.getKeys(); e.hasNext() ;) {
- String name = (String) e.next();
- System.err.println("ServiceDaemon: starting: " + name + " : " + prop.getString(name));
+ for (Enumeration e = prop.keys(); e.hasMoreElements() ;) {
+ String name = (String) e.nextElement();
+ System.err.println("ServiceDaemon: starting: " + name + " : " + prop.getProperty(name));
try {
- proc[i] = Runtime.getRuntime().exec(prop.getString(name));
+ proc[i] = Runtime.getRuntime().exec(prop.getProperty(name));
} catch(Exception ex) {
System.err.println("Exception: " + ex);
}
Modified: commons/proper/daemon/trunk/src/samples/ServiceDaemon.java
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/samples/ServiceDaemon.java?rev=1024526&r1=1024525&r2=1024526&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/samples/ServiceDaemon.java (original)
+++ commons/proper/daemon/trunk/src/samples/ServiceDaemon.java Wed Oct 20 05:21:16 2010
@@ -18,18 +18,19 @@
/* @version $Id$ */
import java.io.File;
+import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.PrintStream;
-import java.util.Iterator;
+import java.util.Enumeration;
+import java.util.Properties;
-import org.apache.commons.collections.ExtendedProperties;
import org.apache.commons.daemon.Daemon;
import org.apache.commons.daemon.DaemonContext;
public class ServiceDaemon implements Daemon {
- private ExtendedProperties prop = null;
+ private Properties prop = null;
private Process proc[] = null;
private ServiceDaemonReadThread readout[] = null;
private ServiceDaemonReadThread readerr[] = null;
@@ -56,12 +57,18 @@ public class ServiceDaemon implements Da
" init");
/* read the properties file */
- prop = new ExtendedProperties("startfile");
-
+ prop = new Properties();
+ try {
+ prop.load(new FileInputStream("startfile"));
+ }
+ catch (Exception e) {
+ // Cannot find startfile.properties.
+ // XXX: Should we print something?
+ }
/* create an array to store the processes */
int i=0;
- for (Iterator e = prop.getKeys(); e.hasNext() ;) {
- e.next();
+ for (Enumeration e = prop.keys(); e.hasMoreElements() ;) {
+ e.nextElement();
i++;
}
System.err.println("ServiceDaemon: init for " + i + " processes");
@@ -84,12 +91,12 @@ public class ServiceDaemon implements Da
/* Start */
int i=0;
- for (Iterator e = prop.getKeys(); e.hasNext() ;) {
- String name = (String) e.next();
- System.err.println("ServiceDaemon: starting: " + name + " : " + prop.getString(name));
- try {
- proc[i] = Runtime.getRuntime().exec(prop.getString(name));
- } catch(Exception ex) {
+ for (Enumeration e = prop.keys(); e.hasMoreElements() ;) {
+ String name = (String) e.nextElement();
+ System.err.println("ServiceDaemon: starting: " + name + " : " + prop.getProperty(name));
+ try {
+ proc[i] = Runtime.getRuntime().exec(prop.getProperty(name));
+ } catch(Exception ex) {
System.err.println("Exception: " + ex);
}
/* Start threads to read from Error and Out streams */
Modified: commons/proper/daemon/trunk/src/samples/build.xml
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/samples/build.xml?rev=1024526&r1=1024525&r2=1024526&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/samples/build.xml (original)
+++ commons/proper/daemon/trunk/src/samples/build.xml Wed Oct 20 05:21:16 2010
@@ -23,9 +23,6 @@
<property name="build.home" value="./build"/>
<property name="source.home" value="."/>
- <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
- <property name="commons-collections.jar" value="${maven.repo.local}/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
-
<target name="jars" depends="SimpleDaemon,SimpleApplication,ServiceDaemon,AloneService,ProcrunService"/>
<target name="clean" description="Remove output files">
@@ -131,7 +128,6 @@
<path id="compile.classpath">
<!-- output jar filename may vary between releases -->
<fileset dir="../../dist" includes="commons-daemon-*.jar"/>
- <pathelement location="${commons-collections.jar}"/>
</path>
</project>