Merge "Update parent pom to conform to CCSDK structure"

diff --git a/blueprints-processor/installer/pom.xml b/blueprints-processor/installer/pom.xml
index 65d42ec..54ad30d 100644 (file)
--- a/blueprints-processor/installer/pom.xml
+++ b/blueprints-processor/installer/pom.xml
@@ -36,7 +36,7 @@
        <properties>\r
                <application.name>blueprints-processor</application.name>\r
                <features.boot>blueprints-processor-features</features.boot>\r
-               <features.repositories>mvn:org.onap.ccsdk.config/blueprints-processor-features/${project.version}/xml/features</features.repositories>\r
+               <features.repositories>mvn:org.onap.ccsdk.features/ccsdk-features/blueprints-processor-features/${project.version}/xml/features</features.repositories>\r
                <include.transitive.dependencies>false</include.transitive.dependencies>\r
        </properties>\r
 \r

diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment.json
index 030af7b..0e29fe1 100644 (file)
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment.json
+++ b/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment.json
@@ -194,7 +194,7 @@
                                        "type": "tosca.capabilities.Node"\r
                                },\r
                                "content": {\r
-                                       "type": "tosca.capability.Content",\r
+                                       "type": "tosca.capabilities.Content",\r
                                        "properties": {\r
                                                "type": {\r
                                                        "required": false,\r
@@ -321,7 +321,7 @@
                        },\r
                        "capabilities": {\r
                                "content": {\r
-                                       "type": "tosca.capability.Content",\r
+                                       "type": "tosca.capabilities.Content",\r
                                        "properties": {\r
                                                "content": {\r
                                                        "required": true,\r
@@ -330,7 +330,7 @@
                                        }\r
                                },\r
                                "mapping": {\r
-                                       "type": "tosca.capability.Mapping",\r
+                                       "type": "tosca.capabilities.Mapping",\r
                                        "properties": {\r
                                                "mapping": {\r
                                                        "required": false,\r

diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment/resource_assignment.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment/resource_assignment.json
index 30c7f49..6347f42 100644 (file)
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment/resource_assignment.json
+++ b/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment/resource_assignment.json
@@ -196,7 +196,7 @@
                                        "type": "tosca.capabilities.Node"\r
                                },\r
                                "content": {\r
-                                       "type": "tosca.capability.Content",\r
+                                       "type": "tosca.capabilities.Content",\r
                                        "properties": {\r
                                                "type": {\r
                                                        "required": false,\r
@@ -331,7 +331,7 @@
                        },\r
                        "capabilities": {\r
                                "content": {\r
-                                       "type": "tosca.capability.Content",\r
+                                       "type": "tosca.capabilities.Content",\r
                                        "properties": {\r
                                                "content": {\r
                                                        "required": true,\r
@@ -340,7 +340,7 @@
                                        }\r
                                },\r
                                "mapping": {\r
-                                       "type": "tosca.capability.Mapping",\r
+                                       "type": "tosca.capabilities.Mapping",\r
                                        "properties": {\r
                                                "mapping": {\r
                                                        "required": false,\r

diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/vpe-201802-baseconfig/vpe-201802-baseconfig.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/vpe-201802-baseconfig/vpe-201802-baseconfig.json
index ed1fe40..20207a8 100644 (file)
--- a/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/vpe-201802-baseconfig/vpe-201802-baseconfig.json
+++ b/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/vpe-201802-baseconfig/vpe-201802-baseconfig.json
@@ -279,7 +279,7 @@
                                        "type": "tosca.capabilities.Node"\r
                                },\r
                                "content": {\r
-                                       "type": "tosca.capability.Content",\r
+                                       "type": "tosca.capabilities.Content",\r
                                        "properties": {\r
                                                "type": {\r
                                                        "required": false,\r
@@ -395,7 +395,7 @@
                        },\r
                        "capabilities": {\r
                                "content": {\r
-                                       "type": "tosca.capability.Content",\r
+                                       "type": "tosca.capabilities.Content",\r
                                        "properties": {\r
                                                "content": {\r
                                                        "required": true,\r
@@ -404,7 +404,7 @@
                                        }\r
                                },\r
                                "mapping": {\r
-                                       "type": "tosca.capability.Mapping",\r
+                                       "type": "tosca.capabilities.Mapping",\r
                                        "properties": {\r
                                                "mapping": {\r
                                                        "required": false,\r

diff --git a/blueprints-processor/plugin/generator-provider/src/test/resources/service_templates/generate_configuration.json b/blueprints-processor/plugin/generator-provider/src/test/resources/service_templates/generate_configuration.json
index d2c16ed..0d569ef 100644 (file)
--- a/blueprints-processor/plugin/generator-provider/src/test/resources/service_templates/generate_configuration.json
+++ b/blueprints-processor/plugin/generator-provider/src/test/resources/service_templates/generate_configuration.json
@@ -132,7 +132,7 @@
                        },\r
                        "capabilities": {\r
                                "content": {\r
-                                       "type": "tosca.capability.Content",\r
+                                       "type": "tosca.capabilities.Content",\r
                                        "properties": {\r
                                                "content": {\r
                                                        "required": true,\r
@@ -141,7 +141,7 @@
                                        }\r
                                },\r
                                "mapping": {\r
-                                       "type": "tosca.capability.Mapping",\r
+                                       "type": "tosca.capabilities.Mapping",\r
                                        "properties": {\r
                                                "mapping": {\r
                                                        "required": false,\r
@@ -252,7 +252,7 @@
                                        "type": "tosca.capabilities.Node"\r
                                },\r
                                "content": {\r
-                                       "type": "tosca.capability.Content",\r
+                                       "type": "tosca.capabilities.Content",\r
                                        "properties": {\r
                                                "type": {\r
                                                        "required": false,\r

diff --git a/blueprints-processor/plugin/model-provider/src/test/resources/service_templates/default.json b/blueprints-processor/plugin/model-provider/src/test/resources/service_templates/default.json
index f7dc594..d3dd993 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/test/resources/service_templates/default.json
+++ b/blueprints-processor/plugin/model-provider/src/test/resources/service_templates/default.json
@@ -241,7 +241,7 @@
           "type" : "tosca.capabilities.Node"\r
         },\r
         "content" : {\r
-          "type" : "tosca.capability.Content",\r
+          "type" : "tosca.capabilities.Content",\r
           "properties" : {\r
             "type" : {\r
               "required" : false,\r
@@ -306,7 +306,7 @@
           "type" : "tosca.capabilities.Node"\r
         },\r
         "content" : {\r
-          "type" : "tosca.capability.Content",\r
+          "type" : "tosca.capabilities.Content",\r
           "properties" : {\r
             "type" : {\r
               "required" : false,\r
@@ -371,7 +371,7 @@
       },\r
       "capabilities" : {\r
         "content" : {\r
-          "type" : "tosca.capability.Content",\r
+          "type" : "tosca.capabilities.Content",\r
           "properties" : {\r
             "content" : {\r
               "required" : true,\r
@@ -380,7 +380,7 @@
           }\r
         },\r
         "mapping" : {\r
-          "type" : "tosca.capability.Mapping",\r
+          "type" : "tosca.capabilities.Mapping",\r
           "properties" : {\r
             "mapping" : {\r
               "required" : false,\r

diff --git a/blueprints-processor/plugin/model-provider/src/test/resources/service_templates/resource_assignment.json b/blueprints-processor/plugin/model-provider/src/test/resources/service_templates/resource_assignment.json
index 030af7b..0e29fe1 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/test/resources/service_templates/resource_assignment.json
+++ b/blueprints-processor/plugin/model-provider/src/test/resources/service_templates/resource_assignment.json
@@ -194,7 +194,7 @@
                                        "type": "tosca.capabilities.Node"\r
                                },\r
                                "content": {\r
-                                       "type": "tosca.capability.Content",\r
+                                       "type": "tosca.capabilities.Content",\r
                                        "properties": {\r
                                                "type": {\r
                                                        "required": false,\r
@@ -321,7 +321,7 @@
                        },\r
                        "capabilities": {\r
                                "content": {\r
-                                       "type": "tosca.capability.Content",\r
+                                       "type": "tosca.capabilities.Content",\r
                                        "properties": {\r
                                                "content": {\r
                                                        "required": true,\r
@@ -330,7 +330,7 @@
                                        }\r
                                },\r
                                "mapping": {\r
-                                       "type": "tosca.capability.Mapping",\r
+                                       "type": "tosca.capabilities.Mapping",\r
                                        "properties": {\r
                                                "mapping": {\r
                                                        "required": false,\r