tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rf...@apache.org
Subject svn commit: r576985 - in /incubator/tuscany/branches/sca-java-1.0/modules: binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/ binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ host-emb...
Date Tue, 18 Sep 2007 17:19:32 GMT
Author: rfeng
Date: Tue Sep 18 10:19:19 2007
New Revision: 576985

URL: http://svn.apache.org/viewvc?rev=576985&view=rev
Log:
Fix for TUSCANY-1745

Modified:
    incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingModuleActivator.java
    incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProviderFactory.java
    incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractEnDeCoder.java
    incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReferenceEnDeCoder.java
    incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerEnDeCoder.java
    incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerIDEnDeCoder.java
    incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReferenceEnDeCoder.java
    incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokersEnDeCoder.java
    incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideEnDeCoder.java
    incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponseEnDeCoder.java
    incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReferenceEnDeCoder.java
    incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/DefaultEncodingRegistry.java
    incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EnDeCoder.java
    incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumersEnDeCoder.java
    incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducersEnDeCoder.java
    incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddressEnDeCoder.java
    incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceEnDeCoder.java
    incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumersEnDeCoder.java
    incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborsEnDeCoder.java
    incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAckEnDeCoder.java
    incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerEnDeCoder.java
    incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponseEnDeCoder.java
    incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerEnDeCoder.java
    incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponseEnDeCoder.java
    incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerEnDeCoder.java
    incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponseEnDeCoder.java
    incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferencePropertiesEnDeCoder.java
    incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBrokerEnDeCoder.java
    incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBrokerEnDeCoder.java
    incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnectionEnDeCoder.java
    incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/SubscribeEnDeCoder.java
    incubator/tuscany/branches/sca-java-1.0/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java

Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingModuleActivator.java?rev=576985&r1=576984&r2=576985&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingModuleActivator.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingModuleActivator.java Tue Sep 18 10:19:19 2007
@@ -18,38 +18,9 @@
  */
 package org.apache.tuscany.sca.binding.notification;
 
-import java.net.InetAddress;
-
 import org.apache.tuscany.sca.assembly.AssemblyFactory;
 import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
-import org.apache.tuscany.sca.binding.notification.encoding.BrokerConsumerReferenceEnDeCoder;
-import org.apache.tuscany.sca.binding.notification.encoding.BrokerEnDeCoder;
-import org.apache.tuscany.sca.binding.notification.encoding.BrokerIDEnDeCoder;
-import org.apache.tuscany.sca.binding.notification.encoding.BrokerProducerReferenceEnDeCoder;
-import org.apache.tuscany.sca.binding.notification.encoding.BrokersEnDeCoder;
-import org.apache.tuscany.sca.binding.notification.encoding.ConnectionOverrideEnDeCoder;
-import org.apache.tuscany.sca.binding.notification.encoding.ConnectionOverrideResponseEnDeCoder;
-import org.apache.tuscany.sca.binding.notification.encoding.ConsumerReferenceEnDeCoder;
 import org.apache.tuscany.sca.binding.notification.encoding.DefaultEncodingRegistry;
-import org.apache.tuscany.sca.binding.notification.encoding.EncodingRegistry;
-import org.apache.tuscany.sca.binding.notification.encoding.EndConsumersEnDeCoder;
-import org.apache.tuscany.sca.binding.notification.encoding.EndProducersEnDeCoder;
-import org.apache.tuscany.sca.binding.notification.encoding.EndpointAddressEnDeCoder;
-import org.apache.tuscany.sca.binding.notification.encoding.EndpointReferenceEnDeCoder;
-import org.apache.tuscany.sca.binding.notification.encoding.NeighborBrokerConsumersEnDeCoder;
-import org.apache.tuscany.sca.binding.notification.encoding.NeighborsEnDeCoder;
-import org.apache.tuscany.sca.binding.notification.encoding.NewBrokerAckEnDeCoder;
-import org.apache.tuscany.sca.binding.notification.encoding.NewBrokerEnDeCoder;
-import org.apache.tuscany.sca.binding.notification.encoding.NewBrokerResponseEnDeCoder;
-import org.apache.tuscany.sca.binding.notification.encoding.NewConsumerEnDeCoder;
-import org.apache.tuscany.sca.binding.notification.encoding.NewConsumerResponseEnDeCoder;
-import org.apache.tuscany.sca.binding.notification.encoding.NewProducerEnDeCoder;
-import org.apache.tuscany.sca.binding.notification.encoding.NewProducerResponseEnDeCoder;
-import org.apache.tuscany.sca.binding.notification.encoding.ReferencePropertiesEnDeCoder;
-import org.apache.tuscany.sca.binding.notification.encoding.RemoveBrokerEnDeCoder;
-import org.apache.tuscany.sca.binding.notification.encoding.RemovedBrokerEnDeCoder;
-import org.apache.tuscany.sca.binding.notification.encoding.ReplaceBrokerConnectionEnDeCoder;
-import org.apache.tuscany.sca.binding.notification.encoding.SubscribeEnDeCoder;
 import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
 import org.apache.tuscany.sca.core.ModuleActivator;
@@ -67,114 +38,14 @@
 
     private NotificationBindingProcessor bindingProcessor;
     
-    private NotificationTypeManagerImpl ntm;
-    
-    private SubscribeEnDeCoder subscribeEnDeCoder;
-    private ConsumerReferenceEnDeCoder consumerReferenceEnDeCoder;
-    private EndpointAddressEnDeCoder endpointAddressEnDeCoder;
-    private NewConsumerEnDeCoder newConsumerEnDeCoder;
-    private NewProducerEnDeCoder newProducerEnDeCoder;
-    private NewConsumerResponseEnDeCoder newConsumerResponseEnDeCoder;
-    private NewProducerResponseEnDeCoder newProducerResponseEnDeCoder;
-    private NewBrokerEnDeCoder newBrokerEnDeCoder;
-    private BrokerConsumerReferenceEnDeCoder brokerConsumerReferenceEnDeCoder;
-    private BrokerProducerReferenceEnDeCoder brokerProducerReferenceEnDeCoder;
-    private NewBrokerResponseEnDeCoder newBrokerResponseEnDeCoder;
-    private BrokersEnDeCoder brokersEnDeCoder;
-    private BrokerEnDeCoder brokerEnDeCoder;
-    private EndConsumersEnDeCoder endConsumersEnDeCoder; 
-    private EndProducersEnDeCoder endProducersEnDeCoder; 
-    private EndpointReferenceEnDeCoder endpointReferenceEnDeCoder;;
-    private ReferencePropertiesEnDeCoder referencePropertiesEnDeCoder;
-    private BrokerIDEnDeCoder brokerIDEnDeCoder;
-    private ConnectionOverrideEnDeCoder connectionOverrideEnDeCoder;
-    private ConnectionOverrideResponseEnDeCoder connectionOverrideResponseEnDeCoder;
-    private NewBrokerAckEnDeCoder newBrokerAckEnDeCoder;
-    private NeighborBrokerConsumersEnDeCoder neighborBrokerConsumersEnDeCoder;
-    private RemoveBrokerEnDeCoder removeBrokerEnDeCoder;
-    private RemovedBrokerEnDeCoder removedBrokerEnDeCoder;
-    private NeighborsEnDeCoder neighborsEnDeCoder;
-    private ReplaceBrokerConnectionEnDeCoder replaceBrokerConnectionEnDeCoder;
+    private DefaultEncodingRegistry encodingRegistry;
+    private ServletHost servletHost;
     
-    private static final String DEFAULT_PORT = "8086";
-
+	
     public void start(ExtensionPointRegistry registry) {
+        encodingRegistry = new DefaultEncodingRegistry();
+        servletHost = new ExtensibleServletHost(registry.getExtensionPoint(ServletHostExtensionPoint.class));
         
-        EncodingRegistry encodingRegistry = new DefaultEncodingRegistry();
-        subscribeEnDeCoder = new SubscribeEnDeCoder(encodingRegistry);
-        subscribeEnDeCoder.start();
-        consumerReferenceEnDeCoder = new ConsumerReferenceEnDeCoder(encodingRegistry);
-        consumerReferenceEnDeCoder.start();
-        endpointAddressEnDeCoder = new EndpointAddressEnDeCoder(encodingRegistry);
-        endpointAddressEnDeCoder.start();
-        newConsumerEnDeCoder = new NewConsumerEnDeCoder(encodingRegistry);
-        newConsumerEnDeCoder.start();
-        newProducerEnDeCoder = new NewProducerEnDeCoder(encodingRegistry);
-        newProducerEnDeCoder.start();
-        newConsumerResponseEnDeCoder = new NewConsumerResponseEnDeCoder(encodingRegistry);
-        newConsumerResponseEnDeCoder.start();
-        newProducerResponseEnDeCoder = new NewProducerResponseEnDeCoder(encodingRegistry);
-        newProducerResponseEnDeCoder.start();
-        newBrokerEnDeCoder = new NewBrokerEnDeCoder(encodingRegistry);
-        newBrokerEnDeCoder.start();
-        brokerConsumerReferenceEnDeCoder = new BrokerConsumerReferenceEnDeCoder(encodingRegistry);
-        brokerConsumerReferenceEnDeCoder.start();
-        brokerProducerReferenceEnDeCoder = new BrokerProducerReferenceEnDeCoder(encodingRegistry);
-        brokerProducerReferenceEnDeCoder.start();
-        newBrokerResponseEnDeCoder = new NewBrokerResponseEnDeCoder(encodingRegistry);
-        newBrokerResponseEnDeCoder.start();
-        brokersEnDeCoder = new BrokersEnDeCoder(encodingRegistry);
-        brokersEnDeCoder.start();
-        brokerEnDeCoder = new BrokerEnDeCoder(encodingRegistry);
-        brokerEnDeCoder.start();
-        endConsumersEnDeCoder = new EndConsumersEnDeCoder(encodingRegistry);
-        endConsumersEnDeCoder.start();
-        endProducersEnDeCoder = new EndProducersEnDeCoder(encodingRegistry);
-        endProducersEnDeCoder.start();
-        endpointReferenceEnDeCoder = new EndpointReferenceEnDeCoder(encodingRegistry);
-        endpointReferenceEnDeCoder.start();
-        referencePropertiesEnDeCoder = new ReferencePropertiesEnDeCoder(encodingRegistry); 
-        referencePropertiesEnDeCoder.start();
-        brokerIDEnDeCoder = new BrokerIDEnDeCoder(encodingRegistry);
-        brokerIDEnDeCoder.start();
-        connectionOverrideEnDeCoder = new ConnectionOverrideEnDeCoder(encodingRegistry);
-        connectionOverrideEnDeCoder.start();
-        connectionOverrideResponseEnDeCoder = new ConnectionOverrideResponseEnDeCoder(encodingRegistry);
-        connectionOverrideResponseEnDeCoder.start();
-        newBrokerAckEnDeCoder = new NewBrokerAckEnDeCoder(encodingRegistry);
-        newBrokerAckEnDeCoder.start();
-        neighborBrokerConsumersEnDeCoder = new NeighborBrokerConsumersEnDeCoder(encodingRegistry);
-        neighborBrokerConsumersEnDeCoder.start();
-        removeBrokerEnDeCoder = new RemoveBrokerEnDeCoder(encodingRegistry);
-        removeBrokerEnDeCoder.start();
-        removedBrokerEnDeCoder = new RemovedBrokerEnDeCoder(encodingRegistry);
-        removedBrokerEnDeCoder.start();
-        neighborsEnDeCoder = new NeighborsEnDeCoder(encodingRegistry);
-        neighborsEnDeCoder.start();
-        replaceBrokerConnectionEnDeCoder = new ReplaceBrokerConnectionEnDeCoder(encodingRegistry);
-        replaceBrokerConnectionEnDeCoder.start();
-        
-        String httpPort = System.getProperty("notification.httpPort");
-        if (httpPort == null) {
-            httpPort = DEFAULT_PORT;
-        }
-
-        ServletHost servletHost = new ExtensibleServletHost(registry.getExtensionPoint(ServletHostExtensionPoint.class));
-
-        ntm = new NotificationTypeManagerImpl();
-        ntm.setServletHost(servletHost);
-        ntm.setEncodingRegistry(encodingRegistry);
-        ntm.init();
-
-        String localHost = null;
-        try {
-            localHost = InetAddress.getLocalHost().getCanonicalHostName();
-        } catch(Exception e) {
-            e.printStackTrace();
-            localHost = "localhost";
-        }
-        String localBaseUrl = "http://" + localHost + ((httpPort != null) ? (":" + httpPort) : "");
-
         AssemblyFactory assemblyFactory = new DefaultAssemblyFactory();
         PolicyFactory policyFactory = new DefaultPolicyFactory();
         DefaultNotificationBindingFactory bindingFactory = new DefaultNotificationBindingFactory();
@@ -183,41 +54,13 @@
         processors.addArtifactProcessor(bindingProcessor);
         
         NotificationBindingProviderFactory nbpf = new NotificationBindingProviderFactory(servletHost,
-                                                                                         ntm,
-                                                                                         encodingRegistry,
-                                                                                         localBaseUrl);
+                                                                                         encodingRegistry);
         ProviderFactoryExtensionPoint providerFactories = registry.getExtensionPoint(ProviderFactoryExtensionPoint.class);
         providerFactories.addProviderFactory(nbpf);
     }
 
     public void stop(ExtensionPointRegistry registry) {
-        subscribeEnDeCoder.stop();
-        consumerReferenceEnDeCoder.stop();
-        endpointAddressEnDeCoder.stop();
-        newConsumerEnDeCoder.stop();
-        newProducerEnDeCoder.stop();
-        newConsumerResponseEnDeCoder.stop();
-        newProducerResponseEnDeCoder.stop();
-        newBrokerEnDeCoder.stop();
-        brokerConsumerReferenceEnDeCoder.stop();
-        brokerProducerReferenceEnDeCoder.stop();
-        newBrokerResponseEnDeCoder.stop();
-        brokersEnDeCoder.stop();
-        brokerEnDeCoder.stop();
-        endConsumersEnDeCoder.stop();
-        endProducersEnDeCoder.stop();
-        endpointReferenceEnDeCoder.stop();
-        referencePropertiesEnDeCoder.stop();
-        brokerIDEnDeCoder.stop();
-        connectionOverrideEnDeCoder.stop();
-        connectionOverrideResponseEnDeCoder.stop();
-        newBrokerAckEnDeCoder.stop();
-        neighborBrokerConsumersEnDeCoder.stop();
-        removeBrokerEnDeCoder.stop();
-        removedBrokerEnDeCoder.stop();
-        neighborsEnDeCoder.stop();
-        replaceBrokerConnectionEnDeCoder.stop();
-
+    	encodingRegistry.stop();
         StAXArtifactProcessorExtensionPoint processors = registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
         processors.removeArtifactProcessor(bindingProcessor);
     }

Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProviderFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProviderFactory.java?rev=576985&r1=576984&r2=576985&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProviderFactory.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProviderFactory.java Tue Sep 18 10:19:19 2007
@@ -18,6 +18,7 @@
  */
 package org.apache.tuscany.sca.binding.notification;
 
+import java.net.InetAddress;
 import java.net.URI;
 import java.net.URL;
 import java.util.ArrayList;
@@ -25,9 +26,36 @@
 import java.util.List;
 import java.util.Map;
 
+import org.apache.tuscany.sca.binding.notification.encoding.AbstractEnDeCoder;
+import org.apache.tuscany.sca.binding.notification.encoding.BrokerConsumerReferenceEnDeCoder;
+import org.apache.tuscany.sca.binding.notification.encoding.BrokerEnDeCoder;
 import org.apache.tuscany.sca.binding.notification.encoding.BrokerID;
+import org.apache.tuscany.sca.binding.notification.encoding.BrokerIDEnDeCoder;
+import org.apache.tuscany.sca.binding.notification.encoding.BrokerProducerReferenceEnDeCoder;
+import org.apache.tuscany.sca.binding.notification.encoding.BrokersEnDeCoder;
+import org.apache.tuscany.sca.binding.notification.encoding.ConnectionOverrideEnDeCoder;
+import org.apache.tuscany.sca.binding.notification.encoding.ConnectionOverrideResponseEnDeCoder;
+import org.apache.tuscany.sca.binding.notification.encoding.ConsumerReferenceEnDeCoder;
 import org.apache.tuscany.sca.binding.notification.encoding.EncodingRegistry;
+import org.apache.tuscany.sca.binding.notification.encoding.EndConsumersEnDeCoder;
+import org.apache.tuscany.sca.binding.notification.encoding.EndProducersEnDeCoder;
+import org.apache.tuscany.sca.binding.notification.encoding.EndpointAddressEnDeCoder;
 import org.apache.tuscany.sca.binding.notification.encoding.EndpointReference;
+import org.apache.tuscany.sca.binding.notification.encoding.EndpointReferenceEnDeCoder;
+import org.apache.tuscany.sca.binding.notification.encoding.NeighborBrokerConsumersEnDeCoder;
+import org.apache.tuscany.sca.binding.notification.encoding.NeighborsEnDeCoder;
+import org.apache.tuscany.sca.binding.notification.encoding.NewBrokerAckEnDeCoder;
+import org.apache.tuscany.sca.binding.notification.encoding.NewBrokerEnDeCoder;
+import org.apache.tuscany.sca.binding.notification.encoding.NewBrokerResponseEnDeCoder;
+import org.apache.tuscany.sca.binding.notification.encoding.NewConsumerEnDeCoder;
+import org.apache.tuscany.sca.binding.notification.encoding.NewConsumerResponseEnDeCoder;
+import org.apache.tuscany.sca.binding.notification.encoding.NewProducerEnDeCoder;
+import org.apache.tuscany.sca.binding.notification.encoding.NewProducerResponseEnDeCoder;
+import org.apache.tuscany.sca.binding.notification.encoding.ReferencePropertiesEnDeCoder;
+import org.apache.tuscany.sca.binding.notification.encoding.RemoveBrokerEnDeCoder;
+import org.apache.tuscany.sca.binding.notification.encoding.RemovedBrokerEnDeCoder;
+import org.apache.tuscany.sca.binding.notification.encoding.ReplaceBrokerConnectionEnDeCoder;
+import org.apache.tuscany.sca.binding.notification.encoding.SubscribeEnDeCoder;
 import org.apache.tuscany.sca.host.http.ServletHost;
 import org.apache.tuscany.sca.provider.BindingProviderFactory;
 import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
@@ -38,55 +66,48 @@
 
 /**
  * The runtime representaion of the notification reference binding
- *
+ * 
  * @version $Rev$ $Date$
  */
-public class NotificationBindingProviderFactory implements BindingProviderFactory<NotificationBinding>, NotificationBrokerManager {
+public class NotificationBindingProviderFactory implements BindingProviderFactory<NotificationBinding>,
+    NotificationBrokerManager {
+    private static final String DEFAULT_PORT = "8083";
 
     private ServletHost servletHost;
-    private NotificationTypeManager notificationTypeManager;
+    private NotificationTypeManagerImpl notificationTypeManager;
     private EncodingRegistry encodingRegistry;
     private String httpUrl;
     private Map<URI, NotificationReferenceBindingProvider> referenceBindingProviders;
     private Map<URI, NotificationServiceBindingProvider> serviceBindingProviders;
-    
+
     private static NotificationBindingProviderFactory factoryInstance = null;
-    
-    public NotificationBindingProviderFactory(ServletHost servletHost,
-                                              NotificationTypeManager notificationTypeManager,
-                                              EncodingRegistry encodingRegistry,
-                                              String httpUrl) {
+
+    public NotificationBindingProviderFactory(ServletHost servletHost, EncodingRegistry encodingRegistry) {
         this.servletHost = servletHost;
-        this.notificationTypeManager = notificationTypeManager;
         this.encodingRegistry = encodingRegistry;
-        this.httpUrl = httpUrl;
         this.referenceBindingProviders = new HashMap<URI, NotificationReferenceBindingProvider>();
         this.serviceBindingProviders = new HashMap<URI, NotificationServiceBindingProvider>();
-        
+
         factoryInstance = this;
     }
-    
+
     public Class<NotificationBinding> getModelType() {
         return NotificationBinding.class;
     }
-    
+
     public ReferenceBindingProvider createReferenceBindingProvider(RuntimeComponent component,
                                                                    RuntimeComponentReference reference,
                                                                    NotificationBinding binding) {
+        init();
         URI notificationType = binding.getNotificationType();
         if (!validReferenceBinding(binding)) {
             throw new RuntimeException("Binding not valid");
         }
         NotificationReferenceBindingProvider referenceBindingProvider = referenceBindingProviders.get(notificationType);
         if (referenceBindingProvider == null) {
-            referenceBindingProvider = new NotificationReferenceBindingProvider(binding,
-                                                                                component,
-                                                                                reference,
-                                                                                servletHost,
-                                                                                notificationTypeManager,
-                                                                                encodingRegistry,
-                                                                                httpUrl,
-                                                                                this);
+            referenceBindingProvider =
+                new NotificationReferenceBindingProvider(binding, component, reference, servletHost,
+                                                         notificationTypeManager, encodingRegistry, httpUrl, this);
             referenceBindingProviders.put(notificationType, referenceBindingProvider);
         }
         return referenceBindingProvider;
@@ -95,25 +116,21 @@
     public ServiceBindingProvider createServiceBindingProvider(RuntimeComponent component,
                                                                RuntimeComponentService service,
                                                                NotificationBinding binding) {
+        init();
         URI notificationType = binding.getNotificationType();
         if (!validServiceBinding(binding)) {
             throw new RuntimeException("Binding not valid");
         }
         NotificationServiceBindingProvider serviceBindingProvider = serviceBindingProviders.get(notificationType);
         if (serviceBindingProvider == null) {
-            serviceBindingProvider =  new NotificationServiceBindingProvider(binding,
-                                                                             component,
-                                                                             service,
-                                                                             servletHost,
-                                                                             notificationTypeManager,
-                                                                             encodingRegistry,
-                                                                             httpUrl,
-                                                                             this);
+            serviceBindingProvider =
+                new NotificationServiceBindingProvider(binding, component, service, servletHost,
+                                                       notificationTypeManager, encodingRegistry, httpUrl, this);
             serviceBindingProviders.put(notificationType, serviceBindingProvider);
         }
         return serviceBindingProvider;
     }
-    
+
     private boolean validServiceBinding(NotificationBinding binding) {
         URI notificationType = binding.getNotificationType();
         NotificationReferenceBindingProvider referenceBindingProvider = referenceBindingProviders.get(notificationType);
@@ -122,7 +139,7 @@
         }
         return true;
     }
-    
+
     private boolean validReferenceBinding(NotificationBinding binding) {
         URI notificationType = binding.getNotificationType();
         NotificationServiceBindingProvider serviceBindingProvider = serviceBindingProviders.get(notificationType);
@@ -131,25 +148,23 @@
         }
         return true;
     }
-    
+
     private boolean validBinding(NotificationBinding binding1, NotificationBinding binding2) {
         String binding1NtmAddress = binding1.getNtmAddress();
         String binding2NtmAddress = binding2.getNtmAddress();
         if (binding1NtmAddress == null && binding2NtmAddress == null) {
             return true;
-        }
-        else if (binding1NtmAddress == null || binding2NtmAddress == null) {
+        } else if (binding1NtmAddress == null || binding2NtmAddress == null) {
             return false;
-        }
-        else {
+        } else {
             return binding1NtmAddress.equals(binding2NtmAddress);
         }
     }
-    
+
     /*
-     * These methods are intended to be called by the binding providers' start methods. By the time this
-     * happens, both referenceBindingProvider != null && serviceBindingProvider != null, if they are
-     * ever going to be
+     * These methods are intended to be called by the binding providers' start
+     * methods. By the time this happens, both referenceBindingProvider != null &&
+     * serviceBindingProvider != null, if they are ever going to be
      */
     public void serviceProviderStarted(URI notificationType,
                                        NotificationServiceBindingProvider serviceBindingProvider,
@@ -157,26 +172,24 @@
         NotificationReferenceBindingProvider referenceBindingProvider = referenceBindingProviders.get(notificationType);
         if (referenceBindingProvider == null) {
             serviceBindingProvider.deployConsumer();
-        }
-        else if (referenceBindingProvider.isStarted()) {
+        } else if (referenceBindingProvider.isStarted()) {
             String brokerID = BrokerID.generate();
             deployBroker(notificationType, serviceBindingProvider, referenceBindingProvider, brokerID, remoteNtmUrl);
         }
     }
-    
+
     public void referenceProviderStarted(URI notificationType,
                                          NotificationReferenceBindingProvider referenceBindingProvider,
                                          URL remoteNtmUrl) {
         NotificationServiceBindingProvider serviceBindingProvider = serviceBindingProviders.get(notificationType);
         if (serviceBindingProvider == null) {
             referenceBindingProvider.deployProducer();
-        }
-        else if (serviceBindingProvider.isStarted()) {
+        } else if (serviceBindingProvider.isStarted()) {
             String brokerID = BrokerID.generate();
             deployBroker(notificationType, serviceBindingProvider, referenceBindingProvider, brokerID, remoteNtmUrl);
         }
     }
-    
+
     private void deployBroker(URI notificationType,
                               NotificationServiceBindingProvider serviceBindingProvider,
                               NotificationReferenceBindingProvider referenceBindingProvider,
@@ -186,22 +199,23 @@
         URL producerUrl = referenceBindingProvider.getURL();
         List<EndpointReference> consumerList = new ArrayList<EndpointReference>();
         List<EndpointReference> producerList = new ArrayList<EndpointReference>();
-        boolean firstBroker = notificationTypeManager.newBroker(notificationType,
-                                                                consumerUrl,
-                                                                producerUrl,
-                                                                brokerID,
-                                                                remoteNtmUrl,
-                                                                consumerList,
-                                                                producerList);
+        boolean firstBroker =
+            notificationTypeManager.newBroker(notificationType,
+                                              consumerUrl,
+                                              producerUrl,
+                                              brokerID,
+                                              remoteNtmUrl,
+                                              consumerList,
+                                              producerList);
         if (firstBroker) {
             serviceBindingProvider.deployBroker(brokerID, null, producerList);
             referenceBindingProvider.deployBroker(brokerID, null, consumerList);
             if (!consumerList.isEmpty() || !producerList.isEmpty()) {
                 notificationTypeManager.newBrokerAck(remoteNtmUrl);
             }
-        }
-        else {
-            // returned lists contain broker consumers and producers and are the same length
+        } else {
+            // returned lists contain broker consumers and producers and are the
+            // same length
             int index = consumerList.size() - 1;
             // establish connection with picked broker
             EndpointReference brokerConsumerEPR = consumerList.get(index);
@@ -210,7 +224,7 @@
             referenceBindingProvider.deployBroker(brokerID, brokerConsumerEPR, null);
         }
     }
-    
+
     public void replaceConsumersBrokerConnection(URI notificationType, EndpointReference chosenBrokerProducerEpr) {
         NotificationServiceBindingProvider serviceBindingProvider = serviceBindingProviders.get(notificationType);
         if (serviceBindingProvider == null) {
@@ -218,16 +232,103 @@
         }
         serviceBindingProvider.replaceBrokerConnection(chosenBrokerProducerEpr);
     }
-    
+
     public static void removeBroker(URI notificationType) {
         if (factoryInstance == null) {
             throw new RuntimeException("Missing factory instance");
         }
-        NotificationReferenceBindingProvider referenceBindingProvider = factoryInstance.referenceBindingProviders.get(notificationType);
-        NotificationServiceBindingProvider serviceBindingProvider = factoryInstance.serviceBindingProviders.get(notificationType);
+        NotificationReferenceBindingProvider referenceBindingProvider =
+            factoryInstance.referenceBindingProviders.get(notificationType);
+        NotificationServiceBindingProvider serviceBindingProvider =
+            factoryInstance.serviceBindingProviders.get(notificationType);
         if (referenceBindingProvider == null || serviceBindingProvider == null) {
             throw new RuntimeException("Not a broker for [" + notificationType + "]");
         }
         referenceBindingProvider.undeployBroker(serviceBindingProvider.getURL());
     }
+
+    private String getBaseURI() {
+        if (httpUrl == null) {
+            String httpPort = System.getProperty("notification.httpPort");
+            if (httpPort == null) {
+                httpPort = DEFAULT_PORT;
+            }
+            String localHost = null;
+            try {
+                localHost = InetAddress.getLocalHost().getCanonicalHostName();
+            } catch (Exception e) {
+                e.printStackTrace();
+                localHost = "localhost";
+            }
+            httpUrl = "http://" + localHost + ((httpPort != null) ? (":" + httpPort) : "");
+        }
+        return httpUrl;
+    }
+
+    @SuppressWarnings("unchecked")
+    public void init() {
+        if (notificationTypeManager == null) {
+            AbstractEnDeCoder subscribeEnDeCoder = new SubscribeEnDeCoder(encodingRegistry);
+            subscribeEnDeCoder.start();
+            AbstractEnDeCoder consumerReferenceEnDeCoder = new ConsumerReferenceEnDeCoder(encodingRegistry);
+            consumerReferenceEnDeCoder.start();
+            AbstractEnDeCoder endpointAddressEnDeCoder = new EndpointAddressEnDeCoder(encodingRegistry);
+            endpointAddressEnDeCoder.start();
+            AbstractEnDeCoder newConsumerEnDeCoder = new NewConsumerEnDeCoder(encodingRegistry);
+            newConsumerEnDeCoder.start();
+            AbstractEnDeCoder newProducerEnDeCoder = new NewProducerEnDeCoder(encodingRegistry);
+            newProducerEnDeCoder.start();
+            AbstractEnDeCoder newConsumerResponseEnDeCoder = new NewConsumerResponseEnDeCoder(encodingRegistry);
+            newConsumerResponseEnDeCoder.start();
+            AbstractEnDeCoder newProducerResponseEnDeCoder = new NewProducerResponseEnDeCoder(encodingRegistry);
+            newProducerResponseEnDeCoder.start();
+            AbstractEnDeCoder newBrokerEnDeCoder = new NewBrokerEnDeCoder(encodingRegistry);
+            newBrokerEnDeCoder.start();
+            AbstractEnDeCoder brokerConsumerReferenceEnDeCoder = new BrokerConsumerReferenceEnDeCoder(encodingRegistry);
+            brokerConsumerReferenceEnDeCoder.start();
+            AbstractEnDeCoder brokerProducerReferenceEnDeCoder = new BrokerProducerReferenceEnDeCoder(encodingRegistry);
+            brokerProducerReferenceEnDeCoder.start();
+            AbstractEnDeCoder newBrokerResponseEnDeCoder = new NewBrokerResponseEnDeCoder(encodingRegistry);
+            newBrokerResponseEnDeCoder.start();
+            AbstractEnDeCoder brokersEnDeCoder = new BrokersEnDeCoder(encodingRegistry);
+            brokersEnDeCoder.start();
+            AbstractEnDeCoder brokerEnDeCoder = new BrokerEnDeCoder(encodingRegistry);
+            brokerEnDeCoder.start();
+            AbstractEnDeCoder endConsumersEnDeCoder = new EndConsumersEnDeCoder(encodingRegistry);
+            endConsumersEnDeCoder.start();
+            AbstractEnDeCoder endProducersEnDeCoder = new EndProducersEnDeCoder(encodingRegistry);
+            endProducersEnDeCoder.start();
+            AbstractEnDeCoder endpointReferenceEnDeCoder = new EndpointReferenceEnDeCoder(encodingRegistry);
+            endpointReferenceEnDeCoder.start();
+            AbstractEnDeCoder referencePropertiesEnDeCoder = new ReferencePropertiesEnDeCoder(encodingRegistry);
+            referencePropertiesEnDeCoder.start();
+            AbstractEnDeCoder brokerIDEnDeCoder = new BrokerIDEnDeCoder(encodingRegistry);
+            brokerIDEnDeCoder.start();
+            AbstractEnDeCoder connectionOverrideEnDeCoder = new ConnectionOverrideEnDeCoder(encodingRegistry);
+            connectionOverrideEnDeCoder.start();
+            AbstractEnDeCoder connectionOverrideResponseEnDeCoder =
+                new ConnectionOverrideResponseEnDeCoder(encodingRegistry);
+            connectionOverrideResponseEnDeCoder.start();
+            AbstractEnDeCoder newBrokerAckEnDeCoder = new NewBrokerAckEnDeCoder(encodingRegistry);
+            newBrokerAckEnDeCoder.start();
+            AbstractEnDeCoder neighborBrokerConsumersEnDeCoder = new NeighborBrokerConsumersEnDeCoder(encodingRegistry);
+            neighborBrokerConsumersEnDeCoder.start();
+            AbstractEnDeCoder removeBrokerEnDeCoder = new RemoveBrokerEnDeCoder(encodingRegistry);
+            removeBrokerEnDeCoder.start();
+            AbstractEnDeCoder removedBrokerEnDeCoder = new RemovedBrokerEnDeCoder(encodingRegistry);
+            removedBrokerEnDeCoder.start();
+            AbstractEnDeCoder neighborsEnDeCoder = new NeighborsEnDeCoder(encodingRegistry);
+            neighborsEnDeCoder.start();
+            AbstractEnDeCoder replaceBrokerConnectionEnDeCoder = new ReplaceBrokerConnectionEnDeCoder(encodingRegistry);
+            replaceBrokerConnectionEnDeCoder.start();
+
+            notificationTypeManager = new NotificationTypeManagerImpl();
+            notificationTypeManager.setServletHost(servletHost);
+            notificationTypeManager.setEncodingRegistry(encodingRegistry);
+            notificationTypeManager.init();
+
+            getBaseURI();
+        }
+    }
+
 }

Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractEnDeCoder.java?rev=576985&r1=576984&r2=576985&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractEnDeCoder.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractEnDeCoder.java Tue Sep 18 10:19:19 2007
@@ -23,41 +23,28 @@
 /**
  * @version $Rev$ $Date$
  */
-public abstract class AbstractEnDeCoder<E extends EncodingObject> implements EnDeCoder<E> {
+public abstract class AbstractEnDeCoder<E extends EncodingObject> implements
+		EnDeCoder<E> {
+
+	protected EncodingRegistry registry;
+
+	protected AbstractEnDeCoder(EncodingRegistry registry) {
+
+		this.registry = registry;
+	}
+
+	public void start() {
+		Class<E> encodingType = getEncodingObjectType();
+		QName encodingQName = getEncodingObjectQName();
+
+		registry.registerEnDeCoder(encodingType, encodingQName, this);
+	}
+
+	public void stop() {
+		Class<E> encodingType = getEncodingObjectType();
+		QName encodingQName = getEncodingObjectQName();
+
+		registry.unregisterEnDeCoder(encodingType, encodingQName);
+	}
 
-    protected EncodingRegistry registry;
-    
-    protected AbstractEnDeCoder(EncodingRegistry registry) {
-        
-        this.registry = registry;
-    }
-
-    public void start() {
-        Class<E> encodingType = getEncodingObjectType();
-        QName encodingQName = getEncodingObjectQName();
-
-        registry.registerEnDeCoder(encodingType, encodingQName, this);
-    }
-
-    public void stop() {
-        Class<E> encodingType = getEncodingObjectType();
-        QName encodingQName = getEncodingObjectQName();
-
-        registry.unregisterEnDeCoder(encodingType, encodingQName);
-    }
-
-    /**
-     * Gets the qualified name of the XML fragment for the Encoding
-     * object.
-     * 
-     * @return Qualified name of the XML fragment.
-     */
-    protected abstract QName getEncodingObjectQName();
-
-    /**
-     * Returns the type of the encoding object.
-     * 
-     * @return Encoding object type.
-     */
-    protected abstract Class<E> getEncodingObjectType();
 }

Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReferenceEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReferenceEnDeCoder.java?rev=576985&r1=576984&r2=576985&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReferenceEnDeCoder.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReferenceEnDeCoder.java Tue Sep 18 10:19:19 2007
@@ -32,13 +32,13 @@
         super(registry);
     }
 
-    @Override
-    protected QName getEncodingObjectQName() {
+    
+	public QName getEncodingObjectQName() {
         return QNAME;
     }
 
-    @Override
-    protected Class<BrokerConsumerReference> getEncodingObjectType() {
+    
+	public Class<BrokerConsumerReference> getEncodingObjectType() {
         return BrokerConsumerReference.class;
     }
 }

Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerEnDeCoder.java?rev=576985&r1=576984&r2=576985&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerEnDeCoder.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerEnDeCoder.java Tue Sep 18 10:19:19 2007
@@ -32,14 +32,14 @@
         super(registry);
     }
 
-    @Override
-    protected QName getEncodingObjectQName() {
+    
+	public QName getEncodingObjectQName() {
         
         return QNAME;
     }
 
-    @Override
-    protected Class<Broker> getEncodingObjectType() {
+    
+	public Class<Broker> getEncodingObjectType() {
         
         return Broker.class;
     }

Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerIDEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerIDEnDeCoder.java?rev=576985&r1=576984&r2=576985&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerIDEnDeCoder.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerIDEnDeCoder.java Tue Sep 18 10:19:19 2007
@@ -77,14 +77,14 @@
         }
     }
 
-    @Override
-    protected QName getEncodingObjectQName() {
+    
+	public QName getEncodingObjectQName() {
         
         return QNAME;
     }
 
-    @Override
-    protected Class<BrokerID> getEncodingObjectType() {
+    
+	public Class<BrokerID> getEncodingObjectType() {
         
         return BrokerID.class;
     }

Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReferenceEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReferenceEnDeCoder.java?rev=576985&r1=576984&r2=576985&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReferenceEnDeCoder.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReferenceEnDeCoder.java Tue Sep 18 10:19:19 2007
@@ -32,13 +32,13 @@
         super(registry);
     }
 
-    @Override
-    protected QName getEncodingObjectQName() {
+    
+	public QName getEncodingObjectQName() {
         return QNAME;
     }
 
-    @Override
-    protected Class<BrokerProducerReference> getEncodingObjectType() {
+    
+	public Class<BrokerProducerReference> getEncodingObjectType() {
         return BrokerProducerReference.class;
     }
 }

Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokersEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokersEnDeCoder.java?rev=576985&r1=576984&r2=576985&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokersEnDeCoder.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokersEnDeCoder.java Tue Sep 18 10:19:19 2007
@@ -75,14 +75,14 @@
         }
     }
 
-    @Override
-    protected QName getEncodingObjectQName() {
+    
+	public QName getEncodingObjectQName() {
         
         return QNAME;
     }
 
-    @Override
-    protected Class<Brokers> getEncodingObjectType() {
+    
+	public Class<Brokers> getEncodingObjectType() {
         
         return Brokers.class;
     }

Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideEnDeCoder.java?rev=576985&r1=576984&r2=576985&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideEnDeCoder.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideEnDeCoder.java Tue Sep 18 10:19:19 2007
@@ -69,14 +69,14 @@
         }
     }
 
-    @Override
-    protected QName getEncodingObjectQName() {
+    
+	public QName getEncodingObjectQName() {
         
         return QNAME;
     }
 
-    @Override
-    protected Class<ConnectionOverride> getEncodingObjectType() {
+    
+	public Class<ConnectionOverride> getEncodingObjectType() {
         
         return ConnectionOverride.class;
     }

Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponseEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponseEnDeCoder.java?rev=576985&r1=576984&r2=576985&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponseEnDeCoder.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponseEnDeCoder.java Tue Sep 18 10:19:19 2007
@@ -63,14 +63,14 @@
         }
     }
 
-    @Override
-    protected QName getEncodingObjectQName() {
+    
+	public QName getEncodingObjectQName() {
         
         return QNAME;
     }
 
-    @Override
-    protected Class<ConnectionOverrideResponse> getEncodingObjectType() {
+    
+	public Class<ConnectionOverrideResponse> getEncodingObjectType() {
         
         return ConnectionOverrideResponse.class;
     }

Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReferenceEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReferenceEnDeCoder.java?rev=576985&r1=576984&r2=576985&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReferenceEnDeCoder.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReferenceEnDeCoder.java Tue Sep 18 10:19:19 2007
@@ -32,13 +32,13 @@
         super(registry);
     }
 
-    @Override
-    protected QName getEncodingObjectQName() {
+    
+	public QName getEncodingObjectQName() {
         return QNAME;
     }
 
-    @Override
-    protected Class<ConsumerReference> getEncodingObjectType() {
+    
+	public Class<ConsumerReference> getEncodingObjectType() {
         return ConsumerReference.class;
     }
 }

Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/DefaultEncodingRegistry.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/DefaultEncodingRegistry.java?rev=576985&r1=576984&r2=576985&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/DefaultEncodingRegistry.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/DefaultEncodingRegistry.java Tue Sep 18 10:19:19 2007
@@ -70,4 +70,9 @@
         }
         return decoder.decode(reader);
     }
+    
+    public void stop() {
+    	encoderRegistry.clear();
+    	decoderRegistry.clear();
+    }
 }

Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EnDeCoder.java?rev=576985&r1=576984&r2=576985&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EnDeCoder.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EnDeCoder.java Tue Sep 18 10:19:19 2007
@@ -18,6 +18,7 @@
  */
 package org.apache.tuscany.sca.binding.notification.encoding;
 
+import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
 
@@ -43,4 +44,19 @@
      * @throws EncodingException In case of any encoding error.
      */
     E decode(XMLStreamReader reader) throws EncodingException;
+    
+    /**
+     * Gets the qualified name of the XML fragment for the Encoding
+     * object.
+     * 
+     * @return Qualified name of the XML fragment.
+     */
+    QName getEncodingObjectQName();
+
+    /**
+     * Returns the type of the encoding object.
+     * 
+     * @return Encoding object type.
+     */
+    Class<E> getEncodingObjectType();
 }

Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumersEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumersEnDeCoder.java?rev=576985&r1=576984&r2=576985&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumersEnDeCoder.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumersEnDeCoder.java Tue Sep 18 10:19:19 2007
@@ -35,13 +35,13 @@
         super(registry);
     }
 
-    @Override
-    protected QName getEncodingObjectQName() {
+    
+	public QName getEncodingObjectQName() {
         return QNAME;
     }
 
-    @Override
-    protected Class<EndConsumers> getEncodingObjectType() {
+    
+	public Class<EndConsumers> getEncodingObjectType() {
         return EndConsumers.class;
     }
 

Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducersEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducersEnDeCoder.java?rev=576985&r1=576984&r2=576985&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducersEnDeCoder.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducersEnDeCoder.java Tue Sep 18 10:19:19 2007
@@ -35,13 +35,13 @@
         super(registry);
     }
 
-    @Override
-    protected QName getEncodingObjectQName() {
+    
+	public QName getEncodingObjectQName() {
         return QNAME;
     }
 
-    @Override
-    protected Class<EndProducers> getEncodingObjectType() {
+    
+	public Class<EndProducers> getEncodingObjectType() {
         return EndProducers.class;
     }
 

Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddressEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddressEnDeCoder.java?rev=576985&r1=576984&r2=576985&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddressEnDeCoder.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddressEnDeCoder.java Tue Sep 18 10:19:19 2007
@@ -77,14 +77,14 @@
         }
     }
 
-    @Override
-    protected QName getEncodingObjectQName() {
+    
+	public QName getEncodingObjectQName() {
         
         return QNAME;
     }
 
-    @Override
-    protected Class<EndpointAddress> getEncodingObjectType() {
+    
+	public Class<EndpointAddress> getEncodingObjectType() {
         
         return EndpointAddress.class;
     }

Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceEnDeCoder.java?rev=576985&r1=576984&r2=576985&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceEnDeCoder.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceEnDeCoder.java Tue Sep 18 10:19:19 2007
@@ -87,14 +87,14 @@
         }
     }
 
-    @Override
-    protected QName getEncodingObjectQName() {
+    
+	public QName getEncodingObjectQName() {
         
         return QNAME;
     }
 
-    @Override
-    protected Class<EndpointReference> getEncodingObjectType() {
+    
+	public Class<EndpointReference> getEncodingObjectType() {
         
         return EndpointReference.class;
     }

Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumersEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumersEnDeCoder.java?rev=576985&r1=576984&r2=576985&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumersEnDeCoder.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumersEnDeCoder.java Tue Sep 18 10:19:19 2007
@@ -35,13 +35,13 @@
         super(registry);
     }
 
-    @Override
-    protected QName getEncodingObjectQName() {
+    
+	public QName getEncodingObjectQName() {
         return QNAME;
     }
 
-    @Override
-    protected Class<NeighborBrokerConsumers> getEncodingObjectType() {
+    
+	public Class<NeighborBrokerConsumers> getEncodingObjectType() {
         return NeighborBrokerConsumers.class;
     }
 

Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborsEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborsEnDeCoder.java?rev=576985&r1=576984&r2=576985&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborsEnDeCoder.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborsEnDeCoder.java Tue Sep 18 10:19:19 2007
@@ -75,14 +75,14 @@
         }
     }
 
-    @Override
-    protected QName getEncodingObjectQName() {
+    
+	public QName getEncodingObjectQName() {
         
         return QNAME;
     }
 
-    @Override
-    protected Class<Neighbors> getEncodingObjectType() {
+    
+	public Class<Neighbors> getEncodingObjectType() {
         
         return Neighbors.class;
     }

Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAckEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAckEnDeCoder.java?rev=576985&r1=576984&r2=576985&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAckEnDeCoder.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAckEnDeCoder.java Tue Sep 18 10:19:19 2007
@@ -63,14 +63,14 @@
         }
     }
 
-    @Override
-    protected QName getEncodingObjectQName() {
+    
+	public QName getEncodingObjectQName() {
         
         return QNAME;
     }
 
-    @Override
-    protected Class<NewBrokerAck> getEncodingObjectType() {
+    
+	public Class<NewBrokerAck> getEncodingObjectType() {
         
         return NewBrokerAck.class;
     }

Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerEnDeCoder.java?rev=576985&r1=576984&r2=576985&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerEnDeCoder.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerEnDeCoder.java Tue Sep 18 10:19:19 2007
@@ -32,14 +32,14 @@
         super(registry);
     }
 
-    @Override
-    protected QName getEncodingObjectQName() {
+    
+	public QName getEncodingObjectQName() {
         
         return QNAME;
     }
 
-    @Override
-    protected Class<NewBroker> getEncodingObjectType() {
+    
+	public Class<NewBroker> getEncodingObjectType() {
         
         return NewBroker.class;
     }

Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponseEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponseEnDeCoder.java?rev=576985&r1=576984&r2=576985&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponseEnDeCoder.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponseEnDeCoder.java Tue Sep 18 10:19:19 2007
@@ -105,14 +105,14 @@
         }
     }
 
-    @Override
-    protected QName getEncodingObjectQName() {
+    
+	public QName getEncodingObjectQName() {
         
         return QNAME;
     }
 
-    @Override
-    protected Class<NewBrokerResponse> getEncodingObjectType() {
+    
+	public Class<NewBrokerResponse> getEncodingObjectType() {
         
         return NewBrokerResponse.class;
     }

Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerEnDeCoder.java?rev=576985&r1=576984&r2=576985&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerEnDeCoder.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerEnDeCoder.java Tue Sep 18 10:19:19 2007
@@ -32,13 +32,13 @@
         super(registry);
     }
 
-    @Override
-    protected QName getEncodingObjectQName() {
+    
+	public QName getEncodingObjectQName() {
         return QNAME;
     }
 
-    @Override
-    protected Class<NewConsumer> getEncodingObjectType() {
+    
+	public Class<NewConsumer> getEncodingObjectType() {
         return NewConsumer.class;
     }
 }

Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponseEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponseEnDeCoder.java?rev=576985&r1=576984&r2=576985&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponseEnDeCoder.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponseEnDeCoder.java Tue Sep 18 10:19:19 2007
@@ -35,13 +35,13 @@
         super(registry);
     }
 
-    @Override
-    protected QName getEncodingObjectQName() {
+    
+	public QName getEncodingObjectQName() {
         return QNAME;
     }
 
-    @Override
-    protected Class<NewConsumerResponse> getEncodingObjectType() {
+    
+	public Class<NewConsumerResponse> getEncodingObjectType() {
         return NewConsumerResponse.class;
     }
 

Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerEnDeCoder.java?rev=576985&r1=576984&r2=576985&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerEnDeCoder.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerEnDeCoder.java Tue Sep 18 10:19:19 2007
@@ -32,13 +32,13 @@
         super(registry);
     }
 
-    @Override
-    protected QName getEncodingObjectQName() {
+    
+	public QName getEncodingObjectQName() {
         return QNAME;
     }
 
-    @Override
-    protected Class<NewProducer> getEncodingObjectType() {
+    
+	public Class<NewProducer> getEncodingObjectType() {
         return NewProducer.class;
     }
 }

Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponseEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponseEnDeCoder.java?rev=576985&r1=576984&r2=576985&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponseEnDeCoder.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponseEnDeCoder.java Tue Sep 18 10:19:19 2007
@@ -35,17 +35,17 @@
         super(registry);
     }
 
-    @Override
-    protected QName getEncodingObjectQName() {
+    
+	public QName getEncodingObjectQName() {
         return QNAME;
     }
 
-    @Override
-    protected Class<NewProducerResponse> getEncodingObjectType() {
+    
+	public Class<NewProducerResponse> getEncodingObjectType() {
         return NewProducerResponse.class;
     }
 
-    @Override
+	@Override
     protected void encodeSequenceTypeAttribute(NewProducerResponse encodingObject, XMLStreamWriter writer) throws EncodingException {
         try {
             writer.writeAttribute(Constants.ConsumerSequenceType, encodingObject.getSequenceType());

Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferencePropertiesEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferencePropertiesEnDeCoder.java?rev=576985&r1=576984&r2=576985&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferencePropertiesEnDeCoder.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferencePropertiesEnDeCoder.java Tue Sep 18 10:19:19 2007
@@ -73,14 +73,14 @@
         }
     }
 
-    @Override
-    protected QName getEncodingObjectQName() {
+    
+	public QName getEncodingObjectQName() {
         
         return QNAME;
     }
 
-    @Override
-    protected Class<ReferenceProperties> getEncodingObjectType() {
+    
+	public Class<ReferenceProperties> getEncodingObjectType() {
         
         return ReferenceProperties.class;
     }

Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBrokerEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBrokerEnDeCoder.java?rev=576985&r1=576984&r2=576985&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBrokerEnDeCoder.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBrokerEnDeCoder.java Tue Sep 18 10:19:19 2007
@@ -87,14 +87,14 @@
         }
     }
 
-    @Override
-    protected QName getEncodingObjectQName() {
+    
+	public QName getEncodingObjectQName() {
         
         return QNAME;
     }
 
-    @Override
-    protected Class<RemoveBroker> getEncodingObjectType() {
+    
+	public Class<RemoveBroker> getEncodingObjectType() {
         
         return RemoveBroker.class;
     }

Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBrokerEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBrokerEnDeCoder.java?rev=576985&r1=576984&r2=576985&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBrokerEnDeCoder.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBrokerEnDeCoder.java Tue Sep 18 10:19:19 2007
@@ -32,13 +32,13 @@
         super(registry);
     }
 
-    @Override
-    protected QName getEncodingObjectQName() {
+    
+	public QName getEncodingObjectQName() {
         return QNAME;
     }
 
-    @Override
-    protected Class<RemovedBroker> getEncodingObjectType() {
+    
+	public Class<RemovedBroker> getEncodingObjectType() {
         return RemovedBroker.class;
     }
 }

Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnectionEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnectionEnDeCoder.java?rev=576985&r1=576984&r2=576985&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnectionEnDeCoder.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnectionEnDeCoder.java Tue Sep 18 10:19:19 2007
@@ -87,14 +87,14 @@
         }
     }
 
-    @Override
-    protected QName getEncodingObjectQName() {
+    
+	public QName getEncodingObjectQName() {
         
         return QNAME;
     }
 
-    @Override
-    protected Class<ReplaceBrokerConnection> getEncodingObjectType() {
+    
+	public Class<ReplaceBrokerConnection> getEncodingObjectType() {
         
         return ReplaceBrokerConnection.class;
     }

Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/SubscribeEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/SubscribeEnDeCoder.java?rev=576985&r1=576984&r2=576985&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/SubscribeEnDeCoder.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/SubscribeEnDeCoder.java Tue Sep 18 10:19:19 2007
@@ -69,14 +69,14 @@
         }
     }
 
-    @Override
-    protected QName getEncodingObjectQName() {
+    
+	public QName getEncodingObjectQName() {
         
         return QNAME;
     }
 
-    @Override
-    protected Class<Subscribe> getEncodingObjectType() {
+    
+	public Class<Subscribe> getEncodingObjectType() {
         
         return Subscribe.class;
     }

Modified: incubator/tuscany/branches/sca-java-1.0/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java?rev=576985&r1=576984&r2=576985&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java Tue Sep 18 10:19:19 2007
@@ -159,8 +159,8 @@
                                                                             domainPolicySets);
         if (logger.isLoggable(Level.FINE)) {
             long end = System.currentTimeMillis();
-			logger.fine("The tuscany runtime is started in " + (end - start) + " ms.");
-		}
+            logger.fine("The tuscany runtime is started in " + (end - start) + " ms.");
+        }
     }
     
     private SCADefinitions loadDomainDefinitions(SCADefinitionsDocumentProcessor definitionsProcessor) throws ActivationException {
@@ -200,8 +200,8 @@
         
         if (logger.isLoggable(Level.FINE)) {
             long end = System.currentTimeMillis();
-			logger.fine("The tuscany runtime is stopped in " + (end - start) + " ms.");
-		}
+            logger.fine("The tuscany runtime is stopped in " + (end - start) + " ms.");
+        }
     }
 
     public ContributionService getContributionService() {
@@ -245,36 +245,37 @@
         return modules;
     }
     
-    private void startModules(ExtensionPointRegistry registry, List<ModuleActivator> modules) throws ActivationException {
-    	boolean debug = logger.isLoggable(Level.FINE);
+    private void startModules(ExtensionPointRegistry registry, List<ModuleActivator> modules)
+        throws ActivationException {
+        boolean debug = logger.isLoggable(Level.FINE);
         // Start all the extension modules
         for (ModuleActivator module : modules) {
             long start = 0L;
-        	if (debug) {
-				logger.fine(module.getClass().getName() + " is starting.");
-            	start = System.currentTimeMillis();
-        	}
+            if (debug) {
+                logger.fine(module.getClass().getName() + " is starting.");
+                start = System.currentTimeMillis();
+            }
             module.start(registry);
             if (debug) {
-				long end = System.currentTimeMillis();
-				logger.fine(module.getClass().getName() + " is started in " + (end - start) + " ms.");
-			}
+                long end = System.currentTimeMillis();
+                logger.fine(module.getClass().getName() + " is started in " + (end - start) + " ms.");
+            }
         }
     }
 
     private void stopModules(ExtensionPointRegistry registry, List<ModuleActivator> modules) {
-    	boolean debug = logger.isLoggable(Level.FINE);
+        boolean debug = logger.isLoggable(Level.FINE);
         for (ModuleActivator module : modules) {
             long start = 0L;
-        	if (debug) {
-				logger.fine(module.getClass().getName() + " is stopping.");
-            	start = System.currentTimeMillis();
-        	}
+            if (debug) {
+                logger.fine(module.getClass().getName() + " is stopping.");
+                start = System.currentTimeMillis();
+            }
             module.stop(registry);
             if (debug) {
-				long end = System.currentTimeMillis();
-				logger.fine(module.getClass().getName() + " is stopped in " + (end - start) + " ms.");
-			}
+                long end = System.currentTimeMillis();
+                logger.fine(module.getClass().getName() + " is stopped in " + (end - start) + " ms.");
+            }
         }
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org


Mime
View raw message