(no commit message)

[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 901c67d75bf60c0c3ddb0c0b10bc8f31142d786a..300adf5c43c5dc18f78f7d904648b8d5c8e2d900 100644 (file)
--- a/system/general/src/test/java/org/wamblee/system/Environment.java
+++ b/system/general/src/test/java/org/wamblee/system/Environment.java
@@ -3,26 +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 DefaultProvidedInterface("datasource", DataSource.class), 
+                       new DefaultProvidedInterface("integer", Integer.class)
        };
+       }
        
        public Environment() { 
-               super("environment", PROVIDED, new ServiceDescriptor[0]);
+               super("environment", provided(), new RequiredInterface[0]);
        }
        
        @Override
-       protected void doStart(String aContext, ServiceRegistry aRegistry, Service[] aRequiredServices) {
-           addService(aContext, aRegistry, PROVIDED[0], new Integer(1));
-           addService(aContext, aRegistry, PROVIDED[1], new Integer(2));
+       protected void doStart(String aContext) {
+           addService(aContext, getProvidedServices()[0], new Integer(1));
+           addService(aContext, getProvidedServices()[1], new Integer(2));
        }
        
        @Override
-       protected void doStop(String aContext) {
+       protected void doStop() {
                // Empty.       
        }
 }