summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOfir Sonsino <os0695@intl.att.com>2019-07-21 13:16:39 +0300
committerOfir Sonsino <os0695@intl.att.com>2019-07-21 13:16:39 +0300
commit706a6ce8e074157ec4708d38e1b705a5eef271cb (patch)
treea9b51f308ce651ee08b9e94313da68859a70f449
parent22360c78d550a25b9bdaea12cdb208371b69a488 (diff)
Remove Proprietary notices
Change-Id: I038ed4b764d592d013d8b4b2ae3b69b2961c518a Issue-ID: SDC-2471 Signed-off-by: Ofir Sonsino <os0695@intl.att.com>
-rw-r--r--openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/src/main/resources/configuration.yaml12
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/informationArtifact/impl/TxtInformationArtifactConstants.java6
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/informationArtifact/impl/TxtInformationArtifactGeneratorImpl.java3
-rw-r--r--openecomp-be/tools/zusammen-tools/src/test/resources/configuration.yaml12
4 files changed, 5 insertions, 28 deletions
diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/src/main/resources/configuration.yaml b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/src/main/resources/configuration.yaml
index 75f2cc8995..c5a82d5bc8 100644
--- a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/src/main/resources/configuration.yaml
+++ b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/src/main/resources/configuration.yaml
@@ -237,14 +237,6 @@ cleanComponentsConfiguration:
artifactsIndex: resources
heatEnvArtifactHeader:
- " # _______________________________________________________________________________________________________________________________________\n
- #| AT&T Proprietary (Restricted) |\n
- #| Only for use by authorized individuals or any above-designated team(s) |\n
- #| within the AT&T companies and not for general distribution |\n
- #|_______________________________________________________________________________________________________________________________________|\n"
+ ""
heatEnvArtifactFooter:
- " # _______________________________________________________________________________________________________________________________________\n
- #| AT&T Proprietary (Restricted) |\n
- #| Only for use by authorized individuals or any above-designated team(s) |\n
- #| within the AT&T companies and not for general distribution |\n
- #|_______________________________________________________________________________________________________________________________________|\n"
+ ""
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/informationArtifact/impl/TxtInformationArtifactConstants.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/informationArtifact/impl/TxtInformationArtifactConstants.java
index 56e01d1fa4..4fee8aec75 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/informationArtifact/impl/TxtInformationArtifactConstants.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/informationArtifact/impl/TxtInformationArtifactConstants.java
@@ -33,12 +33,6 @@ public class TxtInformationArtifactConstants {
public static final String DELIMITER = ":";
public static final String FOUR_TABS = TAB + TAB + TAB + TAB;
- public static final String HEADER = "Proprietary information (Restricted)\n"
- + "For use only by authorized individuals and not for general distribution." + NL + NL + NL;
-
- public static final String FOOTER = NL + NL + NL + "Proprietary information (Restricted)\n"
- + "For use only by authorized individuals and not for general distribution.";
-
public static final String TITLE = "1." + TAB + "VSP Details" + DELIMITER;
public static final String VSP_NAME = "a." + TAB + "Name" + DELIMITER;
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/informationArtifact/impl/TxtInformationArtifactGeneratorImpl.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/informationArtifact/impl/TxtInformationArtifactGeneratorImpl.java
index 9aba18ed57..e69ca8d149 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/informationArtifact/impl/TxtInformationArtifactGeneratorImpl.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/informationArtifact/impl/TxtInformationArtifactGeneratorImpl.java
@@ -62,7 +62,7 @@ public class TxtInformationArtifactGeneratorImpl implements InformationArtifactG
}
private String createTxtArtifact(InformationArtifactData informationArtifactData) {
- textArtifact = new StringBuilder(TxtInformationArtifactConstants.HEADER);
+ textArtifact = new StringBuilder();
addVspVlmEntries(informationArtifactData);
addAvailabilityEntries();
addDataEntries(informationArtifactData);
@@ -84,7 +84,6 @@ public class TxtInformationArtifactGeneratorImpl implements InformationArtifactG
for (ComponentQuestionnaire componentQuestionnaire : componentQuestionnaires) {
addRecoveryEntriesPerComponent(componentQuestionnaire);
}
- textArtifact.append(TxtInformationArtifactConstants.FOOTER);
return textArtifact.toString();
}
diff --git a/openecomp-be/tools/zusammen-tools/src/test/resources/configuration.yaml b/openecomp-be/tools/zusammen-tools/src/test/resources/configuration.yaml
index ecfdfe0e69..4dd21e3934 100644
--- a/openecomp-be/tools/zusammen-tools/src/test/resources/configuration.yaml
+++ b/openecomp-be/tools/zusammen-tools/src/test/resources/configuration.yaml
@@ -238,14 +238,6 @@ cleanComponentsConfiguration:
artifactsIndex: resources
heatEnvArtifactHeader:
- " # _______________________________________________________________________________________________________________________________________\n
- #| AT&T Proprietary (Restricted) |\n
- #| Only for use by authorized individuals or any above-designated team(s) |\n
- #| within the AT&T companies and not for general distribution |\n
- #|_______________________________________________________________________________________________________________________________________|\n"
+ ""
heatEnvArtifactFooter:
- " # _______________________________________________________________________________________________________________________________________\n
- #| AT&T Proprietary (Restricted) |\n
- #| Only for use by authorized individuals or any above-designated team(s) |\n
- #| within the AT&T companies and not for general distribution |\n
- #|_______________________________________________________________________________________________________________________________________|\n"
+ ""