Merge changes I8c23739a,Ia0e70828

* changes:
  Bulk-add copyright headers to java files
  Bulk-add copyright headers to .xtend files

diff --combined opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java
index 884e7c914e1c1fd43e6a9dd5fdb94b0c30385bd1,7c606e61c5af689c4fc6045c643bc4ea242a93ec..3c5efa5e3af11a44b73fb2fbec2188ef8e7f1340
--- 1/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java
--- 2/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java
+++ b/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java
@@@ -1,3 -1,10 +1,10 @@@
+ /*
+  * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
+  *
+  * This program and the accompanying materials are made available under the
+  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+  * and is available at http://www.eclipse.org/legal/epl-v10.html
+  */
  package org.opendaylight.controller.test.sal.binding.it;
  
  import static org.ops4j.pax.exam.CoreOptions.frameworkProperty;
@@@ -58,7 -65,7 +65,7 @@@ public class TestHelper 
  
                  mavenBundle(CONTROLLER, "netconf-client").versionAsInProject(), //
                  mavenBundle(CONTROLLER, "netconf-util").versionAsInProject(), //
 -                mavenBundle(CONTROLLER + ".thirdparty", "ganymed", "1.0-SNAPSHOT"), //
 +                mavenBundle(CONTROLLER + ".thirdparty", "ganymed").versionAsInProject(), //
                  mavenBundle(CONTROLLER, "netconf-mapping-api").versionAsInProject(), //
  
                  mavenBundle(CONTROLLER, "config-persister-impl").versionAsInProject(), //

diff --combined opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/routing/AbstractDataReadRouter.java
index 4ddceb3b5f015a709e508f73cbb91e4cc46e66e0,200948cc0c78c2bff6959b7fbfb9d03a2aa1ea68..4d395267dd8db5f59ba65d7802d8eade7184f921
--- 1/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/routing/AbstractDataReadRouter.java
--- 2/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/routing/AbstractDataReadRouter.java
+++ b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/routing/AbstractDataReadRouter.java
@@@ -1,3 -1,10 +1,10 @@@
+ /*
+  * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
+  *
+  * This program and the accompanying materials are made available under the
+  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+  * and is available at http://www.eclipse.org/legal/epl-v10.html
+  */
  package org.opendaylight.controller.md.sal.common.impl.routing;
  
  import java.util.Map.Entry;
@@@ -12,7 -19,6 +19,7 @@@ import com.google.common.base.Predicate
  import com.google.common.collect.FluentIterable;
  import com.google.common.collect.HashMultimap;
  import com.google.common.collect.Multimap;
 +import com.google.common.collect.Multimaps;
  
  /**
   * Base abstract implementation of DataReadRouter, which performs
@@@ -23,8 -29,8 +30,8 @@@
   */
  public abstract class AbstractDataReadRouter<P extends Path<P>, D> implements DataReader<P, D> {
  
 -    Multimap<P, DataReaderRegistration<P, D>> configReaders = HashMultimap.create();
 -    Multimap<P, DataReaderRegistration<P, D>> operationalReaders = HashMultimap.create();
 +    Multimap<P, DataReaderRegistration<P, D>> configReaders = Multimaps.synchronizedSetMultimap(HashMultimap.<P, DataReaderRegistration<P, D>>create());
 +    Multimap<P, DataReaderRegistration<P, D>> operationalReaders = Multimaps.synchronizedSetMultimap(HashMultimap.<P, DataReaderRegistration<P, D>>create());
  
      @Override
      public D readConfigurationData(P path) {

diff --combined opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/service/AbstractDataBroker.xtend
index cef88fc375518de22f25b225905311bbc02df0ee,527b42897589bbbd972260296cc16482b7d79db2..927975ca53bbb06bb661225ee70f3e7bcad175b9
--- 1/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/service/AbstractDataBroker.xtend
--- 2/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/service/AbstractDataBroker.xtend
+++ b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/service/AbstractDataBroker.xtend
@@@ -1,3 -1,10 +1,10 @@@
+ /*
+  * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
+  *
+  * This program and the accompanying materials are made available under the
+  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+  * and is available at http://www.eclipse.org/legal/epl-v10.html
+  */
  package org.opendaylight.controller.md.sal.common.impl.service\r
  \r
  import com.google.common.collect.FluentIterable\r
@@@ -37,7 -44,6 +44,7 @@@ import org.opendaylight.yangtools.yang.
  import org.slf4j.LoggerFactory\r
  \r
  import static com.google.common.base.Preconditions.*\rimport org.opendaylight.controller.md.sal.common.api.data.DataChangeEvent
 +import com.google.common.collect.Multimaps
  
  abstract class AbstractDataBroker<P extends Path<P>, D, DCL extends DataChangeListener<P, D>> implements DataModificationTransactionFactory<P, D>, //\r
  DataReader<P, D>, //\r
@@@ -61,8 -67,8 +68,8 @@@ DataProvisionService<P, D> 
      @Property\r
      private val AtomicLong finishedTransactionsCount = new AtomicLong\r
  \r
 -    Multimap<P, DataChangeListenerRegistration<P, D, DCL>> listeners = HashMultimap.create();\r
 -    Multimap<P, DataCommitHandlerRegistrationImpl<P, D>> commitHandlers = HashMultimap.create();\r
 +    Multimap<P, DataChangeListenerRegistration<P, D, DCL>> listeners = Multimaps.synchronizedSetMultimap(HashMultimap.create());\r
 +    Multimap<P, DataCommitHandlerRegistrationImpl<P, D>> commitHandlers = Multimaps.synchronizedSetMultimap(HashMultimap.create());\r
      \r
      val ListenerRegistry<RegistrationListener<DataCommitHandlerRegistration<P,D>>> commitHandlerRegistrationListeners = new ListenerRegistry();\r
      public new() {\r

diff --combined opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/SchemaAwareRpcBroker.java
index f0f5ac3e33926376d59d67669672fa7a15870189,4955eceaffe971b11c8f11f6106935323aa48d3a..28d5ae914fc686a8cd41032755b77db529f9a85b
--- 1/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/SchemaAwareRpcBroker.java
--- 2/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/SchemaAwareRpcBroker.java
+++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/SchemaAwareRpcBroker.java
@@@ -1,3 -1,10 +1,10 @@@
+ /*
+  * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
+  *
+  * This program and the accompanying materials are made available under the
+  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+  * and is available at http://www.eclipse.org/legal/epl-v10.html
+  */
  package org.opendaylight.controller.sal.dom.broker.impl;
  
  import static com.google.common.base.Preconditions.checkArgument;
@@@ -119,7 -126,6 +126,7 @@@ public class SchemaAwareRpcBroker imple
          RpcDefinition definition = findRpcDefinition(rpcType);
          checkArgument(!isRoutedRpc(definition), "RPC Type must not be routed.");
          GlobalRpcRegistration reg = new GlobalRpcRegistration(rpcType, implementation, this);
 +        implementations.putIfAbsent(rpcType, implementation);
          return reg;
      }
  

diff --combined opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/ProxyFactory.xtend
index 3f77133c2e3a2937fac78254b7f858b0ddadf42f,a26fc257c26e49e87f74bc77faf8b0b760868b7c..5b97443b92e455aafb8bcf54cffd1dbc29d2f1e9
--- 1/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/ProxyFactory.xtend
--- 2/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/ProxyFactory.xtend
+++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/ProxyFactory.xtend
@@@ -1,3 -1,10 +1,10 @@@
+ /*
+  * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
+  *
+  * This program and the accompanying materials are made available under the
+  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+  * and is available at http://www.eclipse.org/legal/epl-v10.html
+  */
  package org.opendaylight.controller.sal.dom.broker.osgi
  
  import org.opendaylight.controller.sal.core.api.BrokerService
@@@ -8,7 -15,6 +15,7 @@@ import org.opendaylight.controller.sal.
  import org.opendaylight.controller.sal.core.api.notify.NotificationService
  import org.opendaylight.controller.sal.core.api.model.SchemaService
  import org.opendaylight.controller.sal.core.api.mount.MountProvisionService
 +import org.opendaylight.controller.sal.core.api.RpcProvisionRegistry
  
  class ProxyFactory {
  
@@@ -41,10 -47,6 +48,10 @@@
          new SchemaServiceProxy(ref as ServiceReference<SchemaService>, service);
      }
  
 +    private static def dispatch createProxyImpl(ServiceReference<?> ref, RpcProvisionRegistry service) {
 +        new RpcProvisionRegistryProxy(ref as ServiceReference<RpcProvisionRegistry>, service);
 +    }
 +
      private static def dispatch createProxyImpl(ServiceReference<?> reference, BrokerService service) {
          throw new IllegalArgumentException("Not supported class");
      }

diff --combined opendaylight/md-sal/test/sal-rest-connector-it/src/test/java/org/opendaylight/controller/test/restconf/it/ServiceProviderController.java
index a15e8d616c0ea32b999a72fffdb51ded60b21da6,c4672bf65d590ef21ba359fc73eb5d1820a9eff6..08aeea26783cb203ffaa69655097a3912175eec7
--- 1/opendaylight/md-sal/test/sal-rest-connector-it/src/test/java/org/opendaylight/controller/test/restconf/it/ServiceProviderController.java
--- 2/opendaylight/md-sal/test/sal-rest-connector-it/src/test/java/org/opendaylight/controller/test/restconf/it/ServiceProviderController.java
+++ b/opendaylight/md-sal/test/sal-rest-connector-it/src/test/java/org/opendaylight/controller/test/restconf/it/ServiceProviderController.java
@@@ -1,3 -1,10 +1,10 @@@
+ /*
+  * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
+  *
+  * This program and the accompanying materials are made available under the
+  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+  * and is available at http://www.eclipse.org/legal/epl-v10.html
+  */
  package org.opendaylight.controller.test.restconf.it;
  
  import static junit.framework.Assert.assertEquals;
@@@ -216,7 -223,7 +223,7 @@@ public class ServiceProviderController 
                  mavenBundle(ODL, "netconf-impl").versionAsInProject(),
                  mavenBundle(ODL, "netconf-client").versionAsInProject(),
                  mavenBundle(ODL, "netconf-util").versionAsInProject(),
 -                mavenBundle(ODL + ".thirdparty", "ganymed", "1.0-SNAPSHOT"),
 +                mavenBundle(ODL + ".thirdparty", "ganymed").versionAsInProject(),
                  mavenBundle(ODL, "netconf-mapping-api").versionAsInProject(),
                  mavenBundle(ODL, "config-netconf-connector").versionAsInProject(),
                  mavenBundle(ODL, "config-persister-impl").versionAsInProject(),