diff options
28 files changed, 130 insertions, 34 deletions
@@ -43,5 +43,3 @@ sdnc-core_bdio.jsonld blackDuckHubProjectName.txt blackDuckHubProjectVersionName.txt -# Yang-generated Java -**/src/main/java/org/opendaylight/ diff --git a/dblib/features/pom.xml b/dblib/features/pom.xml index 3af56c12..2be6c8db 100755 --- a/dblib/features/pom.xml +++ b/dblib/features/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>dblib</artifactId> <groupId>org.onap.ccsdk.sli.core</groupId> - <version>0.1.0-SNAPSHOT</version> + <version>0.1.1-SNAPSHOT</version> </parent> <artifactId>dblib-features</artifactId> <name>DBLIB Adaptor - Features</name> diff --git a/dblib/installer/pom.xml b/dblib/installer/pom.xml index aa68d5a6..10845db1 100755 --- a/dblib/installer/pom.xml +++ b/dblib/installer/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>dblib</artifactId> <groupId>org.onap.ccsdk.sli.core</groupId> - <version>0.1.0-SNAPSHOT</version> + <version>0.1.1-SNAPSHOT</version> </parent> <artifactId>dblib-installer</artifactId> <name>DBLIB Adaptor - Karaf Installer</name> diff --git a/dblib/pom.xml b/dblib/pom.xml index 4f26be3f..9e151637 100755 --- a/dblib/pom.xml +++ b/dblib/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>ccsdk-sli-core</artifactId> - <version>0.1.0-SNAPSHOT</version> + <version>0.1.1-SNAPSHOT</version> </parent> @@ -16,7 +16,7 @@ <name>DBLIB Adaptor</name> <description>The DBLIB adaptor allows service logic to access persistent data in a local sql database</description> - <version>0.1.0-SNAPSHOT</version> + <version>0.1.1-SNAPSHOT</version> <build> diff --git a/dblib/provider/pom.xml b/dblib/provider/pom.xml index 579ab40e..1f9a5d47 100755 --- a/dblib/provider/pom.xml +++ b/dblib/provider/pom.xml @@ -4,10 +4,10 @@ <parent> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>dblib</artifactId> - <version>0.1.0-SNAPSHOT</version> + <version>0.1.1-SNAPSHOT</version> </parent> <artifactId>dblib-provider</artifactId> - <version>0.1.0-SNAPSHOT</version> + <version>0.1.1-SNAPSHOT</version> <packaging>bundle</packaging> <name>DBLIB Adaptor - Provider</name> <url>http://maven.apache.org</url> diff --git a/filters/features/pom.xml b/filters/features/pom.xml index baf497d4..0d71e916 100755 --- a/filters/features/pom.xml +++ b/filters/features/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>filters</artifactId> <groupId>org.onap.ccsdk.sli.core</groupId> - <version>0.1.0-SNAPSHOT</version> + <version>0.1.1-SNAPSHOT</version> </parent> <artifactId>filters-features</artifactId> <name>Filters - Features</name> diff --git a/filters/installer/pom.xml b/filters/installer/pom.xml index ca35e3c3..1e839d93 100755 --- a/filters/installer/pom.xml +++ b/filters/installer/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>filters</artifactId> - <version>0.1.0-SNAPSHOT</version> + <version>0.1.1-SNAPSHOT</version> </parent> <artifactId>filters-installer</artifactId> <name>Filters - Karaf Installer</name> diff --git a/filters/pom.xml b/filters/pom.xml index f0593adb..2e159c41 100644 --- a/filters/pom.xml +++ b/filters/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>ccsdk-sli-core</artifactId> - <version>0.1.0-SNAPSHOT</version> + <version>0.1.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -16,7 +16,7 @@ <name>Filters</name> <description>Servlet filter to implement ECOMP logging spec</description> - <version>0.1.0-SNAPSHOT</version> + <version>0.1.1-SNAPSHOT</version> diff --git a/filters/provider/pom.xml b/filters/provider/pom.xml index 0c73949e..9f59d346 100755 --- a/filters/provider/pom.xml +++ b/filters/provider/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>filters</artifactId> - <version>0.1.0-SNAPSHOT</version> + <version>0.1.1-SNAPSHOT</version> </parent> <artifactId>filters-provider</artifactId> <packaging>bundle</packaging> @@ -128,7 +128,7 @@ <organization> <name>ONAP</name> </organization> - <version>0.1.0-SNAPSHOT</version> + <version>0.1.1-SNAPSHOT</version> </project> diff --git a/sli/common/pom.xml b/sli/common/pom.xml index dfec1933..52bfd53f 100755 --- a/sli/common/pom.xml +++ b/sli/common/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>sli</artifactId> <groupId>org.onap.ccsdk.sli.core</groupId> - <version>0.1.0-SNAPSHOT</version> + <version>0.1.1-SNAPSHOT</version> </parent> <artifactId>sli-common</artifactId> <packaging>bundle</packaging> diff --git a/sli/features/pom.xml b/sli/features/pom.xml index 5dd0d550..975839fc 100755 --- a/sli/features/pom.xml +++ b/sli/features/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>sli</artifactId> <groupId>org.onap.ccsdk.sli.core</groupId> - <version>0.1.0-SNAPSHOT</version> + <version>0.1.1-SNAPSHOT</version> </parent> <artifactId>sli-features</artifactId> <name>SLI - Features</name> diff --git a/sli/installer/pom.xml b/sli/installer/pom.xml index 616c3c46..0319f5bc 100755 --- a/sli/installer/pom.xml +++ b/sli/installer/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>sli</artifactId> <groupId>org.onap.ccsdk.sli.core</groupId> - <version>0.1.0-SNAPSHOT</version> + <version>0.1.1-SNAPSHOT</version> </parent> <artifactId>sli-installer</artifactId> <name>SLI - Karaf Installer</name> diff --git a/sli/pom.xml b/sli/pom.xml index d7411237..b8ce1e3a 100755 --- a/sli/pom.xml +++ b/sli/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>ccsdk-sli-core</artifactId> - <version>0.1.0-SNAPSHOT</version> + <version>0.1.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> @@ -59,7 +59,7 @@ <organization> <name>ONAP</name> </organization> - <version>0.1.0-SNAPSHOT</version> + <version>0.1.1-SNAPSHOT</version> </project> diff --git a/sli/provider/pom.xml b/sli/provider/pom.xml index 7d02869f..5ef47ef1 100755 --- a/sli/provider/pom.xml +++ b/sli/provider/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli</artifactId> - <version>0.1.0-SNAPSHOT</version> + <version>0.1.1-SNAPSHOT</version> </parent> <artifactId>sli-provider</artifactId> <packaging>bundle</packaging> diff --git a/sli/recording/pom.xml b/sli/recording/pom.xml index 499181e7..932e3cca 100755 --- a/sli/recording/pom.xml +++ b/sli/recording/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli</artifactId> - <version>0.1.0-SNAPSHOT</version> + <version>0.1.1-SNAPSHOT</version> </parent> <artifactId>sli-recording</artifactId> <packaging>bundle</packaging> diff --git a/sliPluginUtils/features/pom.xml b/sliPluginUtils/features/pom.xml index b512f9ee..ce87536d 100755 --- a/sliPluginUtils/features/pom.xml +++ b/sliPluginUtils/features/pom.xml @@ -8,7 +8,7 @@ <parent> <artifactId>sliPluginUtils</artifactId> <groupId>org.onap.ccsdk.sli.core</groupId> - <version>0.1.0-SNAPSHOT</version> + <version>0.1.1-SNAPSHOT</version> </parent> <name>SliPluginUtils Plugin - Features</name> diff --git a/sliPluginUtils/installer/pom.xml b/sliPluginUtils/installer/pom.xml index 33089131..a92c9cd9 100755 --- a/sliPluginUtils/installer/pom.xml +++ b/sliPluginUtils/installer/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>sliPluginUtils</artifactId> <groupId>org.onap.ccsdk.sli.core</groupId> - <version>0.1.0-SNAPSHOT</version> + <version>0.1.1-SNAPSHOT</version> </parent> <artifactId>sliPluginUtils-installer</artifactId> <name>SLI Plugin Utilities - Karaf Installer</name> diff --git a/sliPluginUtils/pom.xml b/sliPluginUtils/pom.xml index 561359a2..5e084af8 100755 --- a/sliPluginUtils/pom.xml +++ b/sliPluginUtils/pom.xml @@ -3,7 +3,7 @@ <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sliPluginUtils</artifactId> - <version>0.1.0-SNAPSHOT</version> + <version>0.1.1-SNAPSHOT</version> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> @@ -11,7 +11,7 @@ <parent> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>ccsdk-sli-core</artifactId> - <version>0.1.0-SNAPSHOT</version> + <version>0.1.1-SNAPSHOT</version> </parent> <name>Service Logic Interface Plugin Utilities</name> <description>A package of static utility functions to be used when developing SLI plugins</description> diff --git a/sliPluginUtils/provider/pom.xml b/sliPluginUtils/provider/pom.xml index aeb86d04..1af88e82 100755 --- a/sliPluginUtils/provider/pom.xml +++ b/sliPluginUtils/provider/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sliPluginUtils</artifactId> - <version>0.1.0-SNAPSHOT</version> + <version>0.1.1-SNAPSHOT</version> </parent> <name>SliPluginUtils Plugin - Provider</name> diff --git a/sliapi/features/pom.xml b/sliapi/features/pom.xml index 63fd51a4..531315e8 100755 --- a/sliapi/features/pom.xml +++ b/sliapi/features/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>sliapi</artifactId> <groupId>org.onap.ccsdk.sli.core</groupId> - <version>0.1.0-SNAPSHOT</version> + <version>0.1.1-SNAPSHOT</version> </parent> <artifactId>sliapi-features</artifactId> diff --git a/sliapi/installer/pom.xml b/sliapi/installer/pom.xml index b3939a6b..24952056 100755 --- a/sliapi/installer/pom.xml +++ b/sliapi/installer/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>sliapi</artifactId> <groupId>org.onap.ccsdk.sli.core</groupId> - <version>0.1.0-SNAPSHOT</version> + <version>0.1.1-SNAPSHOT</version> </parent> <artifactId>sliapi-installer</artifactId> <packaging>pom</packaging> diff --git a/sliapi/model/pom.xml b/sliapi/model/pom.xml index b6dcfe8b..8fed2003 100755 --- a/sliapi/model/pom.xml +++ b/sliapi/model/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>sliapi</artifactId> <groupId>org.onap.ccsdk.sli.core</groupId> - <version>0.1.0-SNAPSHOT</version> + <version>0.1.1-SNAPSHOT</version> </parent> <artifactId>sliapi-model</artifactId> <packaging>bundle</packaging> diff --git a/sliapi/pom.xml b/sliapi/pom.xml index 31f6608a..64f84b9a 100755 --- a/sliapi/pom.xml +++ b/sliapi/pom.xml @@ -6,13 +6,13 @@ <parent> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>ccsdk-sli-core</artifactId> - <version>0.1.0-SNAPSHOT</version> + <version>0.1.1-SNAPSHOT</version> </parent> <packaging>pom</packaging> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sliapi</artifactId> - <version>0.1.0-SNAPSHOT</version> + <version>0.1.1-SNAPSHOT</version> <properties> <feature-name>sliapi</feature-name> diff --git a/sliapi/provider/pom.xml b/sliapi/provider/pom.xml index 9afbdc5f..e679f368 100755 --- a/sliapi/provider/pom.xml +++ b/sliapi/provider/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>sliapi</artifactId> <groupId>org.onap.ccsdk.sli.core</groupId> - <version>0.1.0-SNAPSHOT</version> + <version>0.1.1-SNAPSHOT</version> </parent> <artifactId>sliapi-provider</artifactId> <packaging>bundle</packaging> diff --git a/sliapi/provider/src/main/java/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/provider/impl/rev140523/SliapiProviderModule.java b/sliapi/provider/src/main/java/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/provider/impl/rev140523/SliapiProviderModule.java new file mode 100644 index 00000000..e7444e31 --- /dev/null +++ b/sliapi/provider/src/main/java/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/provider/impl/rev140523/SliapiProviderModule.java @@ -0,0 +1,64 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP : CCSDK + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights + * reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.provider.impl.rev140523; + +import org.onap.ccsdk.sli.core.sliapi.sliapiProvider; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class SliapiProviderModule extends org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.provider.impl.rev140523.AbstractSliapiProviderModule { + private final Logger LOG = LoggerFactory.getLogger( SliapiProviderModule.class ); + + public SliapiProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { + super(identifier, dependencyResolver); + } + + public SliapiProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.provider.impl.rev140523.SliapiProviderModule oldModule, java.lang.AutoCloseable oldInstance) { + super(identifier, dependencyResolver, oldModule, oldInstance); + } + + @Override + public void customValidation() { + // add custom validation form module attributes here. + } + + @Override + public java.lang.AutoCloseable createInstance() { + + LOG.info("Calling SliapiProviderModule.createInstance"); + final sliapiProvider provider = new sliapiProvider(); + provider.setDataBroker( getDataBrokerDependency() ); + provider.setNotificationService( getNotificationServiceDependency() ); + provider.setRpcRegistry( getRpcRegistryDependency() ); + provider.initialize(); + return new AutoCloseable() { + + @Override + public void close() throws Exception { + //TODO: CLOSE ANY REGISTRATION OBJECTS CREATED USING ABOVE BROKER/NOTIFICATION + //SERVIE/RPC REGISTRY + provider.close(); + } + }; + } + +} diff --git a/sliapi/provider/src/main/java/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/provider/impl/rev140523/SliapiProviderModuleFactory.java b/sliapi/provider/src/main/java/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/provider/impl/rev140523/SliapiProviderModuleFactory.java new file mode 100644 index 00000000..6454d17c --- /dev/null +++ b/sliapi/provider/src/main/java/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/provider/impl/rev140523/SliapiProviderModuleFactory.java @@ -0,0 +1,34 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP : CCSDK + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights + * reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +/* +* Generated file +* +* Generated from: yang module name: sliapi-provider-impl yang module local name: sliapi-provider-impl +* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator +* Generated at: Thu Aug 03 16:10:18 EDT 2017 +* +* Do not modify this file unless it is present under src/main directory +*/ +package org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.provider.impl.rev140523; +public class SliapiProviderModuleFactory extends org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.provider.impl.rev140523.AbstractSliapiProviderModuleFactory { + +} diff --git a/version.properties b/version.properties index f78b4bdf..45771401 100644 --- a/version.properties +++ b/version.properties @@ -4,9 +4,9 @@ # because they are used in Jenkins, whose plug-in doesn't support -release_name=1 +release_name=0 sprint_number=1 -feature_revision=2 +feature_revision=1 base_version=${release_name}.${sprint_number}.${feature_revision} |