Add collaboration feature

Issue-ID: SDC-767
Change-Id: I14fb4c1f54086ed03a56a7ff7fab9ecd40381795
Signed-off-by: talig <talig@amdocs.com>

3 files changed, 2 insertions, 6 deletions

diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/aai/AaiArtifactGenerator.java b/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/aai/AaiArtifactGenerator.java
index 26b884e465..8462a71a97 100644
--- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/aai/AaiArtifactGenerator.java
+++ b/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/aai/AaiArtifactGenerator.java
@@ -560,7 +560,7 @@ public class AaiArtifactGenerator implements ArtifactGenerator {
         return tosca;
       } catch (Exception exception) {
         throw new IllegalArgumentException(
-            String.format(GeneratorConstants.GENERATOR_AAI_ERROR_INVALID_TOSCA, input.getName()));
+            String.format(GeneratorConstants.GENERATOR_AAI_ERROR_INVALID_TOSCA, input.getName()), exception);
       }
     } else {
       throw new SecurityException(GeneratorConstants.GENERATOR_AAI_ERROR_CHECKSUM_MISMATCH);
diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/aai/AaiModelGeneratorImpl.java b/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/aai/AaiModelGeneratorImpl.java
index 7f4471c4c0..4e6153d7e4 100644
--- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/aai/AaiModelGeneratorImpl.java
+++ b/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/aai/AaiModelGeneratorImpl.java
@@ -33,7 +33,6 @@ import org.openecomp.sdc.generator.aai.xml.ModelVers;
 import org.openecomp.sdc.generator.aai.xml.Relationship;
 import org.openecomp.sdc.generator.aai.xml.RelationshipData;
 import org.openecomp.sdc.generator.aai.xml.RelationshipList;
-import org.openecomp.sdc.generator.logging.annotations.Audit;
 import org.openecomp.sdc.generator.logging.annotations.Metrics;
 import org.w3c.dom.DOMException;
 
@@ -271,12 +270,9 @@ public class AaiModelGeneratorImpl implements AaiModelGenerator {
       jaxbMarshaller.setProperty(Marshaller.JAXB_FRAGMENT, Boolean.TRUE);
       jaxbMarshaller.marshal(model, modelStringWriter);
     } catch (JAXBException jaxbException) {
-      //jaxbException.printStackTrace();
-      log.error(jaxbException.getMessage());
       throw new DOMException(DOMException.SYNTAX_ERR, jaxbException.getMessage());
     }
 
-    //System.out.println(modelStringWriter.toString());
     return modelStringWriter.toString();
   }
 }
diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/util/ArtifactGeneratorUtil.java b/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/util/ArtifactGeneratorUtil.java
index aa3ce46013..26bbe7f619 100644
--- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/util/ArtifactGeneratorUtil.java
+++ b/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/util/ArtifactGeneratorUtil.java
@@ -163,7 +163,7 @@ public class ArtifactGeneratorUtil {
       String hostname = ip.getHostName();
       MDC.put(BE_FQDN, hostname);
     } catch (UnknownHostException uhe) {
-      log.error("Failed to get server FQDN");
+      log.error("Failed to get server FQDN", uhe);
     }
 
     if (log.isDebugEnabled()) {