now distinguishing between provided and required service and added

[utils] / system / general / src / test / java / org / wamblee / system / Environment.java

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 bd014c5a0caeb298d49498e96d8bc0d75d75fd78..56118ccbb7fb325d1c96616bc017800b9bff4549 100644 (file)
--- a/system/general/src/test/java/org/wamblee/system/Environment.java
+++ b/system/general/src/test/java/org/wamblee/system/Environment.java
@@ -5,19 +5,24 @@ import javax.sql.DataSource;
 
 public class Environment extends AbstractSubSystem {
        
-       private static final ServiceDescriptor[] PROVIDED = 
-               new ServiceDescriptor[] { 
-                       new DefaultServiceDescriptor(DataSource.class), 
-                       new DefaultServiceDescriptor(Integer.class)
+       private static final ProvidedServiceDescriptor[] PROVIDED = 
+               new ProvidedServiceDescriptor[] { 
+                       new DefaultProvidedServiceDescriptor("datasource", DataSource.class), 
+                       new DefaultProvidedServiceDescriptor("integer", Integer.class)
        };
-
-       public Environment() { 
-               super("environment", PROVIDED, new ServiceDescriptor[0]); 
+       
+       public Environment(ServiceRegistry aRegistry) { 
+               super("environment", aRegistry, PROVIDED, new ServiceDescriptor[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 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.       
        }
 }