dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectWithCallbacksServiceDependencyTest.java [68:175]:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        m.add(sp);
        m.add(sc);
        m.add(asp);
        m.remove(asp); 
        m.remove(sc);
        m.remove(sp);
        
        // ensure we executed all steps inside the component instance
        e.step(8);
    }
    
   static interface ServiceInterface {
        public void invoke(String caller);
    }

    static class ServiceProvider implements ServiceInterface {
        private final Ensure m_ensure;
        public ServiceProvider(Ensure e) {
            m_ensure = e;
        }
        public void invoke(String caller) {
        	if (caller.equals("consumer.init")) {
        		m_ensure.step(3);
        	} else if (caller.equals("aspect.consumer.add")) {
        		m_ensure.step(5);
        	}
        }
    }
    
    public static class ServiceProviderAspectCallbackInstance {
        private final ServiceProviderAspect m_aspect;
        
        ServiceProviderAspectCallbackInstance(ServiceProviderAspect aspect) {
            m_aspect = aspect;
        }
        
        public void add(ServiceInterface service) {
            m_aspect.add(service);
        }
        
        public void remove(ServiceInterface service) {
            m_aspect.remove(service);
        }
        
        public void swap(ServiceInterface previous, ServiceInterface current) {
            m_aspect.swap(previous, current);
        }
    }

    static class ServiceProviderAspect implements ServiceInterface {
    	private volatile ServiceInterface m_service;
    	
    	public ServiceProviderAspect() {
		}

		@Override
		public void invoke(String caller) {
			m_service.invoke("aspect." + caller);
		}
		
		public void add(ServiceInterface service) {
			m_service = service;
		}
		
		public void remove(ServiceInterface service) {
			m_service = null;
		}
		
		public void swap(ServiceInterface previous, ServiceInterface current) {
			m_service = current;
		}
    }

    static class ServiceConsumer {
        private volatile ServiceInterface m_service;
        private final Ensure m_ensure;
        private int addCount = 0;

        public ServiceConsumer(Ensure e) {
            m_ensure = e;
        }
        
        public void init() {
            m_ensure.step(2);
            m_service.invoke("consumer.init");
        }
        
        public void destroy() {
            m_ensure.step(7);
        }
        
        public void add(ServiceInterface service) {
        	m_service = service;
        	switch (addCount) {
        		case 0: m_ensure.step(1);
        				break;
        		case 1: m_ensure.step(4);
        				// aspect had been added
        				m_service.invoke("consumer.add");
        				break;
        		case 2: m_ensure.step(6);
        				break;
        		default:
        	}
        	addCount ++;
        }
        public void remove(ServiceInterface service) {
        	m_service = null;
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -



dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectWithCallbacksServiceDependencyTest.java [87:194]:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        m.add(sp);
        m.add(sc);
        m.add(asp);
        m.remove(asp); 
        m.remove(sc);
        m.remove(sp);
        
        // ensure we executed all steps inside the component instance
        e.step(8);
    }
    
   static interface ServiceInterface {
        public void invoke(String caller);
    }

    static class ServiceProvider implements ServiceInterface {
        private final Ensure m_ensure;
        public ServiceProvider(Ensure e) {
            m_ensure = e;
        }
        public void invoke(String caller) {
        	if (caller.equals("consumer.init")) {
        		m_ensure.step(3);
        	} else if (caller.equals("aspect.consumer.add")) {
        		m_ensure.step(5);
        	}
        }
    }
    
    public static class ServiceProviderAspectCallbackInstance {
        private final ServiceProviderAspect m_aspect;
        
        ServiceProviderAspectCallbackInstance(ServiceProviderAspect aspect) {
            m_aspect = aspect;
        }
        
        public void add(ServiceInterface service) {
            m_aspect.add(service);
        }
        
        public void remove(ServiceInterface service) {
            m_aspect.remove(service);
        }
        
        public void swap(ServiceInterface previous, ServiceInterface current) {
            m_aspect.swap(previous, current);
        }
    }

    static class ServiceProviderAspect implements ServiceInterface {
    	private volatile ServiceInterface m_service;
    	
    	public ServiceProviderAspect() {
		}

		@Override
		public void invoke(String caller) {
			m_service.invoke("aspect." + caller);
		}
		
		public void add(ServiceInterface service) {
			m_service = service;
		}
		
		public void remove(ServiceInterface service) {
			m_service = null;
		}
		
		public void swap(ServiceInterface previous, ServiceInterface current) {
			m_service = current;
		}
    }

    static class ServiceConsumer {
        private volatile ServiceInterface m_service;
        private final Ensure m_ensure;
        private int addCount = 0;

        public ServiceConsumer(Ensure e) {
            m_ensure = e;
        }
        
        public void init() {
            m_ensure.step(2);
            m_service.invoke("consumer.init");
        }
        
        public void destroy() {
            m_ensure.step(7);
        }
        
        public void add(ServiceInterface service) {
        	m_service = service;
        	switch (addCount) {
        		case 0: m_ensure.step(1);
        				break;
        		case 1: m_ensure.step(4);
        				// aspect had been added
        				m_service.invoke("consumer.add");
        				break;
        		case 2: m_ensure.step(6);
        				break;
        		default:
        	}
        	addCount ++;
        }
        public void remove(ServiceInterface service) {
        	m_service = null;
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -