X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsystem%2FEnvironment.java;h=27537e0a850b9b297dd9058b3f5ca30e519ac3a1;hb=6a914dcbd1c89027eafae6021af4199a636e4e48;hp=bd014c5a0caeb298d49498e96d8bc0d75d75fd78;hpb=3cdb7d1eaa6529a0d7a0409943b24bdc5af85e53;p=utils

diff --git a/system/general/src/test/java/org/wamblee/system/Environment.java b/system/general/src/test/java/org/wamblee/system/Environment.java
index bd014c5a..27537e0a 100644
--- a/system/general/src/test/java/org/wamblee/system/Environment.java
+++ b/system/general/src/test/java/org/wamblee/system/Environment.java
@@ -3,21 +3,27 @@ package org.wamblee.system;
 import javax.sql.DataSource;
 
 
-public class Environment extends AbstractSubSystem {
+public class Environment extends AbstractComponent {
 	
-	private static final ServiceDescriptor[] PROVIDED = 
-		new ServiceDescriptor[] { 
-    			new DefaultServiceDescriptor(DataSource.class), 
-    			new DefaultServiceDescriptor(Integer.class)
+	private static final ProvidedInterface[] provided() { 
+		return new ProvidedInterface[] { 
+    			new DefaultProvidedInterfaceDescriptor("datasource", DataSource.class), 
+    			new DefaultProvidedInterfaceDescriptor("integer", Integer.class)
     	};
-
+	}
+	
 	public Environment() { 
-		super("environment", PROVIDED, new ServiceDescriptor[0]); 
+		super("environment", provided(), new RequiredInterface[0]);
+	}
+	
+	@Override
+	protected void doStart(String aContext) {
+	    addService(aContext, getProvidedServices()[0], new Integer(1));
+	    addService(aContext, getProvidedServices()[1], new Integer(2));
 	}
 	
 	@Override
-	protected void doInitialize(String aContext, Service[] aRequiredServices) {
-	    addService(aContext, new DefaultService(PROVIDED[0], new Integer(1)));
-	    addService(aContext, new DefaultService(PROVIDED[1], new Integer(2)));
+	protected void doStop() {
+		// Empty.	
 	}
 }