X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsystem%2FEnvironment.java;h=1fdc079e08908222604e1e4952ea4251e781ca4e;hb=7526813969742844aefbd25e8a4a056985dc7f65;hp=7209c273f17e705ce68fe9e5492bbb3294978c90;hpb=47219ea21e66b5414eeb8b85049a2caa62e3547e;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..1fdc079e 100644
--- a/system/general/src/test/java/org/wamblee/system/Environment.java
+++ b/system/general/src/test/java/org/wamblee/system/Environment.java
@@ -1,23 +1,61 @@
+/*
+ * Copyright 2007 the original author or authors.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */ 
 package org.wamblee.system;
 
 import javax.sql.DataSource;
 
+import org.wamblee.test.EventTracker;
 
-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)
     	};
-
+	}
+	
+	private EventTracker<String> _tracker; 
+	
 	public Environment() { 
-		super("environment", PROVIDED, new ServiceDescriptor[0]);
+		super("environment", provided(), new RequiredInterface[0]);
+	}
+	
+	public Environment(EventTracker aTracker) { 
+		this();
+		_tracker = aTracker; 
 	}
 	
 	@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 doStart(String aContext) {
+	    addService(aContext, getProvidedServices()[0], new Integer(1));
+	    addService(aContext, getProvidedServices()[1], new Integer(2));
+	    track("start." + getName());
+	}
+
+	@Override
+	protected void doStop() {
+		track("stop." + getName());
+	}
+	
+	private void track(String aString) {
+		if ( _tracker == null ) { 
+			return; 
+		}
+		_tracker.eventOccurred(aString);
 	}
 }