X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=trunk%2Fsystem%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsystem%2FEnvironment.java;h=6c9512ca2b75383c92c96ab24135276fe4616f23;hb=86c457da13cc0420a6e071e77f06d1f9a9f317e7;hp=7209c273f17e705ce68fe9e5492bbb3294978c90;hpb=9eabeead7f0502cacee2113178dc9d83a5a483ad;p=utils

diff --git a/trunk/system/general/src/test/java/org/wamblee/system/Environment.java b/trunk/system/general/src/test/java/org/wamblee/system/Environment.java
index 7209c273..6c9512ca 100644
--- a/trunk/system/general/src/test/java/org/wamblee/system/Environment.java
+++ b/trunk/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 ProvidedInterfaceDescriptor[] PROVIDED = 
+		new ProvidedInterfaceDescriptor[] { 
+    			new AbstractProvidedInterfaceDescriptor("datasource", DataSource.class), 
+    			new AbstractProvidedInterfaceDescriptor("integer", Integer.class)
     	};
-
-	public Environment() { 
-		super("environment", PROVIDED, new ServiceDescriptor[0]);
+	
+	public Environment(ServiceRegistry aRegistry) { 
+		super("environment", aRegistry, PROVIDED, new RequiredInterfaceDescriptor[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.	
 	}
 }