diff options
Diffstat (limited to 'bpmn/MSOCommonBPMN')
4 files changed, 9 insertions, 19 deletions
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/util/CryptoHandler.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/util/CryptoHandler.java index 787453ed28..13cff65018 100644 --- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/util/CryptoHandler.java +++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/util/CryptoHandler.java @@ -20,21 +20,25 @@ */
package org.openecomp.mso.bpmn.common.util;
-
+import java.io.IOException;
import java.security.GeneralSecurityException;
import org.openecomp.mso.logger.MsoLogger;
+import java.util.Properties;
public class CryptoHandler implements ICryptoHandler {
private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);
private static String msoKey = "aa3871669d893c7fb8abbcda31b88b4f";
- private static String msoAaiEncryptedPwd = "C1FC4A39E16419DD41DFC1212843F440";
+ private static String msoAaiEncryptedPwd;
@Override
public String getMsoAaiPassword() {
+ Properties keyProp = new Properties ();
try {
+ keyProp.load (Thread.currentThread ().getContextClassLoader ().getResourceAsStream ("urn.properties"));
+ msoAaiEncryptedPwd =(String) keyProp.get ("mso.AaiEncrypted.Pwd");
return CryptoUtils.decrypt(msoAaiEncryptedPwd, msoKey);
- } catch (GeneralSecurityException e) {
+ } catch (GeneralSecurityException | IOException e) {
LOGGER.debug("GeneralSecurityException :",e);
return null;
}
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/urn.properties b/bpmn/MSOCommonBPMN/src/main/resources/urn.properties index 5bf8e24815..12253aa9d2 100644 --- a/bpmn/MSOCommonBPMN/src/main/resources/urn.properties +++ b/bpmn/MSOCommonBPMN/src/main/resources/urn.properties @@ -27,3 +27,4 @@ AAIEndPoint= http://localhost:28090/ SDNCEndPoint=http://localhost:28090/SDNCAdapter/ msoRollback = true +mso.AaiEncrypted.Pwd = C1FC4A39E16419DD41DFC1212843F440 diff --git a/bpmn/MSOCommonBPMN/src/main/resources/xsd/MSOWorkflowSchemaV1.xsd b/bpmn/MSOCommonBPMN/src/main/resources/xsd/MSOWorkflowSchemaV1.xsd index e743dc754e..0472e54693 100644 --- a/bpmn/MSOCommonBPMN/src/main/resources/xsd/MSOWorkflowSchemaV1.xsd +++ b/bpmn/MSOCommonBPMN/src/main/resources/xsd/MSOWorkflowSchemaV1.xsd @@ -1,13 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - ========================================================================= - AT&T Proprietary (Internal Use Only) Not for use or disclosure outside - the AT&T companies except under written agreement (c) 2015 AT&T - Intellectual Property. All rights reserved. AT&T and the AT&T logo are - trademarks of AT&T Intellectual Property. - ======================================================================= - --> - <!-- ================================================================ Description: This is the schema for LPP Configuration Component diff --git a/bpmn/MSOCommonBPMN/src/main/resources/xsd/MsoServiceRequestTypesV1.xsd b/bpmn/MSOCommonBPMN/src/main/resources/xsd/MsoServiceRequestTypesV1.xsd index ce92a4909b..c5fa26c998 100644 --- a/bpmn/MSOCommonBPMN/src/main/resources/xsd/MsoServiceRequestTypesV1.xsd +++ b/bpmn/MSOCommonBPMN/src/main/resources/xsd/MsoServiceRequestTypesV1.xsd @@ -1,12 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- - ========================================================================= - AT&T Proprietary (Internal Use Only) Not for use or disclosure outside - the AT&T companies except under written agreement (c) 2015 AT&T - Intellectual Property. All rights reserved. AT&T and the AT&T logo are - trademarks of AT&T Intellectual Property. - ======================================================================= - --> + <!-- ================================================================ Description: This is the schema for MSO Request data |