aboutsummaryrefslogtreecommitdiffstats
path: root/blueprints-processor
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dtimoney@att.com>2019-07-11 08:47:49 -0400
committerDan Timoney <dtimoney@att.com>2019-08-15 16:36:48 +0000
commitc74f6af8d7b72eeeee7ceedbf82fc8cecef1ae3d (patch)
treec734478dca6678c317f0b793a11b048874835cf5 /blueprints-processor
parenta68f2b849f86ab0a146648385785d40595388a52 (diff)
Update to Neon
Apply code updates to port to Neon. Change-Id: I159309494ec64209d9fa23fc515643f1e31fe146 Issue-ID: CCSDK-1389 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Diffstat (limited to 'blueprints-processor')
-rw-r--r--blueprints-processor/adaptors/data-adaptor-provider/pom.xml5
-rw-r--r--blueprints-processor/adaptors/data-adaptor-provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml70
-rw-r--r--blueprints-processor/adaptors/pom.xml4
-rw-r--r--blueprints-processor/adaptors/rest-adaptor-provider/pom.xml47
-rw-r--r--blueprints-processor/adaptors/rest-adaptor-provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml32
-rw-r--r--blueprints-processor/features/ccsdk-blueprints-processor/pom.xml4
-rwxr-xr-xblueprints-processor/features/features-blueprints-processor/pom.xml4
-rwxr-xr-xblueprints-processor/features/pom.xml4
-rw-r--r--blueprints-processor/installer/pom.xml4
-rw-r--r--blueprints-processor/plugin/assignment-provider/pom.xml37
-rw-r--r--blueprints-processor/plugin/assignment-provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml63
-rw-r--r--blueprints-processor/plugin/generator-provider/pom.xml40
-rw-r--r--blueprints-processor/plugin/generator-provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml49
-rw-r--r--blueprints-processor/plugin/model-provider/pom.xml42
-rw-r--r--blueprints-processor/plugin/model-provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml68
-rw-r--r--blueprints-processor/plugin/pom.xml4
-rw-r--r--blueprints-processor/pom.xml4
17 files changed, 449 insertions, 32 deletions
diff --git a/blueprints-processor/adaptors/data-adaptor-provider/pom.xml b/blueprints-processor/adaptors/data-adaptor-provider/pom.xml
index 61bfea93d..9937826a2 100644
--- a/blueprints-processor/adaptors/data-adaptor-provider/pom.xml
+++ b/blueprints-processor/adaptors/data-adaptor-provider/pom.xml
@@ -13,12 +13,12 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features</groupId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<artifactId>blueprints-data-adaptor-provider</artifactId>
<packaging>bundle</packaging>
<name>Blueprints Data Adaptor - Provider</name>
@@ -96,7 +96,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>${maven.bundle.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml b/blueprints-processor/adaptors/data-adaptor-provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml
new file mode 100644
index 000000000..76459d51d
--- /dev/null
+++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright © 2017-2018 AT&T Intellectual Property. Modifications Copyright
+ © 2018 IBM. 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. -->
+
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+ xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
+ odl:use-default-for-reference-types="true">
+
+ <!-- Dependencies -->
+
+ <reference id="dataSource" interface="javax.sql.DataSource" />
+
+ <!-- Data SourceInitialisation -->
+
+ <bean id="config.dataSource"
+ class="org.onap.ccsdk.features.data.adaptor.db.DataSourceWrap">
+ <argument ref="dataSource" />
+ </bean>
+
+ <bean id="jdbcTemplate"
+ class="org.springframework.jdbc.core.JdbcTemplate">
+ <property name="dataSource" ref="config.dataSource" />
+ </bean>
+
+ <bean id="namedParameterJdbcTemplate"
+ class="org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate">
+ <argument ref="config.dataSource" />
+ </bean>
+
+ <!-- DAO Initialisation -->
+ <bean id="transactionLogDao"
+ class="org.onap.ccsdk.features.data.adaptor.dao.TransactionLogDaoImpl">
+ <argument ref="jdbcTemplate" />
+ </bean>
+
+ <bean id="configResourceDao"
+ class="org.onap.ccsdk.features.data.adaptor.dao.ConfigResourceDaoImpl">
+ <argument ref="jdbcTemplate" />
+ </bean>
+
+ <bean id="queryExecutorDao"
+ class="org.onap.ccsdk.features.data.adaptor.dao.QueryExecutorDaoImpl">
+ <argument ref="jdbcTemplate" />
+ </bean>
+
+ <bean id="namedQueryExecutorDao"
+ class="org.onap.ccsdk.features.data.adaptor.dao.NamedQueryExecutorDaoImpl">
+ <argument ref="namedParameterJdbcTemplate" />
+ </bean>
+
+ <!-- Expose the Common Component Bean -->
+
+ <bean id="configResourceService"
+ class="org.onap.ccsdk.features.data.adaptor.service.ConfigResourceServiceImpl">
+ <argument ref="transactionLogDao" />
+ <argument ref="configResourceDao" />
+ <argument ref="queryExecutorDao" />
+ <argument ref="namedQueryExecutorDao" />
+ </bean>
+
+ <service ref="configResourceService"
+ interface="org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService" />
+
+</blueprint>
diff --git a/blueprints-processor/adaptors/pom.xml b/blueprints-processor/adaptors/pom.xml
index 9f1c2b0d9..9e081a5a3 100644
--- a/blueprints-processor/adaptors/pom.xml
+++ b/blueprints-processor/adaptors/pom.xml
@@ -20,12 +20,12 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features</groupId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<artifactId>blueprints-processor-adaptors</artifactId>
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml b/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml
index 9232e0c10..f7effc4b8 100644
--- a/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml
@@ -21,12 +21,12 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features</groupId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<artifactId>blueprints-rest-adaptor-provider</artifactId>
<packaging>bundle</packaging>
<name>Blueprints Rest Adaptor - Provider</name>
@@ -71,6 +71,48 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-mockito</artifactId>
+ <version>1.6.4</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.21.0-GA</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>1.10.19</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-module-junit4</artifactId>
+ <version>1.6.4</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-support</artifactId>
+ <version>1.6.4</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-reflect</artifactId>
+ <version>1.6.4</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-core</artifactId>
+ <version>1.6.4</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -85,7 +127,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>${maven.bundle.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml
new file mode 100644
index 000000000..8788f6482
--- /dev/null
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2017-2018 AT&T Intellectual Property.
+ Modifications Copyright © 2018 IBM.
+
+ 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.
+-->
+
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+ xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
+ odl:use-default-for-reference-types="true">
+
+ <!-- Expose the Common Component Bean -->
+
+ <bean id="configRestAdaptorService"
+ class="org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorServiceImpl">
+ </bean>
+
+ <service ref="configRestAdaptorService"
+ interface="org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService" />
+
+</blueprint>
diff --git a/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml b/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml
index 40daabbf3..f7ec2c36a 100644
--- a/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml
+++ b/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml
@@ -20,13 +20,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features</groupId>
<artifactId>ccsdk-blueprints-processor</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>Blueprints Processor :: Features :: ${project.artifactId}</name>
diff --git a/blueprints-processor/features/features-blueprints-processor/pom.xml b/blueprints-processor/features/features-blueprints-processor/pom.xml
index 49d83cc2a..c01eeab3b 100755
--- a/blueprints-processor/features/features-blueprints-processor/pom.xml
+++ b/blueprints-processor/features/features-blueprints-processor/pom.xml
@@ -20,13 +20,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>feature-repo-parent</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features</groupId>
<artifactId>features-blueprints-processor</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>Blueprints Processor :: CCSDK Features :: ${project.artifactId}</name>
diff --git a/blueprints-processor/features/pom.xml b/blueprints-processor/features/pom.xml
index 3ec62da1a..7dbbeb6f8 100755
--- a/blueprints-processor/features/pom.xml
+++ b/blueprints-processor/features/pom.xml
@@ -20,13 +20,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features</groupId>
<artifactId>blueprints-processor-features</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Blueprints Processor :: Features aggregator :: ${project.artifactId}</name>
diff --git a/blueprints-processor/installer/pom.xml b/blueprints-processor/installer/pom.xml
index 6b4aeb89f..fb662d575 100644
--- a/blueprints-processor/installer/pom.xml
+++ b/blueprints-processor/installer/pom.xml
@@ -20,13 +20,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features</groupId>
<artifactId>blueprints-processor-installer</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Blueprints Processor :: ${project.artifactId}</name>
diff --git a/blueprints-processor/plugin/assignment-provider/pom.xml b/blueprints-processor/plugin/assignment-provider/pom.xml
index ff9bcda88..1b7f46ea3 100644
--- a/blueprints-processor/plugin/assignment-provider/pom.xml
+++ b/blueprints-processor/plugin/assignment-provider/pom.xml
@@ -21,12 +21,12 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features</groupId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<artifactId>blueprints-assignment-provider</artifactId>
<packaging>bundle</packaging>
<name>Blueprints Assignment - Provider</name>
@@ -71,11 +71,43 @@
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId>
+ <version>1.6.4</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.21.0-GA</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>1.10.19</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
+ <version>1.6.4</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-support</artifactId>
+ <version>1.6.4</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-reflect</artifactId>
+ <version>1.6.4</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-core</artifactId>
+ <version>1.6.4</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -92,7 +124,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>${maven.bundle.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/blueprints-processor/plugin/assignment-provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml b/blueprints-processor/plugin/assignment-provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml
new file mode 100644
index 000000000..f15429dfe
--- /dev/null
+++ b/blueprints-processor/plugin/assignment-provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2017-2018 AT&T Intellectual Property.
+ Modifications Copyright © 2018 IBM.
+
+ 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.
+-->
+
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+ xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
+ odl:use-default-for-reference-types="true">
+
+ <reference id="componentNodeService"
+ interface="org.onap.ccsdk.features.model.service.ComponentNodeService" />
+
+ <reference id="configResourceService"
+ interface="org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService" />
+
+ <reference id="configModelService"
+ interface="org.onap.ccsdk.features.model.service.ConfigModelService" />
+
+ <reference id="configRestAdaptorService"
+ interface="org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService" />
+
+ <reference id="configGeneratorService"
+ interface="org.onap.ccsdk.features.generator.service.ConfigGeneratorService" />
+
+ <!-- Expose the Common Component Bean -->
+ <bean id="configAssignmentNode"
+ class="org.onap.ccsdk.features.assignment.service.ConfigAssignmentNode">
+ <argument ref="configResourceService" />
+ <argument ref="configRestAdaptorService" />
+ <argument ref="configModelService" />
+ <argument ref="componentNodeService" />
+ <argument ref="configGeneratorService" />
+ </bean>
+
+ <service ref="configAssignmentNode"
+ interface="org.onap.ccsdk.features.assignment.service.ConfigAssignmentNode" />
+
+ <bean id="configAssignmentService"
+ class="org.onap.ccsdk.features.assignment.service.ConfigAssignmentServiceImpl">
+ <argument ref="configResourceService" />
+ <argument ref="configRestAdaptorService" />
+ <argument ref="configModelService" />
+ <argument ref="componentNodeService" />
+ <argument ref="configGeneratorService" />
+ </bean>
+
+ <service ref="configAssignmentService"
+ interface="org.onap.ccsdk.features.assignment.service.ConfigAssignmentService" />
+
+</blueprint>
diff --git a/blueprints-processor/plugin/generator-provider/pom.xml b/blueprints-processor/plugin/generator-provider/pom.xml
index b4f5873c7..6917660b3 100644
--- a/blueprints-processor/plugin/generator-provider/pom.xml
+++ b/blueprints-processor/plugin/generator-provider/pom.xml
@@ -21,12 +21,12 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features</groupId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<artifactId>blueprints-generator-provider</artifactId>
<packaging>bundle</packaging>
<name>Blueprints Generator - Provider</name>
@@ -70,19 +70,48 @@
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId>
- <version>1.6.6</version>
+ <version>1.6.4</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.21.0-GA</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>1.10.19</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
- <version>1.6.6</version>
+ <version>1.6.4</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-support</artifactId>
+ <version>1.6.4</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-reflect</artifactId>
+ <version>1.6.4</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-core</artifactId>
+ <version>1.6.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -92,7 +121,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>${maven.bundle.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/blueprints-processor/plugin/generator-provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml b/blueprints-processor/plugin/generator-provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml
new file mode 100644
index 000000000..78cb28189
--- /dev/null
+++ b/blueprints-processor/plugin/generator-provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2017-2018 AT&T Intellectual Property.
+ Modifications Copyright © 2018 IBM.
+
+ 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.
+-->
+
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+ xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
+ odl:use-default-for-reference-types="true">
+
+ <reference id="configModelService"
+ interface="org.onap.ccsdk.features.model.service.ConfigModelService" />
+
+ <reference id="configResourceService"
+ interface="org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService" />
+
+ <!-- Expose the Common Component Bean -->
+
+ <bean id="configGeneratorService"
+ class="org.onap.ccsdk.features.generator.service.ConfigGeneratorServiceImpl">
+ <argument ref="configResourceService" />
+ </bean>
+
+ <service ref="configGeneratorService"
+ interface="org.onap.ccsdk.features.generator.service.ConfigGeneratorService" />
+
+ <bean id="configGeneratorNode"
+ class="org.onap.ccsdk.features.generator.service.ConfigGeneratorNode">
+ <argument ref="configResourceService" />
+ <argument ref="configModelService" />
+ </bean>
+
+ <service ref="configGeneratorNode"
+ interface="org.onap.ccsdk.features.generator.service.ConfigGeneratorNode" />
+
+
+</blueprint>
diff --git a/blueprints-processor/plugin/model-provider/pom.xml b/blueprints-processor/plugin/model-provider/pom.xml
index 6cf25f473..0f9c9430d 100644
--- a/blueprints-processor/plugin/model-provider/pom.xml
+++ b/blueprints-processor/plugin/model-provider/pom.xml
@@ -21,12 +21,12 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features</groupId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<artifactId>blueprints-model-provider</artifactId>
<packaging>bundle</packaging>
<name>Blueprints Model - Provider</name>
@@ -66,6 +66,43 @@
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId>
+ <version>1.6.4</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.21.0-GA</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>1.10.19</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-module-junit4</artifactId>
+ <version>1.6.4</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-support</artifactId>
+ <version>1.6.4</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-reflect</artifactId>
+ <version>1.6.4</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-core</artifactId>
+ <version>1.6.4</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -106,7 +143,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>${maven.bundle.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/blueprints-processor/plugin/model-provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml b/blueprints-processor/plugin/model-provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml
new file mode 100644
index 000000000..5a07f94c6
--- /dev/null
+++ b/blueprints-processor/plugin/model-provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2017-2018 AT&T Intellectual Property.
+ Modifications Copyright © 2018 IBM.
+
+ 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.
+-->
+
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+ xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
+ odl:use-default-for-reference-types="true">
+
+ <!-- Dependency -->
+
+ <reference id="configResourceService"
+ interface="org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService" />
+
+ <reference id="configRestAdaptorService"
+ interface="org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService" />
+
+ <!-- Expose the Common Component Bean -->
+ <bean id="configModelNode"
+ class="org.onap.ccsdk.features.model.service.ConfigModelNode">
+ </bean>
+
+ <service ref="configModelNode"
+ interface="org.onap.ccsdk.features.model.service.ConfigModelNode" />
+
+ <bean id="configModelService"
+ class="org.onap.ccsdk.features.model.service.ConfigModelServiceImpl">
+ <argument ref="configRestAdaptorService" />
+ </bean>
+
+ <service ref="configModelService"
+ interface="org.onap.ccsdk.features.model.service.ConfigModelService" />
+
+
+ <!-- ComponentNode -->
+
+ <bean id="componentNodeService"
+ class="org.onap.ccsdk.features.model.service.ComponentNodeServiceImpl">
+ <argument ref="blueprintBundleContext" />
+ <argument ref="configResourceService" />
+ <argument ref="configRestAdaptorService" />
+ </bean>
+
+ <service ref="componentNodeService"
+ interface="org.onap.ccsdk.features.model.service.ComponentNodeService" />
+
+ <bean id="componentNodeDelegate"
+ class="org.onap.ccsdk.features.model.service.ComponentNodeDelegate">
+ <argument ref="componentNodeService" />
+ </bean>
+
+ <service ref="componentNodeDelegate"
+ interface="org.onap.ccsdk.features.model.service.ComponentNodeDelegate" />
+
+</blueprint>
diff --git a/blueprints-processor/plugin/pom.xml b/blueprints-processor/plugin/pom.xml
index 634b370d3..b4cea13bd 100644
--- a/blueprints-processor/plugin/pom.xml
+++ b/blueprints-processor/plugin/pom.xml
@@ -21,11 +21,11 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<relativePath/>
</parent>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<artifactId>blueprints-processor-plugin</artifactId>
<groupId>org.onap.ccsdk.features</groupId>
<packaging>pom</packaging>
diff --git a/blueprints-processor/pom.xml b/blueprints-processor/pom.xml
index 0878f88c8..2b2fde6df 100644
--- a/blueprints-processor/pom.xml
+++ b/blueprints-processor/pom.xml
@@ -21,13 +21,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features</groupId>
<artifactId>blueprints-processor</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Blueprints Processor Module</name>