From ea84b36447601d0d6a633ae708b72c6aaae6dc67 Mon Sep 17 00:00:00 2001
From: Brinda Santh <bs2796@att.com>
Date: Tue, 3 Dec 2019 16:15:20 -0500
Subject: Refractor controller blueprint modules

Move controller blueprints modules to blueprints processor and change the maven group name.

Fix test cba and model type paths

Fix dependencies issues.

Issue-ID: CCSDK-1663
Signed-off-by: Brinda Santh <bs2796@att.com>
Change-Id: I3654e6f04811470327acba90e8a452b66e3e189b
---
 .../blueprint-proto/krotoPlusConfig.asciipb        |   6 --
 .../modules/blueprint-proto/pom.xml                | 114 ---------------------
 2 files changed, 120 deletions(-)
 delete mode 100644 ms/controllerblueprints/modules/blueprint-proto/krotoPlusConfig.asciipb
 delete mode 100644 ms/controllerblueprints/modules/blueprint-proto/pom.xml

(limited to 'ms/controllerblueprints/modules/blueprint-proto')

diff --git a/ms/controllerblueprints/modules/blueprint-proto/krotoPlusConfig.asciipb b/ms/controllerblueprints/modules/blueprint-proto/krotoPlusConfig.asciipb
deleted file mode 100644
index 30255b96d..000000000
--- a/ms/controllerblueprints/modules/blueprint-proto/krotoPlusConfig.asciipb
+++ /dev/null
@@ -1,6 +0,0 @@
-grpc_coroutines {
-    filter { exclude_path: "google/*" }
-}
-grpc_stub_exts {
-    support_coroutines: true
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-proto/pom.xml b/ms/controllerblueprints/modules/blueprint-proto/pom.xml
deleted file mode 100644
index 8c2c45dd4..000000000
--- a/ms/controllerblueprints/modules/blueprint-proto/pom.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~  Copyright © 2019 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.cds.controllerblueprints</groupId>
-        <artifactId>modules</artifactId>
-        <version>0.7.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>blueprint-proto</artifactId>
-
-    <name>Controller Blueprints Proto</name>
-    <description>Controller Blueprints Proto</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.github.marcoferrer.krotoplus</groupId>
-            <artifactId>kroto-plus-coroutines</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.xolstice.maven.plugins</groupId>
-                <artifactId>protobuf-maven-plugin</artifactId>
-                <version>0.6.1</version>
-                <configuration>
-                    <protocArtifact>
-                        com.google.protobuf:protoc:3.10.0:exe:${os.detected.classifier}
-                    </protocArtifact>
-                    <protoSourceRoot>${project.basedir}/../../../../components/model-catalog/proto-definition/proto
-                    </protoSourceRoot>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>grpc-java</id>
-                        <goals>
-                            <goal>compile-custom</goal>
-                        </goals>
-                        <configuration>
-                            <pluginId>grpc-java</pluginId>
-                            <pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}
-                            </pluginArtifact>
-                        </configuration>
-                    </execution>
-                    <!--
-                    <execution>
-                        <id>grpc-coroutines</id>
-                        <goals>
-                            <goal>compile-custom</goal>
-                        </goals>
-                        <configuration>
-                            <pluginId>kroto-plus</pluginId>
-                            <pluginArtifact>
-                                com.github.marcoferrer.krotoplus:protoc-gen-kroto-plus:${kroto-plus.version}:jar:jvm8
-                            </pluginArtifact>
-                            <pluginParameter>ConfigPath=${project.basedir}/krotoPlusConfig.asciipb</pluginParameter>
-                        </configuration>
-                    </execution>
-                    -->
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.jetbrains.kotlin</groupId>
-                <artifactId>kotlin-maven-plugin</artifactId>
-                <version>${kotlin.maven.version}</version>
-                <executions>
-                    <execution>
-                        <id>compile</id>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>
-                        <configuration>
-                            <sourceDirs>
-                                <sourceDir>${project.basedir}/target/generated-sources/protobuf/java</sourceDir>
-                                <sourceDir>${project.basedir}/target/generated-sources/protobuf/grpc-java</sourceDir>
-                                <!--<sourceDir>${project.basedir}/target/generated-sources/protobuf/kroto-plus</sourceDir>-->
-                            </sourceDirs>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-        <extensions>
-            <extension>
-                <groupId>kr.motd.maven</groupId>
-                <artifactId>os-maven-plugin</artifactId>
-                <version>1.6.2</version>
-            </extension>
-        </extensions>
-    </build>
-</project>
-- 
cgit 1.2.3-korg