Merge "Migrate features to Oxygen"

14 files changed, 287 insertions, 626 deletions

diff --git a/blueprints-processor/adaptors/data-adaptor-provider/pom.xml b/blueprints-processor/adaptors/data-adaptor-provider/pom.xml
index a965c7fcd..9454421d2 100644
--- a/blueprints-processor/adaptors/data-adaptor-provider/pom.xml
+++ b/blueprints-processor/adaptors/data-adaptor-provider/pom.xml
@@ -122,18 +122,6 @@
                             org.onap.ccsdk.config.data.adaptor.domain,

                             org.onap.ccsdk.config.data.adaptor.service

                         </Export-Package>

-                        <Import-Package>!*spring*,!joptsimple,!net.*,!bsh,

-                            !org.apache.commons.pool*,!org.apache.commons.fileupload*,!org.apache.http.*,!org.apache.logger*,

-                            !org.apache.lucene*,!org.apache.t*,!org.apache.derby*,!org.codehaus.groovy*,!org.custommonkey.xmlunit*,

-                            !org.hibernate*,!org.jruby*,!org.aspectj*,!org.mockito*,!org.openqa*,!org.skyscreamer*,!org.testng*,

-                            !com.caucho*,!com.gargoylesoftware*,!com.jamonapi*,!com.rometools*,!com.squareup*,!com.sun*,!groovy*,

-                            !javax.ejb*,!javax.enterprise*,!javax.faces*,!javax.in*,!javax.money*,!javax.portlet*,!javax.resource*,

-                            org.*,javax.*,com.google.gson*,com.google.common.*,*jackson*

-                        </Import-Package>

-                        <Embed-Dependency>

-                            *;groupId=!*eelf*|*opendaylight*|*ccsdk*|*osgi*|*jackson*|*json*|*powermock*|*junit*

-                        </Embed-Dependency>

-                        <Embed-Transitive>true</Embed-Transitive>

                     </instructions>

                 </configuration>

             </plugin>

diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigPropertyMapDaoImpl.java b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigPropertyMapDaoImpl.java
index 423e01451..65e241e7d 100644
--- a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigPropertyMapDaoImpl.java
+++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigPropertyMapDaoImpl.java
@@ -25,6 +25,7 @@ import java.util.concurrent.TimeUnit;
 import org.apache.commons.lang3.StringUtils;

 import org.onap.ccsdk.config.data.adaptor.DataAdaptorConstants;

 import org.onap.ccsdk.sli.core.sli.SvcLogicException;

+import org.springframework.jdbc.CannotGetJdbcConnectionException;

 import org.springframework.jdbc.core.JdbcTemplate;

 import com.att.eelf.configuration.EELFLogger;

 import com.att.eelf.configuration.EELFManager;

@@ -45,21 +46,23 @@ public class ConfigPropertyMapDaoImpl implements ConfigPropertyMapDao {
         if (!(DataAdaptorConstants.PROPERTY_ENV_PROD.equalsIgnoreCase(envType)

                 || DataAdaptorConstants.PROPERTY_ENV_SOLO.equalsIgnoreCase(envType))) {

             ScheduledExecutorService executor = Executors.newScheduledThreadPool(1);

-            Runnable task = () -> {

-                initializeMap();

-            };

+            Runnable task = this::initializeMap;

             executor.scheduleWithFixedDelay(task, 60, 15, TimeUnit.MINUTES);

         }

     }

 

     private void initializeMap() {

-        String getPropQuery = "SELECT * FROM CONFIG_PROPERTY_MAP";

-        jdbcTemplate.queryForList(getPropQuery).forEach(rows -> {

-            String key = StringUtils.trimToEmpty((String) rows.get("reference_key"));

-            String value = StringUtils.trimToEmpty((String) rows.get("reference_value"));

-            configPropertyMap.put(key, value);

-        });

-        logger.trace("loaded configPropertyMap : ({})", configPropertyMap);

+        try {

+            String getPropQuery = "SELECT * FROM CONFIG_PROPERTY_MAP";

+            jdbcTemplate.queryForList(getPropQuery).forEach(rows -> {

+                String key = StringUtils.trimToEmpty((String) rows.get("reference_key"));

+                String value = StringUtils.trimToEmpty((String) rows.get("reference_value"));

+                configPropertyMap.put(key, value);

+            });

+            logger.trace("loaded configPropertyMap : ({})", configPropertyMap);

+        } catch (CannotGetJdbcConnectionException e) {

+            // WHAT TO DO?

+        }

     }

 

     @Override

diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/blueprints-processor/adaptors/data-adaptor-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
index 4cf4d78cc..644fd77f4 100644
--- a/blueprints-processor/adaptors/data-adaptor-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
+++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
@@ -24,20 +24,6 @@
 

 	<reference id="dataSource" interface="javax.sql.DataSource" />

 

-	<!-- Expose the Common Component Bean -->

-

-	<bean id="configResourceService"

-		class="org.onap.ccsdk.config.data.adaptor.service.ConfigResourceServiceImpl">

-		<argument ref="transactionLogDao" />

-		<argument ref="configResourceDao" />

-		<argument ref="queryExecutorDao" />

-		<argument ref="namedQueryExecutorDao" />

-		<argument ref="configPropertyMapDao" />

-	</bean>

-

-	<service ref="configResourceService"

-		interface="org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService" />

-

 	<!-- Data SourceInitialisation -->

 

 	<bean id="config.dataSource"

@@ -81,4 +67,18 @@
 		<argument ref="jdbcTemplate" />

 	</bean>

 

+	<!-- Expose the Common Component Bean -->

+

+	<bean id="configResourceService"

+	class="org.onap.ccsdk.config.data.adaptor.service.ConfigResourceServiceImpl">

+		<argument ref="transactionLogDao" />

+		<argument ref="configResourceDao" />

+		<argument ref="queryExecutorDao" />

+		<argument ref="namedQueryExecutorDao" />

+		<argument ref="configPropertyMapDao" />

+	</bean>

+

+	<service ref="configResourceService"

+	interface="org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService" />

+

 </blueprint>

diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml b/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml
index d35f1c1a3..6f17a1cef 100644
--- a/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml
@@ -74,7 +74,7 @@
         <dependency>

             <groupId>org.yaml</groupId>

             <artifactId>snakeyaml</artifactId>

-            <version>1.12</version>

+            <version>1.17</version>

         </dependency>

         <dependency>

             <groupId>org.json</groupId>

@@ -176,18 +176,6 @@
                             org.onap.ccsdk.config.rest.adaptor.service,

                             org.onap.ccsdk.config.rest.adaptor.utils

                         </Export-Package>

-                        <Import-Package>!*spring*,!joptsimple,!net.*,!bsh,

-                            !org.apache.commons.pool*,!org.apache.commons.fileupload*,!org.apache.http.*,!org.apache.logger*,

-                            !org.apache.lucene*,!org.apache.t*,!org.apache.derby*,!org.codehaus.groovy*,!org.custommonkey.xmlunit*,

-                            !org.hibernate*,!org.jruby*,!org.aspectj*,!org.mockito*,!org.openqa*,!org.skyscreamer*,!org.testng*,

-                            !com.caucho*,!com.gargoylesoftware*,!com.jamonapi*,!com.rometools*,!com.squareup*,!com.sun*,!groovy*,

-                            !javax.ejb*,!javax.enterprise*,!javax.faces*,!javax.in*,!javax.money*,!javax.portlet*,!javax.resource*,

-                            org.*,javax.*,com.google.gson*,com.google.common.*,*jackson*

-                        </Import-Package>

-                        <Embed-Dependency>

-                            *;groupId=!*eelf*|*opendaylight*|*ccsdk*|*osgi*|*jackson*|*json*|*powermock*|*junit*

-                        </Embed-Dependency>

-                        <Embed-Transitive>true</Embed-Transitive>

                     </instructions>

                 </configuration>

             </plugin>

diff --git a/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml b/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml
new file mode 100644
index 000000000..f53b24af4
--- /dev/null
+++ b/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (C) 2018 AT&T, Bell Canada
+
+  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.
+  -->
+<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>
+
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>1.1.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.onap.ccsdk.config</groupId>
+    <artifactId>ccsdk-blueprints-processor</artifactId>
+    <version>0.3.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>Blueprints Processor :: Features :: ${project.artifactId}</name>
+
+    <properties>
+        <common.collections.version>3.2.2</common.collections.version>
+        <common.io.version>2.5</common.io.version>
+        <snakeyaml.version>1.12</snakeyaml.version>
+        <velocity.version>1.7</velocity.version>
+        <jsonpath.version>2.3.0</jsonpath.version>
+        <json-smart.version>2.3</json-smart.version>
+        <accessors-smart.version>1.2</accessors-smart.version>
+        <jsch.version>0.1.54</jsch.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-mdsal-broker</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>ccsdk-sli</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>blueprints-rest-adaptor-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>blueprints-data-adaptor-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>blueprints-model-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>blueprints-generator-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>blueprints-assignment-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <!--<dependency>-->
+            <!--<groupId>com.jcraft</groupId>-->
+            <!--<artifactId>jsch</artifactId>-->
+            <!--<version>${jsch.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>com.jayway.jsonpath</groupId>-->
+            <!--<artifactId>json-path</artifactId>-->
+            <!--<version>${jsonpath.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.json</groupId>-->
+            <!--<artifactId>json</artifactId>-->
+            <!--<version>${org.json.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.yaml</groupId>-->
+            <!--<artifactId>snakeyaml</artifactId>-->
+            <!--<version>${snakeyaml.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.velocity</groupId>-->
+            <!--<artifactId>velocity</artifactId>-->
+            <!--<version>${velocity.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>commons-io</groupId>-->
+            <!--<artifactId>commons-io</artifactId>-->
+            <!--<version>${common.io.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>net.minidev</groupId>-->
+            <!--<artifactId>json-smart</artifactId>-->
+            <!--<version>2.3</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>net.minidev</groupId>-->
+            <!--<artifactId>accessors-smart</artifactId>-->
+            <!--<version>1.2</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.commons</groupId>-->
+            <!--<artifactId>commons-lang3</artifactId>-->
+            <!--<version>${commons.lang3.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>commons-collections</groupId>-->
+            <!--<artifactId>commons-collections</artifactId>-->
+            <!--<version>${common.collections.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>com.fasterxml.jackson.core</groupId>-->
+            <!--<artifactId>jackson-databind</artifactId>-->
+            <!--<version>${jackson.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>com.fasterxml.jackson.core</groupId>-->
+            <!--<artifactId>jackson-annotations</artifactId>-->
+            <!--<version>${jackson.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>com.fasterxml.jackson.core</groupId>-->
+            <!--<artifactId>jackson-core</artifactId>-->
+            <!--<version>${jackson.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>com.fasterxml.jackson.dataformat</groupId>-->
+            <!--<artifactId>jackson-dataformat-xml</artifactId>-->
+            <!--<version>${jackson.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>com.fasterxml.jackson.module</groupId>-->
+            <!--<artifactId>jackson-module-jaxb-annotations</artifactId>-->
+            <!--<version>${jackson.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>com.fasterxml.jackson.dataformat</groupId>-->
+            <!--<artifactId>jackson-dataformat-yaml</artifactId>-->
+            <!--<version>${jackson.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>com.fasterxml.jackson.module</groupId>-->
+            <!--<artifactId>jackson-module-jsonSchema</artifactId>-->
+            <!--<version>${jackson.version}</version>-->
+        <!--</dependency>-->
+    </dependencies>
+</project>
diff --git a/blueprints-processor/features/features-blueprints-processor/pom.xml b/blueprints-processor/features/features-blueprints-processor/pom.xml
new file mode 100755
index 000000000..9e8c80296
--- /dev/null
+++ b/blueprints-processor/features/features-blueprints-processor/pom.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (C) 2018 AT&T, Bell Canada
+
+  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.
+  -->
+<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>
+
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>feature-repo-parent</artifactId>
+        <version>1.1.0-SNAPSHOT</version>
+        <relativePath />
+    </parent>
+
+    <groupId>org.onap.ccsdk.config</groupId>
+    <artifactId>features-blueprints-processor</artifactId>
+    <version>0.3.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>Blueprints Processor :: CCSDK Features :: ${project.artifactId}</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>ccsdk-blueprints-processor</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
+    </dependencies>
+</project>
diff --git a/blueprints-processor/features/pom.xml b/blueprints-processor/features/pom.xml
index f80d14fd3..5f93e83f4 100644..100755
--- a/blueprints-processor/features/pom.xml
+++ b/blueprints-processor/features/pom.xml
@@ -1,109 +1,39 @@
-<?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.

--->

-

-<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>

-	<parent>

-		<groupId>org.onap.ccsdk.config</groupId>

-		<artifactId>blueprints-processor</artifactId>

-		<version>0.3.0-SNAPSHOT</version>

-	</parent>

-

-	<artifactId>blueprints-processor-features</artifactId>

-	<packaging>jar</packaging>

-	<name>Blueprints Processor - Features</name>

-

-	<dependencies>

-		<dependency>

-			<groupId>org.onap.ccsdk.config</groupId>

-			<artifactId>blueprints-data-adaptor-provider</artifactId>

-		</dependency>

-		<dependency>

-			<groupId>org.onap.ccsdk.config</groupId>

-			<artifactId>blueprints-rest-adaptor-provider</artifactId>

-		</dependency>

-		<dependency>

-			<groupId>org.onap.ccsdk.config</groupId>

-			<artifactId>blueprints-assignment-provider</artifactId>

-		</dependency>

-		<dependency>

-			<groupId>org.onap.ccsdk.config</groupId>

-			<artifactId>blueprints-generator-provider</artifactId>

-		</dependency>

-		<dependency>

-			<groupId>org.onap.ccsdk.config</groupId>

-			<artifactId>blueprints-model-provider</artifactId>

-		</dependency>

-

-		<dependency>

-			<groupId>org.opendaylight.mdsal</groupId>

-			<artifactId>features-mdsal</artifactId>

-			<classifier>features</classifier>

-			<type>xml</type>

-			<scope>runtime</scope>

-		</dependency>

-	</dependencies>

-

-	<build>

-		<resources>

-			<resource>

-				<filtering>true</filtering>

-				<directory>src/main/resources</directory>

-			</resource>

-		</resources>

-		<plugins>

-			<plugin>

-				<groupId>org.apache.maven.plugins</groupId>

-				<artifactId>maven-resources-plugin</artifactId>

-				<executions>

-					<execution>

-						<id>filter</id>

-						<goals>

-							<goal>resources</goal>

-						</goals>

-						<phase>generate-resources</phase>

-					</execution>

-				</executions>

-			</plugin>

-			<plugin>

-				<groupId>org.codehaus.mojo</groupId>

-				<artifactId>build-helper-maven-plugin</artifactId>

-				<executions>

-					<execution>

-						<id>attach-artifacts</id>

-						<goals>

-							<goal>attach-artifact</goal>

-						</goals>

-						<phase>package</phase>

-						<configuration>

-							<artifacts>

-								<artifact>

-									<file>${project.build.directory}/classes/${features.file}</file>

-									<type>xml</type>

-									<classifier>features</classifier>

-								</artifact>

-							</artifacts>

-						</configuration>

-					</execution>

-				</executions>

-			</plugin>

-		</plugins>

-	</build>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (C) 2018 AT&T, Bell Canada
+
+  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.
+  -->
+<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>
+
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.1.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+    <artifactId>blueprints-processor-features</artifactId>
+    <version>0.3.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>Blueprints Processor :: Features aggregator :: ${project.artifactId}</name>
+
+    <modules>
+        <module>ccsdk-blueprints-processor</module>
+        <module>features-blueprints-processor</module>
+    </modules>
+</project>
diff --git a/blueprints-processor/features/src/main/resources/features.xml b/blueprints-processor/features/src/main/resources/features.xml
deleted file mode 100644
index 4375fa9ed..000000000
--- a/blueprints-processor/features/src/main/resources/features.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?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.

--->

-

-<features name="blueprints-processor-${project.version}"

-	xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"

-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-	xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">

-

-	<repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository>

-

-	<feature name='blueprints-processor-dependency'

-		description="SDNC Controller: Blueprints Features Dependency"

-		version='${project.version}'>

-		<feature>ccsdk-sli</feature>

-

-		<bundle>wrap:mvn:com.jcraft/jsch/${jsch.version}</bundle>

-		<bundle>wrap:mvn:com.jayway.jsonpath/json-path/${jsonpath.version}</bundle>

-

-		<bundle>wrap:mvn:org.json/json/${org.json.version}</bundle>

-		<bundle>wrap:mvn:org.yaml/snakeyaml/${snakeyaml.version}</bundle>

-		<bundle>wrap:mvn:org.apache.velocity/velocity/${velocity.version}</bundle>

-

-		<bundle>wrap:mvn:commons-io/commons-io/${common.io.version}</bundle>

-		<bundle>wrap:mvn:net.minidev/json-smart/${json-smart.version}</bundle>

-		<bundle>wrap:mvn:net.minidev/accessors-smart/${accessors-smart.version}</bundle>

-

-		<bundle>mvn:commons-lang/commons-lang/${commons.lang.version}</bundle>

-		<bundle>mvn:commons-collections/commons-collections/${common.collections.version}</bundle>

-

-		<bundle>wrap:mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle>

-		<bundle>wrap:mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle>

-		<bundle>wrap:mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version}</bundle>

-		<bundle>wrap:mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/${jackson.version}</bundle>

-		<bundle>wrap:mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${jackson.version}</bundle>

-		<bundle>wrap:mvn:com.fasterxml.jackson.module/jackson-module-jsonSchema/${jackson.version}</bundle>

-		<bundle>wrap:mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${jackson.version}</bundle>

-	</feature>

-

-	<feature name='blueprints-processor-libs'

-		description="SDNC Controller: Blueprints Libs"

-		version='${project.version}'>

-		<feature version="${project.version}">blueprints-processor-dependency</feature>

-		<bundle>mvn:org.onap.ccsdk.config/blueprints-rest-adaptor-provider/${project.version}</bundle>

-		<bundle>mvn:org.onap.ccsdk.config/blueprints-data-adaptor-provider/${project.version}</bundle>

-		<bundle>mvn:org.onap.ccsdk.config/blueprints-model-provider/${project.version}</bundle>

-	</feature>

-

-	<feature name='blueprints-processor-features'

-		description="SDNC Controller: Blueprints Features"

-		version='${project.version}'>

-		<feature version="${project.version}">blueprints-processor-libs</feature>

-		<bundle>mvn:org.onap.ccsdk.config/blueprints-generator-provider/${project.version}</bundle>

-		<bundle>mvn:org.onap.ccsdk.config/blueprints-assignment-provider/${project.version}</bundle>

-	</feature>

-

-</features>

diff --git a/blueprints-processor/installer/pom.xml b/blueprints-processor/installer/pom.xml
index 54ad30d42..f39d282e2 100644
--- a/blueprints-processor/installer/pom.xml
+++ b/blueprints-processor/installer/pom.xml
@@ -43,7 +43,7 @@
 	<dependencies>

 		<dependency>

 			<groupId>org.onap.ccsdk.config</groupId>

-			<artifactId>blueprints-processor-features</artifactId>

+			<artifactId>ccsdk-blueprints-processor</artifactId>

 			<version>${project.version}</version>

 			<classifier>features</classifier>

 			<type>xml</type>

diff --git a/blueprints-processor/plugin/assignment-provider/pom.xml b/blueprints-processor/plugin/assignment-provider/pom.xml
index 073f9af9e..6eeac1044 100644
--- a/blueprints-processor/plugin/assignment-provider/pom.xml
+++ b/blueprints-processor/plugin/assignment-provider/pom.xml
@@ -37,11 +37,6 @@
 

     <dependencies>

         <dependency>

-            <groupId>equinoxSDK381</groupId>

-            <artifactId>org.eclipse.osgi</artifactId>

-            <version>${equinox.osgi.version}</version>

-        </dependency>

-        <dependency>

             <groupId>org.onap.ccsdk.config</groupId>

             <artifactId>blueprints-generator-provider</artifactId>

             <version>${project.version}</version>

@@ -95,8 +90,6 @@
                             org.onap.ccsdk.config.assignment.processor,

                             org.onap.ccsdk.config.assignment.processor.custom

                         </Export-Package>

-                        <Import-Package>*</Import-Package>

-                        <Embed-Transitive>true</Embed-Transitive>

                     </instructions>

                 </configuration>

             </plugin>

diff --git a/blueprints-processor/plugin/assignment-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/blueprints-processor/plugin/assignment-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
index c880c8d4f..baa6bdbc5 100644
--- a/blueprints-processor/plugin/assignment-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
+++ b/blueprints-processor/plugin/assignment-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
@@ -35,9 +35,6 @@
 	<reference id="configGeneratorService"

 		interface="org.onap.ccsdk.config.generator.service.ConfigGeneratorService" />

 

-	<reference id="configProvDataStore"

-		interface="org.onap.ccsdk.config.provdata.service.ConfigProvDataStore" />

-

 	<!-- Expose the Common Component Bean -->

 	<bean id="configAssignmentNode"

 		class="org.onap.ccsdk.config.assignment.service.ConfigAssignmentNode">

@@ -46,7 +43,6 @@
 		<argument ref="configModelService" />

 		<argument ref="componentNodeService" />

 		<argument ref="configGeneratorService" />

-		<argument ref="configProvDataStore" />

 	</bean>

 

 	<service ref="configAssignmentNode"

@@ -59,7 +55,6 @@
 		<argument ref="configModelService" />

 		<argument ref="componentNodeService" />

 		<argument ref="configGeneratorService" />

-		<argument ref="configProvDataStore" />

 	</bean>

 

 	<service ref="configAssignmentService"

diff --git a/blueprints-processor/plugin/generator-provider/pom.xml b/blueprints-processor/plugin/generator-provider/pom.xml
index f18170a6a..82ddd118e 100644
--- a/blueprints-processor/plugin/generator-provider/pom.xml
+++ b/blueprints-processor/plugin/generator-provider/pom.xml
@@ -37,11 +37,6 @@
 

     <dependencies>

         <dependency>

-            <artifactId>org.eclipse.osgi</artifactId>

-            <groupId>equinoxSDK381</groupId>

-            <version>${equinox.osgi.version}</version>

-        </dependency>

-        <dependency>

             <groupId>org.onap.ccsdk.config</groupId>

             <artifactId>blueprints-model-provider</artifactId>

             <version>${project.version}</version>

@@ -92,8 +87,6 @@
                             org.onap.ccsdk.config.generator.service,

                             org.onap.ccsdk.config.generator.tool

                         </Export-Package>

-                        <Import-Package>*</Import-Package>

-                        <Embed-Transitive>true</Embed-Transitive>

                     </instructions>

                 </configuration>

             </plugin>

diff --git a/blueprints-processor/plugin/model-provider/pom.xml b/blueprints-processor/plugin/model-provider/pom.xml
index 7710fbbed..f14ec3afa 100644
--- a/blueprints-processor/plugin/model-provider/pom.xml
+++ b/blueprints-processor/plugin/model-provider/pom.xml
@@ -37,11 +37,6 @@
 

     <dependencies>

         <dependency>

-            <groupId>equinoxSDK381</groupId>

-            <artifactId>org.eclipse.osgi</artifactId>

-            <version>${equinox.osgi.version}</version>

-        </dependency>

-        <dependency>

             <groupId>org.onap.ccsdk.config</groupId>

             <artifactId>blueprints-rest-adaptor-provider</artifactId>

             <version>${project.version}</version>

@@ -97,15 +92,12 @@
                         <Export-Package>org.onap.ccsdk.config.model,

                             org.onap.ccsdk.config.model.data,

                             org.onap.ccsdk.config.model.data.api,

-                            org.onap.ccsdk.config.model.data.custom,

-                            org.onap.ccsdk.config.model.data.custom.dict,

+                            org.onap.ccsdk.config.model.data.dict,

                             org.onap.ccsdk.config.model.domain,

                             org.onap.ccsdk.config.model.service,

                             org.onap.ccsdk.config.model.utils,

                             org.onap.ccsdk.config.model.validator

                         </Export-Package>

-                        <Import-Package>*</Import-Package>

-                        <Embed-Transitive>true</Embed-Transitive>

                     </instructions>

                 </configuration>

             </plugin>

diff --git a/blueprints-processor/pom.xml b/blueprints-processor/pom.xml
index 3111fc9f5..ee8ce1dab 100644
--- a/blueprints-processor/pom.xml
+++ b/blueprints-processor/pom.xml
@@ -36,374 +36,6 @@
 	<url>http://wiki.sdn.labs.att.com</url>

 	<description>Blueprints Processor Blueprints Processor</description>

 

-	<properties>

-		<maven.javadoc.failOnError>false</maven.javadoc.failOnError>

-		<maven.bundle.version>3.5.0</maven.bundle.version>

-

-		<odl.mdsal.features.version>2.3.3</odl.mdsal.features.version>

-		<odl.controller.config.api.version>0.7.3</odl.controller.config.api.version>

-

-		<spring.version>4.2.9.RELEASE</spring.version>

-		<apache.httpcomponents.core.version>4.4.10</apache.httpcomponents.core.version>

-		<apache.httpcomponents.client.version>4.5.6</apache.httpcomponents.client.version>

-

-		<common.collections.version>3.2.2</common.collections.version>

-		<common.io.version>2.5</common.io.version>

-		<snakeyaml.version>1.12</snakeyaml.version>

-		<velocity.version>1.7</velocity.version>

-

-		<jsonpath.version>2.3.0</jsonpath.version>

-		<json-smart.version>2.3</json-smart.version>

-

-		<accessors-smart.version>1.2</accessors-smart.version>

-		<asm.version>5.0.4</asm.version>

-		<jsch.version>0.1.54</jsch.version>

-		<jasypt.version>1.9.2</jasypt.version>

-		<xercesImpl.version>2.11.0</xercesImpl.version>

-

-		<!-- Test Dependencies -->

-		<powermock.version>1.6.6</powermock.version>

-		<sling.version>2.3.2</sling.version>

-	</properties>

-

-	<dependencyManagement>

-		<dependencies>

-			<dependency>

-				<groupId>org.onap.ccsdk.config</groupId>

-				<artifactId>blueprints-processor-features</artifactId>

-				<classifier>features</classifier>

-				<type>xml</type>

-				<version>${project.version}</version>

-			</dependency>

-			<dependency>

-				<groupId>org.onap.ccsdk.sli.core</groupId>

-				<artifactId>sli-provider</artifactId>

-				<version>${ccsdk.sli.core.version}</version>

-				<scope>compile</scope>

-				<exclusions>

-					<exclusion>

-						<groupId>org.apache.karaf.shell</groupId>

-						<artifactId>

-						org.apache.karaf.shell.console

-					</artifactId>

-					</exclusion>

-				</exclusions>

-			</dependency>

-			<dependency>

-				<groupId>org.onap.ccsdk.sli.adaptors</groupId>

-				<artifactId>sql-resource-provider</artifactId>

-				<version>${ccsdk.sli.adaptors.version}</version>

-				<scope>compile</scope>

-			</dependency>

-

-			<!-- ODL Features -->

-			<dependency>

-				<groupId>org.opendaylight.mdsal</groupId>

-				<artifactId>features-mdsal</artifactId>

-				<version>${odl.mdsal.features.version}</version>

-				<classifier>features</classifier>

-				<type>xml</type>

-				<scope>runtime</scope>

-			</dependency>

-

-			<!-- Common Utils -->

-			<dependency>

-				<groupId>org.apache.commons</groupId>

-				<artifactId>commons-lang3</artifactId>

-				<version>${commons.lang3.version}</version>

-			</dependency>

-			<dependency>

-				<groupId>com.att.eelf</groupId>

-				<artifactId>eelf-core</artifactId>

-				<version>${eelf.version}</version>

-			</dependency>

-

-			<dependency>

-				<groupId>org.springframework</groupId>

-				<artifactId>spring-core</artifactId>

-				<version>${spring.version}</version>

-			</dependency>

-			<dependency>

-				<groupId>org.springframework</groupId>

-				<artifactId>spring-aop</artifactId>

-				<version>${spring.version}</version>

-			</dependency>

-			<dependency>

-				<groupId>org.springframework</groupId>

-				<artifactId>spring-beans</artifactId>

-				<version>${spring.version}</version>

-			</dependency>

-			<dependency>

-				<groupId>org.springframework</groupId>

-				<artifactId>spring-context</artifactId>

-				<version>${spring.version}</version>

-			</dependency>

-			<dependency>

-				<groupId>org.springframework</groupId>

-				<artifactId>spring-expression</artifactId>

-				<version>${spring.version}</version>

-			</dependency>

-			<dependency>

-				<groupId>org.springframework</groupId>

-				<artifactId>spring-jdbc</artifactId>

-				<version>${spring.version}</version>

-			</dependency>

-			<dependency>

-				<groupId>org.springframework</groupId>

-				<artifactId>spring-tx</artifactId>

-				<version>${spring.version}</version>

-			</dependency>

-			<dependency>

-				<groupId>org.springframework</groupId>

-				<artifactId>spring-web</artifactId>

-				<version>${spring.version}</version>

-			</dependency>

-			<dependency>

-				<groupId>equinoxSDK381</groupId>

-				<artifactId>org.eclipse.osgi</artifactId>

-				<version>${equinox.osgi.version}</version>

-			</dependency>

-			<dependency>

-				<groupId>com.fasterxml.jackson.core</groupId>

-				<artifactId>jackson-databind</artifactId>

-				<version>${jackson.version}</version>

-			</dependency>

-			<dependency>

-				<groupId>com.fasterxml.jackson.core</groupId>

-				<artifactId>jackson-annotations</artifactId>

-				<version>${jackson.version}</version>

-			</dependency>

-			<dependency>

-				<groupId>com.fasterxml.jackson.core</groupId>

-				<artifactId>jackson-core</artifactId>

-				<version>${jackson.version}</version>

-			</dependency>

-			<dependency>

-				<groupId>com.fasterxml.jackson.dataformat</groupId>

-				<artifactId>jackson-dataformat-xml</artifactId>

-				<version>${jackson.version}</version>

-			</dependency>

-			<dependency>

-				<groupId>com.fasterxml.jackson.module</groupId>

-				<artifactId>jackson-module-jaxb-annotations</artifactId>

-				<version>${jackson.version}</version>

-			</dependency>

-			<dependency>

-				<groupId>com.fasterxml.jackson.dataformat</groupId>

-				<artifactId>jackson-dataformat-yaml</artifactId>

-				<version>${jackson.version}</version>

-			</dependency>

-			<dependency>

-				<groupId>com.fasterxml.jackson.module</groupId>

-				<artifactId>jackson-module-jsonSchema</artifactId>

-				<version>${jackson.version}</version>

-			</dependency>

-			<dependency>

-				<groupId>com.fasterxml.jackson.datatype</groupId>

-				<artifactId>jackson-datatype-json-org</artifactId>

-				<version>${jackson.version}</version>

-			</dependency>

-			<dependency>

-				<groupId>com.fasterxml.jackson.jaxrs</groupId>

-				<artifactId>jackson-jaxrs-base</artifactId>

-				<version>${jackson.version}</version>

-			</dependency>

-			<dependency>

-				<groupId>com.fasterxml.jackson.jaxrs</groupId>

-				<artifactId>jackson-jaxrs-json-provider</artifactId>

-				<version>${jackson.version}</version>

-			</dependency>

-			<dependency>

-				<groupId>org.json</groupId>

-				<artifactId>json</artifactId>

-				<version>${org.json.version}</version>

-			</dependency>

-			<dependency>

-				<groupId>com.jayway.jsonpath</groupId>

-				<artifactId>json-path</artifactId>

-				<version>${jsonpath.version}</version>

-			</dependency>

-			<dependency>

-				<groupId>org.yaml</groupId>

-				<artifactId>snakeyaml</artifactId>

-				<version>${snakeyaml.version}</version>

-			</dependency>

-			<dependency>

-				<groupId>org.apache.velocity</groupId>

-				<artifactId>velocity</artifactId>

-				<version>${velocity.version}</version>

-			</dependency>

-			<dependency>

-				<groupId>commons-collections</groupId>

-				<artifactId>commons-collections</artifactId>

-				<version>${common.collections.version}</version>

-			</dependency>

-			<dependency>

-				<groupId>commons-io</groupId>

-				<artifactId>commons-io</artifactId>

-				<version>${common.io.version}</version>

-			</dependency>

-			<dependency>

-				<groupId>org.codehaus.jettison</groupId>

-				<artifactId>jettison</artifactId>

-				<version>${jettison.version}</version>

-				<scope>provided</scope>

-			</dependency>

-			<dependency>

-				<groupId>com.jcraft</groupId>

-				<artifactId>jsch</artifactId>

-				<version>${jsch.version}</version>

-			</dependency>

-			<dependency>

-				<groupId>org.jasypt</groupId>

-				<artifactId>jasypt</artifactId>

-				<version>${jasypt.version}</version>

-			</dependency>

-			<dependency>

-				<groupId>xerces</groupId>

-				<artifactId>xercesImpl</artifactId>

-				<version>${xercesImpl.version}</version>

-			</dependency>

-			<dependency>

-				<groupId>com.sun.jersey</groupId>

-				<artifactId>jersey-client</artifactId>

-				<version>${jersey.client.version}</version>

-				<scope>provided</scope>

-			</dependency>

-			<dependency>

-				<groupId>com.sun.jersey</groupId>

-				<artifactId>jersey-core</artifactId>

-				<version>${jersey.version}</version>

-				<scope>provided</scope>

-			</dependency>

-			<dependency>

-				<groupId>org.mariadb.jdbc</groupId>

-				<artifactId>mariadb-java-client</artifactId>

-				<version>${mariadb.connector.version}</version>

-				<scope>runtime</scope>

-			</dependency>

-

-			<!-- Common Bundles -->

-			<dependency>

-				<groupId>org.apache.httpcomponents</groupId>

-				<artifactId>httpclient-osgi</artifactId>

-				<version>${apache.httpcomponents.client.version}</version>

-			</dependency>

-			<dependency>

-				<groupId>org.apache.httpcomponents</groupId>

-				<artifactId>httpcore-osgi</artifactId>

-				<version>${apache.httpcomponents.core.version}</version>

-			</dependency>

-

-			<!-- SelfService Features -->

-			<dependency>

-				<groupId>org.onap.ccsdk.config</groupId>

-				<artifactId>blueprints-model-provider</artifactId>

-				<version>${project.version}</version>

-				<scope>compile</scope>

-			</dependency>

-			<dependency>

-				<groupId>org.onap.ccsdk.config</groupId>

-				<artifactId>blueprints-data-adaptor-provider</artifactId>

-				<version>${project.version}</version>

-				<scope>compile</scope>

-			</dependency>

-			<dependency>

-				<groupId>org.onap.ccsdk.config</groupId>

-				<artifactId>blueprints-rest-adaptor-provider</artifactId>

-				<version>${project.version}</version>

-				<scope>compile</scope>

-			</dependency>

-			<dependency>

-				<groupId>org.onap.ccsdk.config</groupId>

-				<artifactId>blueprints-generator-provider</artifactId>

-				<version>${project.version}</version>

-				<scope>compile</scope>

-			</dependency>

-			<dependency>

-				<groupId>org.onap.ccsdk.config</groupId>

-				<artifactId>blueprints-assignment-provider</artifactId>

-				<version>${project.version}</version>

-				<scope>compile</scope>

-			</dependency>

-

-			<!-- Test Dependencies -->

-			<dependency>

-				<groupId>org.springframework</groupId>

-				<artifactId>spring-test</artifactId>

-				<version>${spring.version}</version>

-				<scope>test</scope>

-			</dependency>

-			<dependency>

-				<groupId>com.h2database</groupId>

-				<artifactId>h2</artifactId>

-				<version>${h2database.version}</version>

-				<scope>test</scope>

-			</dependency>

-			<dependency>

-				<groupId>org.apache.sling</groupId>

-				<artifactId>org.apache.sling.testing.osgi-mock</artifactId>

-				<version>${sling.version}</version>

-				<scope>test</scope>

-			</dependency>

-			<dependency>

-				<groupId>org.mockito</groupId>

-				<artifactId>mockito-core</artifactId>

-				<version>${mockito.version}</version>

-				<scope>test</scope>

-			</dependency>

-			<dependency>

-				<groupId>org.powermock</groupId>

-				<artifactId>powermock-api-mockito</artifactId>

-				<version>${powermock.version}</version>

-				<scope>test</scope>

-			</dependency>

-			<dependency>

-				<groupId>org.powermock</groupId>

-				<artifactId>powermock-api-support</artifactId>

-				<version>${powermock.version}</version>

-				<scope>test</scope>

-			</dependency>

-			<dependency>

-				<groupId>org.powermock</groupId>

-				<artifactId>powermock-core</artifactId>

-				<version>${powermock.version}</version>

-				<scope>test</scope>

-			</dependency>

-			<dependency>

-				<groupId>org.powermock</groupId>

-				<artifactId>powermock-module-junit4</artifactId>

-				<version>${powermock.version}</version>

-				<scope>test</scope>

-			</dependency>

-			<dependency>

-				<groupId>org.powermock</groupId>

-				<artifactId>powermock-reflect</artifactId>

-				<version>${powermock.version}</version>

-				<scope>test</scope>

-			</dependency>

-			<dependency>

-				<groupId>junit</groupId>

-				<artifactId>junit</artifactId>

-				<version>${junit.version}</version>

-				<scope>test</scope>

-			</dependency>

-		</dependencies>

-	</dependencyManagement>

-

-	<build>

-		<plugins>

-			<plugin>

-				<groupId>org.apache.maven.plugins</groupId>

-				<artifactId>maven-javadoc-plugin</artifactId>

-				<configuration>

-					<excludePackageNames>org.opendaylight.*:io.netty.*:org.osgi.*:org.apache.*

-					</excludePackageNames>

-				</configuration>

-			</plugin>

-		</plugins>

-	</build>

-

 	<modules>

 		<module>adaptors</module>

 		<module>plugin</module>