diff options
| author |   Avi Gaffa <avi.gaffa@amdocs.com> | 2017-10-17 06:22:05 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-10-17 06:22:05 +0000 |
| commit | 93d9cc0a99f82a828a93012338f7eff3b271f7cb (patch) | |
| tree | d4c84a9a7f371714e4cc2243e6eb51dcb50aeb13 | |
| parent | 4c1016f145c0595376361ac5b31e5fb478f561c6 (diff) | |
| parent | 40b825923ae8cba4f4aafe09746513f585e423ea (diff) | |
Merge "Artifacts are not copied" into release-1.1.0
| -rw-r--r-- | onboarding/pom.xml | 2 | ||||
| -rw-r--r-- | openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/ToscaConverterImpl.java | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/onboarding/pom.xml b/onboarding/pom.xml index e57a0cc4ce..61a4e14b51 100644 --- a/onboarding/pom.xml +++ b/onboarding/pom.xml @@ -38,7 +38,7 @@ <openecomp.sdc.common.version>${project.version}</openecomp.sdc.common.version> <!-- Onboarding 3rd party versions --> - <jtosca.version>1.1.10-SNAPSHOT</jtosca.version> + <jtosca.version>1.1.1-SNAPSHOT</jtosca.version> <aspectj.version>1.8.9</aspectj.version> <bsh.version>2.0b5</bsh.version> <cassandra.version>2.1.9</cassandra.version> diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/ToscaConverterImpl.java b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/ToscaConverterImpl.java index 69fa33aae7..f38d7f2b06 100644 --- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/ToscaConverterImpl.java +++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/ToscaConverterImpl.java @@ -345,7 +345,7 @@ public class ToscaConverterImpl implements ToscaConverter { return CsarFileTypes.globalServiceTemplate; } else if (isDefinitions(fileName)) { return CsarFileTypes.definitionsFile; - } else if (isMetadataFile(metadataFile)) { + } else if (isMetadataFile(fileName)) { return CsarFileTypes.toscaMetadata; } return CsarFileTypes.externalFile; @@ -409,7 +409,8 @@ public class ToscaConverterImpl implements ToscaConverter { //todo - return error to user? throw new CoreException(new ErrorCode.ErrorCodeBuilder() .withCategory(ErrorCategory.APPLICATION) - .withMessage("Can't create Node Type from " + nodeTypeId).build()); + .withMessage("Can't create " + classToCreate.getSimpleName() + " from " + + nodeTypeId).build()); } } |