Code Review / controller.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 437c1bd)
Moved MD SAL from sal/yang-prototype to md-sal 40/1340/2
authorTony Tkacik <ttkacik@cisco.com>
Mon, 23 Sep 2013 11:54:29 +0000 (13:54 +0200)
committerGiovanni Meo <gmeo@cisco.com>
Tue, 24 Sep 2013 09:57:56 +0000 (11:57 +0200)
Moved MD SAL sources, artefacts from
 opendaylight/sal/yang-prototype to opendaylight/md-sal

Change-Id: Ic3a6dca94faff8cef0dffe830a767d3ad5f0f21a
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
137 files changed:
opendaylight/distribution/opendaylight/pom.xml patch | blob | history
opendaylight/md-sal/model/model-flow-base/pom.xml [moved from opendaylight/sal/yang-prototype/sal/model/model-flow-base/pom.xml with 100% similarity] patch | blob | history
opendaylight/md-sal/model/model-flow-base/src/main/yang/flow-types.yang [moved from opendaylight/sal/yang-prototype/sal/model/model-flow-base/src/main/yang/flow-types.yang with 100% similarity] patch | blob | history
opendaylight/md-sal/model/model-flow-base/src/main/yang/group-types.yang [moved from opendaylight/sal/yang-prototype/sal/model/model-flow-base/src/main/yang/group-types.yang with 100% similarity] patch | blob | history
opendaylight/md-sal/model/model-flow-base/src/main/yang/match-types.yang [moved from opendaylight/sal/yang-prototype/sal/model/model-flow-base/src/main/yang/match-types.yang with 100% similarity] patch | blob | history
opendaylight/md-sal/model/model-flow-base/src/main/yang/meter-types.yang [moved from opendaylight/sal/yang-prototype/sal/model/model-flow-base/src/main/yang/meter-types.yang with 100% similarity] patch | blob | history
opendaylight/md-sal/model/model-flow-service/pom.xml [moved from opendaylight/sal/yang-prototype/sal/model/model-flow-service/pom.xml with 100% similarity] patch | blob | history
opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-service.yang [moved from opendaylight/sal/yang-prototype/sal/model/model-flow-service/src/main/yang/flow-service.yang with 100% similarity] patch | blob | history
opendaylight/md-sal/model/model-flow-service/src/main/yang/group-service.yang [moved from opendaylight/sal/yang-prototype/sal/model/model-flow-service/src/main/yang/group-service.yang with 100% similarity] patch | blob | history
opendaylight/md-sal/model/model-flow-service/src/main/yang/meter-service.yang [moved from opendaylight/sal/yang-prototype/sal/model/model-flow-service/src/main/yang/meter-service.yang with 100% similarity] patch | blob | history
opendaylight/md-sal/model/model-flow-service/src/main/yang/packet-processing.yang [moved from opendaylight/sal/yang-prototype/sal/model/model-flow-service/src/main/yang/packet-processing.yang with 100% similarity] patch | blob | history
opendaylight/md-sal/model/model-flow-statistics/pom.xml [moved from opendaylight/sal/yang-prototype/sal/model/model-flow-statistics/pom.xml with 100% similarity] patch | blob | history
opendaylight/md-sal/model/model-flow-statistics/src/main/yang/flow-statistics.yang [moved from opendaylight/sal/yang-prototype/sal/model/model-flow-statistics/src/main/yang/flow-statistics.yang with 100% similarity] patch | blob | history
opendaylight/md-sal/model/model-flow-statistics/src/main/yang/statistics-types.yang [moved from opendaylight/sal/yang-prototype/sal/model/model-flow-statistics/src/main/yang/statistics-types.yang with 100% similarity] patch | blob | history
opendaylight/md-sal/model/model-inventory/pom.xml [moved from opendaylight/sal/yang-prototype/sal/model/model-inventory/pom.xml with 100% similarity] patch | blob | history
opendaylight/md-sal/model/model-inventory/src/main/yang/inventory.yang [moved from opendaylight/sal/yang-prototype/sal/model/model-inventory/src/main/yang/inventory.yang with 100% similarity] patch | blob | history
opendaylight/md-sal/model/pom.xml [moved from opendaylight/sal/yang-prototype/sal/model/pom.xml with 100% similarity] patch | blob | history
opendaylight/md-sal/model/src/main/yang/.gitignore [moved from opendaylight/sal/yang-prototype/sal/model/src/main/yang/.gitignore with 100% similarity] patch | blob | history
opendaylight/md-sal/pom.xml [moved from opendaylight/sal/yang-prototype/sal/pom.xml with 88% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-api/.gitignore [moved from opendaylight/sal/yang-prototype/sal/sal-binding-api/.gitignore with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-api/pom.xml [moved from opendaylight/sal/yang-prototype/sal/sal-binding-api/pom.xml with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/AbstractBindingAwareConsumer.java [moved from opendaylight/sal/yang-prototype/sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/AbstractBindingAwareConsumer.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/AbstractBindingAwareProvider.java [moved from opendaylight/sal/yang-prototype/sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/AbstractBindingAwareProvider.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/BindingAwareBroker.java [moved from opendaylight/sal/yang-prototype/sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/BindingAwareBroker.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/BindingAwareConsumer.java [moved from opendaylight/sal/yang-prototype/sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/BindingAwareConsumer.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/BindingAwareProvider.java [moved from opendaylight/sal/yang-prototype/sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/BindingAwareProvider.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/BindingAwareService.java [moved from opendaylight/sal/yang-prototype/sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/BindingAwareService.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/NotificationListener.java [moved from opendaylight/sal/yang-prototype/sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/NotificationListener.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/NotificationProviderService.java [moved from opendaylight/sal/yang-prototype/sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/NotificationProviderService.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/NotificationService.java [moved from opendaylight/sal/yang-prototype/sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/NotificationService.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataBrokerService.java [moved from opendaylight/sal/yang-prototype/sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataBrokerService.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataCommitHandler.java [moved from opendaylight/sal/yang-prototype/sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataCommitHandler.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataProviderService.java [moved from opendaylight/sal/yang-prototype/sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataProviderService.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataRefresher.java [moved from opendaylight/sal/yang-prototype/sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataRefresher.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataValidator.java [moved from opendaylight/sal/yang-prototype/sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataValidator.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/RuntimeDataProvider.java [moved from opendaylight/sal/yang-prototype/sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/RuntimeDataProvider.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/package-info.java [moved from opendaylight/sal/yang-prototype/sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/package-info.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-broker/pom.xml [moved from opendaylight/sal/yang-prototype/sal/sal-binding-broker-impl/pom.xml with 98% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-broker/src/main/.gitignore [moved from opendaylight/sal/yang-prototype/sal/sal-binding-broker-impl/src/main/.gitignore with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/codegen/RuntimeCodeHelper.xtend [moved from opendaylight/sal/yang-prototype/sal/sal-binding-broker-impl/src/main/java/org/opendaylight/controller/sal/binding/codegen/RuntimeCodeHelper.xtend with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/codegen/RuntimeCodeSpecification.xtend [moved from opendaylight/sal/yang-prototype/sal/sal-binding-broker-impl/src/main/java/org/opendaylight/controller/sal/binding/codegen/RuntimeCodeSpecification.xtend with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/codegen/YangtoolsMappingHelper.xtend [moved from opendaylight/sal/yang-prototype/sal/sal-binding-broker-impl/src/main/java/org/opendaylight/controller/sal/binding/codegen/YangtoolsMappingHelper.xtend with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/codegen/impl/JavassistUtils.java [moved from opendaylight/sal/yang-prototype/sal/sal-binding-broker-impl/src/main/java/org/opendaylight/controller/sal/binding/codegen/impl/JavassistUtils.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/codegen/impl/RoutingPair.xtend [moved from opendaylight/sal/yang-prototype/sal/sal-binding-broker-impl/src/main/java/org/opendaylight/controller/sal/binding/codegen/impl/RoutingPair.xtend with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/codegen/impl/RuntimeCodeGenerator.xtend [moved from opendaylight/sal/yang-prototype/sal/sal-binding-broker-impl/src/main/java/org/opendaylight/controller/sal/binding/codegen/impl/RuntimeCodeGenerator.xtend with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/BindingAwareBrokerImpl.xtend [moved from opendaylight/sal/yang-prototype/sal/sal-binding-broker-impl/src/main/java/org/opendaylight/controller/sal/binding/impl/BindingAwareBrokerImpl.xtend with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/BrokerActivator.java [moved from opendaylight/sal/yang-prototype/sal/sal-binding-broker-impl/src/main/java/org/opendaylight/controller/sal/binding/impl/BrokerActivator.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/DataProviderContext.xtend [moved from opendaylight/sal/yang-prototype/sal/sal-binding-broker-impl/src/main/java/org/opendaylight/controller/sal/binding/impl/DataProviderContext.xtend with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/NotificationBrokerImpl.xtend [moved from opendaylight/sal/yang-prototype/sal/sal-binding-broker-impl/src/main/java/org/opendaylight/controller/sal/binding/impl/NotificationBrokerImpl.xtend with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/NotificationServiceImpl.xtend [moved from opendaylight/sal/yang-prototype/sal/sal-binding-broker-impl/src/main/java/org/opendaylight/controller/sal/binding/impl/NotificationServiceImpl.xtend with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/OsgiConsumerContext.xtend [moved from opendaylight/sal/yang-prototype/sal/sal-binding-broker-impl/src/main/java/org/opendaylight/controller/sal/binding/impl/OsgiConsumerContext.xtend with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/OsgiProviderContext.xtend [moved from opendaylight/sal/yang-prototype/sal/sal-binding-broker-impl/src/main/java/org/opendaylight/controller/sal/binding/impl/OsgiProviderContext.xtend with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/RpcProxyContext.xtend [moved from opendaylight/sal/yang-prototype/sal/sal-binding-broker-impl/src/main/java/org/opendaylight/controller/sal/binding/impl/RpcProxyContext.xtend with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/RpcServiceRegistrationImpl.xtend [moved from opendaylight/sal/yang-prototype/sal/sal-binding-broker-impl/src/main/java/org/opendaylight/controller/sal/binding/impl/RpcServiceRegistrationImpl.xtend with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/_DataBrokerImpl.xtend [moved from opendaylight/sal/yang-prototype/sal/sal-binding-broker-impl/src/main/java/org/opendaylight/controller/sal/binding/impl/_DataBrokerImpl.xtend with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/osgi/Constants.xtend [moved from opendaylight/sal/yang-prototype/sal/sal-binding-broker-impl/src/main/java/org/opendaylight/controller/sal/binding/impl/osgi/Constants.xtend with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/osgi/PropertiesUtils.xtend [moved from opendaylight/sal/yang-prototype/sal/sal-binding-broker-impl/src/main/java/org/opendaylight/controller/sal/binding/impl/osgi/PropertiesUtils.xtend with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/osgi/package-info.java [moved from opendaylight/sal/yang-prototype/sal/sal-binding-broker-impl/src/main/java/org/opendaylight/controller/sal/binding/impl/osgi/package-info.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/package-info.java [moved from opendaylight/sal/yang-prototype/sal/sal-binding-broker-impl/src/main/java/org/opendaylight/controller/sal/binding/impl/package-info.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-broker/src/main/test/org/opendaylight/controller/sal/binding/test/GenerationTest.java [moved from opendaylight/sal/yang-prototype/sal/sal-binding-broker-impl/src/main/test/org/opendaylight/controller/sal/binding/test/GenerationTest.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/RuntimeCodeGeneratorTest.java [moved from opendaylight/sal/yang-prototype/sal/sal-binding-broker-impl/src/test/java/org/opendaylight/controller/sal/binding/test/RuntimeCodeGeneratorTest.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/mock/BarUpdate.java [moved from opendaylight/sal/yang-prototype/sal/sal-binding-broker-impl/src/test/java/org/opendaylight/controller/sal/binding/test/mock/BarUpdate.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/mock/FooListener.java [moved from opendaylight/sal/yang-prototype/sal/sal-binding-broker-impl/src/test/java/org/opendaylight/controller/sal/binding/test/mock/FooListener.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/mock/FooService.java [moved from opendaylight/sal/yang-prototype/sal/sal-binding-broker-impl/src/test/java/org/opendaylight/controller/sal/binding/test/mock/FooService.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/mock/FooUpdate.java [moved from opendaylight/sal/yang-prototype/sal/sal-binding-broker-impl/src/test/java/org/opendaylight/controller/sal/binding/test/mock/FooUpdate.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/mock/Grouping.java [moved from opendaylight/sal/yang-prototype/sal/sal-binding-broker-impl/src/test/java/org/opendaylight/controller/sal/binding/test/mock/Grouping.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/mock/InheritedContextInput.java [moved from opendaylight/sal/yang-prototype/sal/sal-binding-broker-impl/src/test/java/org/opendaylight/controller/sal/binding/test/mock/InheritedContextInput.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/mock/ReferencableObject.java [moved from opendaylight/sal/yang-prototype/sal/sal-binding-broker-impl/src/test/java/org/opendaylight/controller/sal/binding/test/mock/ReferencableObject.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/mock/ReferencableObjectKey.java [moved from opendaylight/sal/yang-prototype/sal/sal-binding-broker-impl/src/test/java/org/opendaylight/controller/sal/binding/test/mock/ReferencableObjectKey.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/mock/SimpleInput.java [moved from opendaylight/sal/yang-prototype/sal/sal-binding-broker-impl/src/test/java/org/opendaylight/controller/sal/binding/test/mock/SimpleInput.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-spi/pom.xml [moved from opendaylight/sal/yang-prototype/sal/sal-binding-spi/pom.xml with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-spi/src/main/java/org/opendaylight/controller/sal/binding/spi/DataDomToJavaTransformer.java [moved from opendaylight/sal/yang-prototype/sal/sal-binding-spi/src/main/java/org/opendaylight/controller/sal/binding/spi/DataDomToJavaTransformer.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-spi/src/main/java/org/opendaylight/controller/sal/binding/spi/JavaToDataDomTransformer.java [moved from opendaylight/sal/yang-prototype/sal/sal-binding-spi/src/main/java/org/opendaylight/controller/sal/binding/spi/JavaToDataDomTransformer.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-spi/src/main/java/org/opendaylight/controller/sal/binding/spi/Mapper.java [moved from opendaylight/sal/yang-prototype/sal/sal-binding-spi/src/main/java/org/opendaylight/controller/sal/binding/spi/Mapper.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-spi/src/main/java/org/opendaylight/controller/sal/binding/spi/MappingProvider.java [moved from opendaylight/sal/yang-prototype/sal/sal-binding-spi/src/main/java/org/opendaylight/controller/sal/binding/spi/MappingProvider.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-binding-spi/src/main/java/org/opendaylight/controller/sal/binding/spi/RpcMapper.java [moved from opendaylight/sal/yang-prototype/sal/sal-binding-spi/src/main/java/org/opendaylight/controller/sal/binding/spi/RpcMapper.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-common-util/pom.xml [moved from opendaylight/sal/yang-prototype/sal/sal-common-util/pom.xml with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-common-util/src/main/java/org/opendaylight/controller/sal/common/util/Futures.java [moved from opendaylight/sal/yang-prototype/sal/sal-common-util/src/main/java/org/opendaylight/controller/sal/common/util/Futures.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-common-util/src/main/java/org/opendaylight/controller/sal/common/util/RpcErrors.java [moved from opendaylight/sal/yang-prototype/sal/sal-common-util/src/main/java/org/opendaylight/controller/sal/common/util/RpcErrors.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-common-util/src/main/java/org/opendaylight/controller/sal/common/util/Rpcs.java [moved from opendaylight/sal/yang-prototype/sal/sal-common-util/src/main/java/org/opendaylight/controller/sal/common/util/Rpcs.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-common/pom.xml [moved from opendaylight/sal/yang-prototype/sal/sal-common/pom.xml with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-common/src/main/java/org/opendaylight/controller/sal/common/DataStoreIdentifier.java [moved from opendaylight/sal/yang-prototype/sal/sal-common/src/main/java/org/opendaylight/controller/sal/common/DataStoreIdentifier.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-common/src/main/java/org/opendaylight/controller/sal/common/GlobalDataStore.java [moved from opendaylight/sal/yang-prototype/sal/sal-common/src/main/java/org/opendaylight/controller/sal/common/GlobalDataStore.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-common/src/main/java/org/opendaylight/controller/sal/common/package-info.java [moved from opendaylight/sal/yang-prototype/sal/sal-common/src/main/java/org/opendaylight/controller/sal/common/package-info.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-data-api/pom.xml [moved from opendaylight/sal/yang-prototype/sal/sal-data-api/pom.xml with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-dom-api/.gitignore [moved from opendaylight/sal/yang-prototype/sal/sal-core-api/.gitignore with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-dom-api/pom.xml [moved from opendaylight/sal/yang-prototype/sal/sal-core-api/pom.xml with 88% similarity] patch | blob | history
opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/AbstractConsumer.java [new file with mode: 0644] patch | blob
opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/AbstractProvider.java [new file with mode: 0644] patch | blob
opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Broker.java [moved from opendaylight/sal/yang-prototype/sal/sal-core-api/src/main/java/org/opendaylight/controller/sal/core/api/Broker.java with 97% similarity] patch | blob | history
opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/BrokerService.java [moved from opendaylight/sal/yang-prototype/sal/sal-core-api/src/main/java/org/opendaylight/controller/sal/core/api/BrokerService.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Consumer.java [moved from opendaylight/sal/yang-prototype/sal/sal-core-api/src/main/java/org/opendaylight/controller/sal/core/api/Consumer.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Provider.java [moved from opendaylight/sal/yang-prototype/sal/sal-core-api/src/main/java/org/opendaylight/controller/sal/core/api/Provider.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/RpcImplementation.java [moved from opendaylight/sal/yang-prototype/sal/sal-core-api/src/main/java/org/opendaylight/controller/sal/core/api/RpcImplementation.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/data/DataBrokerService.java [moved from opendaylight/sal/yang-prototype/sal/sal-core-api/src/main/java/org/opendaylight/controller/sal/core/api/data/DataBrokerService.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/data/DataCommitHandler.java [moved from opendaylight/sal/yang-prototype/sal/sal-core-api/src/main/java/org/opendaylight/controller/sal/core/api/data/DataCommitHandler.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/data/DataProviderService.java [moved from opendaylight/sal/yang-prototype/sal/sal-core-api/src/main/java/org/opendaylight/controller/sal/core/api/data/DataProviderService.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/data/DataValidator.java [moved from opendaylight/sal/yang-prototype/sal/sal-core-api/src/main/java/org/opendaylight/controller/sal/core/api/data/DataValidator.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/data/package-info.java [moved from opendaylight/sal/yang-prototype/sal/sal-core-api/src/main/java/org/opendaylight/controller/sal/core/api/data/package-info.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/model/SchemaService.java [moved from opendaylight/sal/yang-prototype/sal/sal-core-api/src/main/java/org/opendaylight/controller/sal/core/api/model/SchemaService.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/notify/NotificationListener.java [moved from opendaylight/sal/yang-prototype/sal/sal-core-api/src/main/java/org/opendaylight/controller/sal/core/api/notify/NotificationListener.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/notify/NotificationProviderService.java [moved from opendaylight/sal/yang-prototype/sal/sal-core-api/src/main/java/org/opendaylight/controller/sal/core/api/notify/NotificationProviderService.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/notify/NotificationService.java [moved from opendaylight/sal/yang-prototype/sal/sal-core-api/src/main/java/org/opendaylight/controller/sal/core/api/notify/NotificationService.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/notify/package-info.java [moved from opendaylight/sal/yang-prototype/sal/sal-core-api/src/main/java/org/opendaylight/controller/sal/core/api/notify/package-info.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/package-info.java [moved from opendaylight/sal/yang-prototype/sal/sal-core-api/src/main/java/org/opendaylight/controller/sal/core/api/package-info.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-dom-broker/pom.xml [moved from opendaylight/sal/yang-prototype/sal/sal-broker-impl/pom.xml with 59% similarity] patch | blob | history
opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/BrokerActivator.java [new file with mode: 0644] patch | blob
opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/BrokerImpl.java [moved from opendaylight/sal/yang-prototype/sal/sal-broker-impl/src/main/java/org/opendaylight/controller/sal/core/impl/BrokerImpl.java with 89% similarity] patch | blob | history
opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/DataBrokerModule.java [moved from opendaylight/sal/yang-prototype/sal/sal-broker-impl/src/main/java/org/opendaylight/controller/sal/core/impl/DataBrokerModule.java with 99% similarity] patch | blob | history
opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/NotificationModule.java [moved from opendaylight/sal/yang-prototype/sal/sal-broker-impl/src/main/java/org/opendaylight/controller/sal/core/impl/NotificationModule.java with 99% similarity] patch | blob | history
opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/package-info.java [moved from opendaylight/sal/yang-prototype/sal/sal-broker-impl/src/main/java/org/opendaylight/controller/sal/core/impl/package-info.java with 84% similarity] patch | blob | history
opendaylight/md-sal/sal-dom-demo/pom.xml [new file with mode: 0644] patch | blob
opendaylight/md-sal/sal-dom-demo/src/main/java/org/opendaylight/controller/sal/demo/DemoConsumerImpl.java [moved from opendaylight/sal/yang-prototype/sal/sal-core-demo/src/main/java/org/opendaylight/controller/sal/demo/DemoConsumerImpl.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-dom-demo/src/main/java/org/opendaylight/controller/sal/demo/DemoProviderImpl.java [moved from opendaylight/sal/yang-prototype/sal/sal-core-demo/src/main/java/org/opendaylight/controller/sal/demo/DemoProviderImpl.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-dom-demo/src/main/java/org/opendaylight/controller/sal/demo/DemoUtils.java [moved from opendaylight/sal/yang-prototype/sal/sal-core-demo/src/main/java/org/opendaylight/controller/sal/demo/DemoUtils.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-dom-demo/src/main/java/org/opendaylight/controller/sal/demo/SALDemo.java [moved from opendaylight/sal/yang-prototype/sal/sal-core-demo/src/main/java/org/opendaylight/controller/sal/demo/SALDemo.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-dom-demo/src/main/java/org/opendaylight/controller/sal/demo/package-info.java [moved from opendaylight/sal/yang-prototype/sal/sal-core-demo/src/main/java/org/opendaylight/controller/sal/demo/package-info.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-dom-spi/pom.xml [moved from opendaylight/sal/yang-prototype/sal/sal-core-spi/pom.xml with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/BrokerModule.java [moved from opendaylight/sal/yang-prototype/sal/sal-core-spi/src/main/java/org/opendaylight/controller/sal/core/spi/BrokerModule.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/package-info.java [moved from opendaylight/sal/yang-prototype/sal/sal-core-spi/src/main/java/org/opendaylight/controller/sal/core/spi/package-info.java with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-schema-repository-api/.gitignore [moved from opendaylight/sal/yang-prototype/sal/sal-schema-repository-api/.gitignore with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-schema-repository-api/pom.xml [moved from opendaylight/sal/yang-prototype/sal/sal-schema-repository-api/pom.xml with 100% similarity] patch | blob | history
opendaylight/md-sal/sal-schema-repository-api/src/main/java/org/opendaylight/controller/sal/schema/api/package-info.java [moved from opendaylight/sal/yang-prototype/sal/sal-schema-repository-api/src/main/java/org/opendaylight/controller/sal/schema/api/package-info.java with 100% similarity] patch | blob | history
opendaylight/md-sal/samples/pom.xml [moved from opendaylight/sal/yang-prototype/sal/samples/pom.xml with 100% similarity] patch | blob | history
opendaylight/md-sal/samples/toaster-consumer/pom.xml [moved from opendaylight/sal/yang-prototype/sal/samples/toaster-consumer/pom.xml with 100% similarity] patch | blob | history
opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/sample/toaster/provider/api/ToastConsumer.java [moved from opendaylight/sal/yang-prototype/sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/sample/toaster/provider/api/ToastConsumer.java with 100% similarity] patch | blob | history
opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/sample/toaster/provider/impl/ToastConsumerImpl.java [moved from opendaylight/sal/yang-prototype/sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/sample/toaster/provider/impl/ToastConsumerImpl.java with 100% similarity] patch | blob | history
opendaylight/md-sal/samples/toaster-it/pom.xml [moved from opendaylight/sal/yang-prototype/sal/samples/toaster-it/pom.xml with 100% similarity] patch | blob | history
opendaylight/md-sal/samples/toaster-it/src/test/java/org/opendaylight/controller/sample/toaster/it/ToasterTest.java [moved from opendaylight/sal/yang-prototype/sal/samples/toaster-it/src/test/java/org/opendaylight/controller/sample/toaster/it/ToasterTest.java with 100% similarity] patch | blob | history
opendaylight/md-sal/samples/toaster-provider/pom.xml [moved from opendaylight/sal/yang-prototype/sal/samples/toaster-provider/pom.xml with 100% similarity] patch | blob | history
opendaylight/md-sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/OpendaylightToaster.java [moved from opendaylight/sal/yang-prototype/sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/OpendaylightToaster.java with 100% similarity] patch | blob | history
opendaylight/md-sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/ToasterActivator.java [moved from opendaylight/sal/yang-prototype/sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/ToasterActivator.java with 100% similarity] patch | blob | history
opendaylight/md-sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/ToasterProvider.java [moved from opendaylight/sal/yang-prototype/sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/ToasterProvider.java with 100% similarity] patch | blob | history
opendaylight/md-sal/samples/toaster/pom.xml [moved from opendaylight/sal/yang-prototype/sal/samples/toaster/pom.xml with 100% similarity] patch | blob | history
opendaylight/md-sal/samples/toaster/src/main/yang/toaster.yang [moved from opendaylight/sal/yang-prototype/sal/samples/toaster/src/main/yang/toaster.yang with 100% similarity] patch | blob | history
opendaylight/sal/yang-prototype/pom.xml [deleted file] patch | blob | history
opendaylight/sal/yang-prototype/sal/sal-core-demo/pom.xml [deleted file] patch | blob | history

diff --git a/opendaylight/distribution/opendaylight/pom.xml b/opendaylight/distribution/opendaylight/pom.xml
index 13ac14b5ea1f598ead7d083d338da75252030e05..efecbd3da74dc1f2494a0614d472432eaf6d3b5d 100644 (file)
--- a/opendaylight/distribution/opendaylight/pom.xml
+++ b/opendaylight/distribution/opendaylight/pom.xml
@@ -36,7 +36,7 @@
       </activation>
       <modules>
         <!-- MD-SAL bundles -->
       </activation>
       <modules>
         <!-- MD-SAL bundles -->
-        <module>../../sal/yang-prototype</module>
+        <module>../../md-sal</module>
       </modules>
     </profile>
   </profiles>
       </modules>
     </profile>
   </profiles>
diff --git a/opendaylight/sal/yang-prototype/sal/pom.xml b/opendaylight/md-sal/pom.xml
similarity index 88%
rename from opendaylight/sal/yang-prototype/sal/pom.xml
rename to opendaylight/md-sal/pom.xml
index 441d8576c665df8d88c82ddbe96ce561e4b759a3..dbc9f756fde3ae9eae35a05fea2acf84d781494a 100644 (file)
--- a/opendaylight/sal/yang-prototype/sal/pom.xml
+++ b/opendaylight/md-sal/pom.xml
@@ -14,10 +14,16 @@
        <modules>
                <module>sal-common</module>
                <module>sal-common-util</module>
        <modules>
                <module>sal-common</module>
                <module>sal-common-util</module>
-               <module>sal-data-api</module>
+        <!-- Binding Independent -->
+        <module>sal-dom-api</module>
+        <module>sal-dom-broker</module>
+        <module>sal-dom-spi</module>
+        <!-- Binding Aware -->
                <module>sal-binding-api</module>
                <module>sal-binding-api</module>
-               <module>sal-binding-broker-impl</module>
+               <module>sal-binding-broker</module>
+        <!-- Samples -->
         <module>samples</module>
         <module>samples</module>
+        <!-- Base Models -->
         <module>model</module>
        </modules>
 
         <module>model</module>
        </modules>
 
@@ -49,11 +55,28 @@
             <name>opendaylight.snapshot</name>
             <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
         </pluginRepository>
             <name>opendaylight.snapshot</name>
             <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
         </pluginRepository>
+        <pluginRepository>
+            <id>opendaylight.release</id>
+            <name>opendaylight.release</name>
+            <url>${nexusproxy}/repositories/opendaylight.release/</url>
+        </pluginRepository>
     </pluginRepositories>
 
 
        <repositories>
     </pluginRepositories>
 
 
        <repositories>
-      <repository>
+      
+        <repository>
+            <id>opendaylight-release</id>
+            <name>opendaylight-release</name>
+            <url>${nexusproxy}/repositories/opendaylight.release/</url>
+        </repository>
+        <!-- OpenDayLight Snapshot artifact -->
+        <repository>
+            <id>opendaylight-snapshot</id>
+            <name>opendaylight-snapshot</name>
+            <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
+        </repository>
+        <repository>
         <id>central</id>
         <name>central</name>
         <url>http://repo1.maven.org/maven2</url>
         <id>central</id>
         <name>central</name>
         <url>http://repo1.maven.org/maven2</url>
@@ -100,17 +123,7 @@
                        <url>${nexusproxy}/repositories/jboss.releases/</url>
                </repository>
                <!-- OpenDayLight Released artifact -->
                        <url>${nexusproxy}/repositories/jboss.releases/</url>
                </repository>
                <!-- OpenDayLight Released artifact -->
-               <repository>
-                       <id>opendaylight-release</id>
-                       <name>opendaylight-release</name>
-                       <url>${nexusproxy}/repositories/opendaylight.release/</url>
-               </repository>
-               <!-- OpenDayLight Snapshot artifact -->
-               <repository>
-                       <id>opendaylight-snapshot</id>
-                       <name>opendaylight-snapshot</name>
-                       <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
-               </repository>
+               
        </repositories>
 
   <distributionManagement>
        </repositories>
 
   <distributionManagement>
diff --git a/opendaylight/sal/yang-prototype/sal/sal-binding-broker-impl/pom.xml b/opendaylight/md-sal/sal-binding-broker/pom.xml
similarity index 98%
rename from opendaylight/sal/yang-prototype/sal/sal-binding-broker-impl/pom.xml
rename to opendaylight/md-sal/sal-binding-broker/pom.xml
index cfd8de6f8c2d21f4b0602d568245c5185aa07d51..8e06c9d71e426589ddf78b6df93322b024275153 100644 (file)
--- a/opendaylight/sal/yang-prototype/sal/sal-binding-broker-impl/pom.xml
+++ b/opendaylight/md-sal/sal-binding-broker/pom.xml
@@ -19,7 +19,6 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>${maven.bundle.version}</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
@@ -36,7 +35,6 @@
                     </instructions>
                 </configuration>
             </plugin>
                     </instructions>
                 </configuration>
             </plugin>
-
             <plugin>
                 <groupId>org.eclipse.xtend</groupId>
                 <artifactId>xtend-maven-plugin</artifactId>
             <plugin>
                 <groupId>org.eclipse.xtend</groupId>
                 <artifactId>xtend-maven-plugin</artifactId>
diff --git a/opendaylight/sal/yang-prototype/sal/sal-core-api/pom.xml b/opendaylight/md-sal/sal-dom-api/pom.xml
similarity index 88%
rename from opendaylight/sal/yang-prototype/sal/sal-core-api/pom.xml
rename to opendaylight/md-sal/sal-dom-api/pom.xml
index ce91b8ea20ea0f7b20aacd3b370f0d5e8ad85410..b9aedbe96a8089992a998db915745e4960baf6bf 100644 (file)
--- a/opendaylight/sal/yang-prototype/sal/sal-core-api/pom.xml
+++ b/opendaylight/md-sal/sal-dom-api/pom.xml
@@ -28,5 +28,10 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-model-api</artifactId>
         </dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-model-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <version>5.0.0</version>
+        </dependency>
     </dependencies>
 </project>
     </dependencies>
 </project>
diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/AbstractConsumer.java b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/AbstractConsumer.java
new file mode 100644 (file)
index 0000000..5e13aad
--- /dev/null
+++ b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/AbstractConsumer.java
@@ -0,0 +1,40 @@
+package org.opendaylight.controller.sal.core.api;
+
+import java.util.Collection;
+import java.util.Collections;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+
+public abstract class AbstractConsumer implements Consumer, BundleActivator {
+
+    Broker broker;
+    ServiceReference<Broker> brokerRef;
+    @Override
+    public final void start(BundleContext context) throws Exception {
+        brokerRef = context.getServiceReference(Broker.class);
+        broker = context.getService(brokerRef);
+
+        this.startImpl(context);
+
+        broker.registerConsumer(this,context);
+    }
+
+    public abstract void startImpl(BundleContext context);
+
+    @Override
+    public final void stop(BundleContext context) throws Exception {
+        broker = null;
+        if(brokerRef != null) {
+            context.ungetService(brokerRef);
+        }
+    }
+
+    
+    @Override
+    public Collection<ConsumerFunctionality> getConsumerFunctionality() {
+        return Collections.emptySet();
+    }
+
+}
diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/AbstractProvider.java b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/AbstractProvider.java
new file mode 100644 (file)
index 0000000..c25b2f9
--- /dev/null
+++ b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/AbstractProvider.java
@@ -0,0 +1,39 @@
+package org.opendaylight.controller.sal.core.api;
+
+import java.util.Collection;
+import java.util.Collections;
+
+import org.opendaylight.controller.sal.core.api.Broker.ProviderSession;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+
+public abstract class AbstractProvider implements BundleActivator, Provider {
+
+    private ServiceReference<Broker> brokerRef;
+    private Broker broker;
+
+    @Override
+    public Collection<ProviderFunctionality> getProviderFunctionality() {
+        return Collections.emptySet();
+    }
+
+    @Override
+    public final void start(BundleContext context) throws Exception {
+        brokerRef = context.getServiceReference(Broker.class);
+        broker = context.getService(brokerRef);
+
+        this.startImpl(context);
+
+        broker.registerProvider(this,context);
+    }
+
+    public abstract void startImpl(BundleContext context);
+
+    @Override
+    public final void stop(BundleContext context) throws Exception {
+        // TODO Auto-generated method stub
+
+    }
+
+}
diff --git a/opendaylight/sal/yang-prototype/sal/sal-core-api/src/main/java/org/opendaylight/controller/sal/core/api/Broker.java b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Broker.java
similarity index 97%
rename from opendaylight/sal/yang-prototype/sal/sal-core-api/src/main/java/org/opendaylight/controller/sal/core/api/Broker.java
rename to opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Broker.java
index f26ed901a569f9c585b9b18be456acbb055de257..b2c35507837dab1dde9ed73e5f9b635161613d98 100644 (file)
--- a/opendaylight/sal/yang-prototype/sal/sal-core-api/src/main/java/org/opendaylight/controller/sal/core/api/Broker.java
+++ b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Broker.java
@@ -16,6 +16,7 @@ import org.opendaylight.controller.sal.core.api.notify.NotificationService;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.data.api.CompositeNode;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.data.api.CompositeNode;
+import org.osgi.framework.BundleContext;
 
 
 /**
 
 
 /**
@@ -77,13 +78,14 @@ public interface Broker {
      * 
      * @param cons
      *            Consumer to be registered.
      * 
      * @param cons
      *            Consumer to be registered.
+     * @param context 
      * @return a session specific to consumer registration
      * @throws IllegalArgumentException
      *             If the consumer is <code>null</code>.
      * @throws IllegalStateException
      *             If the consumer is already registered.
      */
      * @return a session specific to consumer registration
      * @throws IllegalArgumentException
      *             If the consumer is <code>null</code>.
      * @throws IllegalStateException
      *             If the consumer is already registered.
      */
-    ConsumerSession registerConsumer(Consumer cons);
+    ConsumerSession registerConsumer(Consumer cons, BundleContext context);
 
     /**
      * Registers the {@link Provider}, which will use the SAL layer.
 
     /**
      * Registers the {@link Provider}, which will use the SAL layer.
@@ -108,13 +110,14 @@ public interface Broker {
      * 
      * @param prov
      *            Provider to be registered.
      * 
      * @param prov
      *            Provider to be registered.
+     * @param context 
      * @return a session unique to the provider registration.
      * @throws IllegalArgumentException
      *             If the provider is <code>null</code>.
      * @throws IllegalStateException
      *             If the consumer is already registered.
      */
      * @return a session unique to the provider registration.
      * @throws IllegalArgumentException
      *             If the provider is <code>null</code>.
      * @throws IllegalStateException
      *             If the consumer is already registered.
      */
-    ProviderSession registerProvider(Provider prov);
+    ProviderSession registerProvider(Provider prov, BundleContext context);
 
     /**
      * {@link Consumer} specific access to the SAL functionality.
 
     /**
      * {@link Consumer} specific access to the SAL functionality.
diff --git a/opendaylight/sal/yang-prototype/sal/sal-broker-impl/pom.xml b/opendaylight/md-sal/sal-dom-broker/pom.xml
similarity index 59%
rename from opendaylight/sal/yang-prototype/sal/sal-broker-impl/pom.xml
rename to opendaylight/md-sal/sal-dom-broker/pom.xml
index 0965e2523109f5d24b9f23bc055523dd05f93e90..b3f3f3e8d5b69ebe1ed0bc0d9b0b29b7fda2e3c0 100644 (file)
--- a/opendaylight/sal/yang-prototype/sal/sal-broker-impl/pom.xml
+++ b/opendaylight/md-sal/sal-dom-broker/pom.xml
@@ -8,9 +8,9 @@
     </parent>\r
     <artifactId>sal-broker-impl</artifactId>\r
     <scm>\r
     </parent>\r
     <artifactId>sal-broker-impl</artifactId>\r
     <scm>\r
-      <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>\r
-      <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>\r
-      <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>\r
+        <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>\r
+        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>\r
+        <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>\r
     </scm>\r
 \r
     <dependencies>\r
     </scm>\r
 \r
     <dependencies>\r
@@ -38,4 +38,20 @@
             <artifactId>guava</artifactId>\r
         </dependency>\r
     </dependencies>\r
             <artifactId>guava</artifactId>\r
         </dependency>\r
     </dependencies>\r
+\r
+    <build>\r
+        <plugins>\r
+            <plugin>\r
+                <groupId>org.apache.felix</groupId>\r
+                <artifactId>maven-bundle-plugin</artifactId>\r
+                <extensions>true</extensions>\r
+                <configuration>\r
+                    <instructions>\r
+                        <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>\r
+                        <Bundle-Activator>org.opendaylight.controller.sal.dom.broker.BrokerActivator</Bundle-Activator>\r
+                    </instructions>\r
+                </configuration>\r
+            </plugin>\r
+        </plugins>\r
+    </build>\r
 </project>\r
 </project>\r
diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/BrokerActivator.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/BrokerActivator.java
new file mode 100644 (file)
index 0000000..e3f5e4b
--- /dev/null
+++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/BrokerActivator.java
@@ -0,0 +1,28 @@
+package org.opendaylight.controller.sal.dom.broker;
+
+import java.util.Hashtable;
+
+import org.opendaylight.controller.sal.core.api.Broker;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceRegistration;
+
+public class BrokerActivator implements BundleActivator {
+
+    BrokerImpl broker;
+    private ServiceRegistration<Broker> brokerReg;
+    
+    @Override
+    public void start(BundleContext context) throws Exception {
+        broker = new BrokerImpl();
+        broker.setBundleContext(context);
+        brokerReg = context.registerService(Broker.class, broker, new Hashtable<String,String>());
+    }
+
+    @Override
+    public void stop(BundleContext context) throws Exception {
+        if(brokerReg != null) {
+            brokerReg.unregister();
+        }
+    }
+}
diff --git a/opendaylight/sal/yang-prototype/sal/sal-broker-impl/src/main/java/org/opendaylight/controller/sal/core/impl/BrokerImpl.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/BrokerImpl.java
similarity index 89%
rename from opendaylight/sal/yang-prototype/sal/sal-broker-impl/src/main/java/org/opendaylight/controller/sal/core/impl/BrokerImpl.java
rename to opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/BrokerImpl.java
index f0d1cc609d22a54230bed5c2136ae2f32ba701e7..24b2b4b6daa4e4d47dd40ce85d6b17f0a96be098 100644 (file)
--- a/opendaylight/sal/yang-prototype/sal/sal-broker-impl/src/main/java/org/opendaylight/controller/sal/core/impl/BrokerImpl.java
+++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/BrokerImpl.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * 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.core.impl;
+package org.opendaylight.controller.sal.dom.broker;
 
 import java.util.Collection;
 import java.util.Collections;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -25,6 +25,7 @@ import org.opendaylight.controller.sal.core.spi.BrokerModule;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.data.api.CompositeNode;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.data.api.CompositeNode;
+import org.osgi.framework.BundleContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -48,21 +49,23 @@ public class BrokerImpl implements Broker {
     // Implementation specific
     private ExecutorService executor;
 
     // Implementation specific
     private ExecutorService executor;
 
+    private BundleContext bundleContext;
+
     @Override
     @Override
-    public ConsumerSession registerConsumer(Consumer consumer) {
+    public ConsumerSession registerConsumer(Consumer consumer,BundleContext ctx) {
         checkPredicates(consumer);
         log.info("Registering consumer " + consumer);
         checkPredicates(consumer);
         log.info("Registering consumer " + consumer);
-        ConsumerSessionImpl session = newSessionFor(consumer);
+        ConsumerSessionImpl session = newSessionFor(consumer,ctx);
         consumer.onSessionInitiated(session);
         sessions.add(session);
         return session;
     }
 
     @Override
         consumer.onSessionInitiated(session);
         sessions.add(session);
         return session;
     }
 
     @Override
-    public ProviderSession registerProvider(Provider provider) {
+    public ProviderSession registerProvider(Provider provider,BundleContext ctx) {
         checkPredicates(provider);
 
         checkPredicates(provider);
 
-        ProviderSessionImpl session = newSessionFor(provider);
+        ProviderSessionImpl session = newSessionFor(provider,ctx);
         provider.onSessionInitiated(session);
         providerSessions.add(session);
         return session;
         provider.onSessionInitiated(session);
         providerSessions.add(session);
         return session;
@@ -153,12 +156,12 @@ public class BrokerImpl implements Broker {
 
     // Private Factory methods
     
 
     // Private Factory methods
     
-    private ConsumerSessionImpl newSessionFor(Consumer cons) {
-        return new ConsumerSessionImpl(cons);
+    private ConsumerSessionImpl newSessionFor(Consumer provider, BundleContext ctx) {
+        return new ConsumerSessionImpl(provider,ctx);
     }
 
     }
 
-    private ProviderSessionImpl newSessionFor(Provider provider) {
-        return new ProviderSessionImpl(provider);
+    private ProviderSessionImpl newSessionFor(Provider provider, BundleContext ctx) {
+        return new ProviderSessionImpl(provider,ctx);
     }
 
     private void consumerSessionClosed(ConsumerSessionImpl consumerSessionImpl) {
     }
 
     private void consumerSessionClosed(ConsumerSessionImpl consumerSessionImpl) {
@@ -187,12 +190,15 @@ public class BrokerImpl implements Broker {
                 .synchronizedMap(new HashMap<Class<? extends BrokerService>, BrokerService>());
         private boolean closed = false;
 
                 .synchronizedMap(new HashMap<Class<? extends BrokerService>, BrokerService>());
         private boolean closed = false;
 
+        private BundleContext context;
+
         public Consumer getConsumer() {
             return consumer;
         }
 
         public Consumer getConsumer() {
             return consumer;
         }
 
-        public ConsumerSessionImpl(Consumer consumer) {
+        public ConsumerSessionImpl(Consumer consumer, BundleContext ctx) {
             this.consumer = consumer;
             this.consumer = consumer;
+            this.context = ctx;
         }
 
         @Override
         }
 
         @Override
@@ -239,8 +245,8 @@ public class BrokerImpl implements Broker {
         private Provider provider;
         private Map<QName, RpcImplementation> sessionRpcImpls = Collections.synchronizedMap(new HashMap<QName, RpcImplementation>());
 
         private Provider provider;
         private Map<QName, RpcImplementation> sessionRpcImpls = Collections.synchronizedMap(new HashMap<QName, RpcImplementation>());
 
-        public ProviderSessionImpl(Provider provider) {
-            super(null);
+        public ProviderSessionImpl(Provider provider, BundleContext ctx) {
+            super(null,ctx);
             this.provider = provider;
         }
 
             this.provider = provider;
         }
 
@@ -277,4 +283,8 @@ public class BrokerImpl implements Broker {
         }
 
     }
         }
 
     }
+
+    public void setBundleContext(BundleContext context) {
+        this.bundleContext = context;
+    }
 }
 }
diff --git a/opendaylight/sal/yang-prototype/sal/sal-broker-impl/src/main/java/org/opendaylight/controller/sal/core/impl/DataBrokerModule.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/DataBrokerModule.java
similarity index 99%
rename from opendaylight/sal/yang-prototype/sal/sal-broker-impl/src/main/java/org/opendaylight/controller/sal/core/impl/DataBrokerModule.java
rename to opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/DataBrokerModule.java
index 34eba18fcecaa6add7f6bcfe93d844928faec879..7fa20d7bea652a44b8a70b4198cb5227a292df47 100644 (file)
--- a/opendaylight/sal/yang-prototype/sal/sal-broker-impl/src/main/java/org/opendaylight/controller/sal/core/impl/DataBrokerModule.java
+++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/DataBrokerModule.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * 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.core.impl;
+package org.opendaylight.controller.sal.dom.broker;
 
 import java.util.ArrayList;
 import java.util.Collections;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/opendaylight/sal/yang-prototype/sal/sal-broker-impl/src/main/java/org/opendaylight/controller/sal/core/impl/NotificationModule.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/NotificationModule.java
similarity index 99%
rename from opendaylight/sal/yang-prototype/sal/sal-broker-impl/src/main/java/org/opendaylight/controller/sal/core/impl/NotificationModule.java
rename to opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/NotificationModule.java
index 2bbbde632b73a34364cded77aed1e4a5644c85e7..9a002ec467734155451de8d272b1a740053153ab 100644 (file)
--- a/opendaylight/sal/yang-prototype/sal/sal-broker-impl/src/main/java/org/opendaylight/controller/sal/core/impl/NotificationModule.java
+++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/NotificationModule.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * 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.core.impl;
+package org.opendaylight.controller.sal.dom.broker;
 
 import java.util.Collection;
 import java.util.Collections;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/opendaylight/sal/yang-prototype/sal/sal-broker-impl/src/main/java/org/opendaylight/controller/sal/core/impl/package-info.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/package-info.java
similarity index 84%
rename from opendaylight/sal/yang-prototype/sal/sal-broker-impl/src/main/java/org/opendaylight/controller/sal/core/impl/package-info.java
rename to opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/package-info.java
index e29549df2d54f0f3002bcf72a885d7c652523357..97931089cb286399d8a9e40f55cbe2ca4a97721a 100644 (file)
--- a/opendaylight/sal/yang-prototype/sal/sal-broker-impl/src/main/java/org/opendaylight/controller/sal/core/impl/package-info.java
+++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/package-info.java
@@ -1,8 +1,8 @@
-/*\r
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.\r
- *\r
- * This program and the accompanying materials are made available under the\r
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
- * and is available at http://www.eclipse.org/legal/epl-v10.html\r
+/*
+ * Copyright (c) 2013 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.core.impl;
\ No newline at end of file
+package org.opendaylight.controller.sal.dom.broker;
\ No newline at end of file
diff --git a/opendaylight/md-sal/sal-dom-demo/pom.xml b/opendaylight/md-sal/sal-dom-demo/pom.xml
new file mode 100644 (file)
index 0000000..322bad7
--- /dev/null
+++ b/opendaylight/md-sal/sal-dom-demo/pom.xml
@@ -0,0 +1,62 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
+    <modelVersion>4.0.0</modelVersion>\r
+    <parent>\r
+        <groupId>org.opendaylight.controller</groupId>\r
+        <artifactId>sal-parent</artifactId>\r
+        <version>1.0-SNAPSHOT</version>\r
+    </parent>\r
+    <artifactId>sal-core-demo</artifactId>\r
+    <scm>\r
+        <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>\r
+        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>\r
+        <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>\r
+    </scm>\r
+\r
+    <dependencies>\r
+        <dependency>\r
+            <groupId>org.opendaylight.controller</groupId>\r
+            <artifactId>sal-broker-impl</artifactId>\r
+            <version>1.0-SNAPSHOT</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.opendaylight.controller</groupId>\r
+            <artifactId>yang-data-util</artifactId>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.slf4j</groupId>\r
+            <artifactId>slf4j-simple</artifactId>\r
+            <version>1.7.2</version>\r
+            <scope>runtime</scope>\r
+        </dependency>\r
+    </dependencies>\r
+    <build>\r
+        <plugins>\r
+            <plugin>\r
+                <artifactId>maven-assembly-plugin</artifactId>\r
+                <version>2.4</version>\r
+                <configuration>\r
+                    <descriptorRefs>\r
+                        <descriptorRef>jar-with-dependencies</descriptorRef>\r
+                    </descriptorRefs>\r
+                    <archive>\r
+                        <manifest>\r
+                            <mainClass>org.opendaylight.controller.sal.demo.SALDemo</mainClass>\r
+                        </manifest>\r
+                    </archive>\r
+                </configuration>\r
+                <executions>\r
+                    <execution>\r
+                        <id>make-assembly</id>\r
+                        <phase>package</phase>\r
+                        <goals>\r
+                            <goal>single</goal>\r
+                        </goals>\r
+                    </execution>\r
+                </executions>\r
+            </plugin>\r
+\r
+        </plugins>\r
+\r
+    </build>\r
+</project>\r
diff --git a/opendaylight/sal/yang-prototype/pom.xml b/opendaylight/sal/yang-prototype/pom.xml
deleted file mode 100644 (file)
index 3f84ff0..0000000
--- a/opendaylight/sal/yang-prototype/pom.xml
+++ /dev/null
@@ -1,363 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>yang-prototype</artifactId>
-    <version>0.5-SNAPSHOT</version>
-    <packaging>pom</packaging>
-    <name>${project.artifactId}</name>
-    <description>
-        yang-prototype
-    </description>
-    <scm>
-      <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
-      <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
-      <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-    </scm>
-
-    <modules>
-        <module>sal</module>
-        <module>concepts-lang</module>
-    </modules>
-
-    <properties>
-        <yangtools.version>0.5.5-SNAPSHOT</yangtools.version>
-        <sonar.host.url>https://sonar.opendaylight.org/</sonar.host.url>
-        <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
-        <sitedeploy>dav:http://nexus.opendaylight.org/content/sites/site</sitedeploy>
-        <siteplugin>3.2</siteplugin>
-        <defaultStylesheet>${project.basedir}/src/site/resources/stylesheet.css</defaultStylesheet>
-        <projectinfo>2.6</projectinfo>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <compiler.version>2.3.2</compiler.version>
-        <surefire.version>2.13</surefire.version>
-        <exam.version>3.0.0</exam.version>
-        <url.version>1.5.0</url.version>
-        <enunciate.version>1.26.2</enunciate.version>
-        <sonar.branch>${user.name}-private-view</sonar.branch>
-        <sonar.skippedModules>org.openflow.openflowj,net.sf.jung2</sonar.skippedModules>
-        <logback.version>1.0.9</logback.version>
-        <slf4j.version>1.7.2</slf4j.version>
-    </properties>
-
-    <pluginRepositories>
-        <pluginRepository>
-          <id>central</id>
-          <name>maven repo1</name>
-          <url>http://repo1.maven.org/maven2</url>
-          <snapshots>
-             <enabled>false</enabled>
-          </snapshots>
-          <releases>
-            <enabled>true</enabled>
-          </releases>
-        </pluginRepository>
-        <pluginRepository>
-            <id>opendaylight.snapshot</id>
-            <name>opendaylight.snapshot</name>
-            <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
-        </pluginRepository>
-    </pluginRepositories>
-
-
-    <repositories>
-        <!-- EBR release -->
-        <!-- http://repository.springsource.com/maven/bundles/release -->
-        <repository>
-            <id>ebr-bundles-release</id>
-            <name>ebr-bundles-release</name>
-            <url>${nexusproxy}/repositories/ebr-bundles-release/</url>
-        </repository>
-        <!-- EBR external -->
-        <!-- http://repository.springsource.com/maven/bundles/external -->
-        <repository>
-            <id>ebr-bundles-external</id>
-            <name>ebr-bundles-external</name>
-            <url>${nexusproxy}/repositories/ebr-bundles-external/</url>
-        </repository>
-        <repository>
-          <id>central</id>
-          <name>central</name>
-          <url>http://repo1.maven.org/maven2</url>
-          <snapshots>
-             <enabled>false</enabled>
-          </snapshots>
-          <releases>
-            <enabled>true</enabled>
-          </releases>
-        </repository>
-        <!-- Pax mirror -->
-        <!-- https://oss.sonatype.org/content/repositories/ops4j-releases -->
-        <repository>
-            <id>ops4j-releases</id>
-            <name>ops4j-releases</name>
-            <url>${nexusproxy}/repositories/ops4j-releases/</url>
-        </repository>
-        <!-- Third Packages hosted in local maven because not available in 
-            other places -->
-        <repository>
-            <id>thirdparty</id>
-            <name>thirdparty</name>
-            <url>${nexusproxy}/repositories/thirdparty/</url>
-        </repository>
-        <!-- Jboss mirror -->
-        <!-- https://repository.jboss.org/nexus/content/repositories/releases -->
-        <repository>
-            <id>jboss.releases</id>
-            <name>jboss.releases</name>
-            <url>${nexusproxy}/repositories/jboss.releases/</url>
-        </repository>
-        <!-- OpenDayLight Released artifact -->
-        <repository>
-            <id>opendaylight-release</id>
-            <name>opendaylight-release</name>
-            <url>${nexusproxy}/repositories/opendaylight.release/</url>
-        </repository>
-        <!-- OpenDayLight Snapshot artifact -->
-        <repository>
-            <id>opendaylight-snapshot</id>
-            <name>opendaylight-snapshot</name>
-            <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
-        </repository>
-    </repositories>
-
-    <distributionManagement>
-        <!-- OpenDayLight Released artifact -->
-        <repository>
-            <id>opendaylight-release</id>
-            <url>${nexusproxy}/repositories/opendaylight.release/</url>
-        </repository>
-        <!-- OpenDayLight Snapshot artifact -->
-        <snapshotRepository>
-            <id>opendaylight-snapshot</id>
-            <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
-        </snapshotRepository>
-        <site>
-            <id>${project.artifactId}-site</id>
-            <url>./</url>
-        </site>
-    </distributionManagement>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>4.10</version>
-                <scope>test</scope>
-                <optional>true</optional>
-            </dependency>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-                <version>1.7.2</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${compiler.version}</version>
-                <inherited>true</inherited>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-source-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>jar-no-fork</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <!-- explicitly define maven-deploy-plugin after other to 
-                    force exec order -->
-                <artifactId>maven-deploy-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>deploy</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>deploy</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <configuration>
-                    <stylesheetfile>${defaultStylesheet}</stylesheetfile>
-                    <excludePackageNames>
-                        *.opendaylight.controller.antlrv4.code.gen
-                    </excludePackageNames>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>aggregate</id>
-                        <goals>
-                            <goal>aggregate</goal>
-                        </goals>
-                        <phase>site</phase>
-                    </execution>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-site-plugin</artifactId>
-                <version>${siteplugin}</version>
-                <inherited>false</inherited>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.maven.doxia</groupId>
-                        <artifactId>doxia-module-markdown</artifactId>
-                        <version>1.3</version>
-                    </dependency>
-                </dependencies>
-                <configuration>
-                    <siteDirectory>${project.basedir}/src/site</siteDirectory>
-                    <inputEncoding>UTF-8</inputEncoding>
-                    <outputEncoding>UTF-8</outputEncoding>
-                </configuration>
-            </plugin>
-        </plugins>
-
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-source-plugin</artifactId>
-                    <version>2.2.1</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-deploy-plugin</artifactId>
-                    <version>2.7</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.15</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-site-plugin</artifactId>
-                    <version>${siteplugin}</version>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.apache.maven.doxia</groupId>
-                            <artifactId>doxia-module-markdown</artifactId>
-                            <version>1.3</version>
-                        </dependency>
-                    </dependencies>
-                    <configuration>
-                        <siteDirectory>${project.parent.basedir}/src/site</siteDirectory>
-                        <inputEncoding>UTF-8</inputEncoding>
-                        <outputEncoding>UTF-8</outputEncoding>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>2.9.1</version>
-                    <configuration>
-                        <stylesheetfile>${defaultStylesheet}</stylesheetfile>
-                    </configuration>
-                    <executions>
-                        <execution>
-                            <id>aggregate</id>
-                            <goals>
-                                <goal>aggregate</goal>
-                            </goals>
-                            <phase>site</phase>
-                        </execution>
-                        <execution>
-                            <id>attach-javadocs</id>
-                            <phase>deploy</phase>
-                            <goals>
-                                <goal>jar</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-
-    </build>
-
-    <reporting>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.9.1</version>
-                <reportSets>
-                    <reportSet>
-                        <reports>
-                            <report>javadoc</report>
-                        </reports>
-                    </reportSet>
-                </reportSets>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-                <version>2.4.0</version>
-                <configuration>
-                    <effort>Max</effort>
-                    <threshold>Low</threshold>
-                    <goal>site</goal>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jdepend-maven-plugin</artifactId>
-                <version>2.0-beta-2</version>
-            </plugin>
-        </plugins>
-    </reporting>
-
-    <profiles>
-        <profile>
-            <id>viewbuild</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <properties>
-                <build.suffix>${project.version}</build.suffix>
-            </properties>
-        </profile>
-        <profile>
-            <id>jenkins</id>
-            <activation>
-                <property>
-                    <name>BUILDSUFFIX</name>
-                </property>
-            </activation>
-            <properties>
-                <build.suffix>${BUILDSUFFIX}</build.suffix>
-            </properties>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/opendaylight/sal/yang-prototype/sal/sal-core-demo/pom.xml b/opendaylight/sal/yang-prototype/sal/sal-core-demo/pom.xml
deleted file mode 100644 (file)
index a99425c..0000000
--- a/opendaylight/sal/yang-prototype/sal/sal-core-demo/pom.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
-       <modelVersion>4.0.0</modelVersion>\r
-       <parent>\r
-               <groupId>org.opendaylight.controller</groupId>\r
-               <artifactId>sal-parent</artifactId>\r
-               <version>1.0-SNAPSHOT</version>\r
-       </parent>\r
-       <artifactId>sal-core-demo</artifactId>\r
-    <scm>\r
-      <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>\r
-      <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>\r
-      <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>\r
-    </scm>\r
-\r
-       <dependencies>\r
-               <dependency>\r
-\r
-                       <groupId>org.opendaylight.controller</groupId>\r
-                       <artifactId>sal-broker-impl</artifactId>\r
-                       <version>1.0-SNAPSHOT</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.opendaylight.controller</groupId>\r
-                       <artifactId>yang-data-util</artifactId>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.slf4j</groupId>\r
-                       <artifactId>slf4j-simple</artifactId>\r
-                       <version>1.7.2</version>\r
-                       <scope>runtime</scope>\r
-               </dependency>\r
-       </dependencies>\r
-       <build>\r
-               <plugins>\r
-                       <plugin>\r
-                               <artifactId>maven-assembly-plugin</artifactId>\r
-                               <version>2.4</version>\r
-                               <configuration>\r
-                                       <descriptorRefs>\r
-                                               <descriptorRef>jar-with-dependencies</descriptorRef>\r
-                                       </descriptorRefs>\r
-                                       <archive>\r
-                                               <manifest>\r
-                                                       <mainClass>org.opendaylight.controller.sal.demo.SALDemo</mainClass>\r
-                                               </manifest>\r
-                                       </archive>\r
-                               </configuration>\r
-                               <executions>\r
-                                       <execution>\r
-                                               <id>make-assembly</id>\r
-                                               <phase>package</phase>\r
-                                               <goals>\r
-                                                       <goal>single</goal>\r
-                                               </goals>\r
-                                       </execution>\r
-                               </executions>\r
-                       </plugin>\r
-\r
-               </plugins>\r
-\r
-       </build>\r
-</project>\r
OpenDaylight controller