X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsystem%2FEnvironment.java;h=e2bd2b8053731fc0b603d1e297a9116f69fa9b61;hb=0af4854898104bd6322c0f22feb6dc285859f420;hp=7209c273f17e705ce68fe9e5492bbb3294978c90;hpb=4c7e63f11337abfaa6ea13eab4b6ca11891f4977;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 7209c273..e2bd2b80 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,26 @@ 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 = 
+		new ProvidedInterface[] { 
+    			new DefaultProvidedInterfaceDescriptor("datasource", DataSource.class), 
+    			new DefaultProvidedInterfaceDescriptor("integer", Integer.class)
     	};
-
-	public Environment() { 
-		super("environment", PROVIDED, new ServiceDescriptor[0]);
+	
+	public Environment(ServiceRegistry aRegistry) { 
+		super("environment", aRegistry, PROVIDED, new RequiredInterface[0]);
+	}
+	
+	@Override
+	protected void doStart(String aContext, Service[] aRequiredServices) {
+	    addService(aContext, PROVIDED[0], new Integer(1));
+	    addService(aContext, PROVIDED[1], new Integer(2));
 	}
 	
 	@Override
-	protected void doStart(String aContext, ServiceRegistry aRegistry, Service[] aRequiredServices) {
-	    addService(aContext, aRegistry.register(PROVIDED[0], new Integer(1)));
-	    addService(aContext, aRegistry.register(PROVIDED[1], new Integer(2)));
+	protected void doStop() {
+		// Empty.	
 	}
 }