From d9007d680d19734d5dc106479784c420236cca4b Mon Sep 17 00:00:00 2001
From: Ravindra Bakkamanthala <rb7147@att.com>
Date: Wed, 31 May 2017 15:54:24 -0400
Subject: [Policy-17] Removed the sql scripts from sdk app

Change-Id: I5b017aad569014c7f12eab35e1dbd1c215f90ebe
Signed-off-by: Ravindra Bakkamanthala <rb7147@att.com>
---
 PolicyEngineAPI/pom.xml                                    |  4 ----
 .../java/org/openecomp/policy/std/StdPolicyEngine.java     | 14 +++++++-------
 2 files changed, 7 insertions(+), 11 deletions(-)

(limited to 'PolicyEngineAPI')

diff --git a/PolicyEngineAPI/pom.xml b/PolicyEngineAPI/pom.xml
index f0bffb5de..60e603bf4 100644
--- a/PolicyEngineAPI/pom.xml
+++ b/PolicyEngineAPI/pom.xml
@@ -121,10 +121,6 @@
 					<groupId>com.att.aft</groupId>
     				<artifactId>dme2</artifactId>
 				</exclusion>
-				<exclusion>
-					<groupId>com.att.cadi</groupId>
-					<artifactId>cadi-aaf</artifactId>
-				</exclusion>
 			</exclusions>
 		</dependency>
 		<!-- https://mvnrepository.com/artifact/org.mockito/mockito-all -->
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/StdPolicyEngine.java b/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/StdPolicyEngine.java
index 5b10f3066..2e14676c8 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/StdPolicyEngine.java
+++ b/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/StdPolicyEngine.java
@@ -82,7 +82,7 @@ import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
 import org.openecomp.policy.common.logging.flexlogger.Logger;
 import org.openecomp.policy.models.APIDictionaryResponse;
 import org.openecomp.policy.models.APIPolicyConfigResponse;
-import org.openecomp.policy.utils.AAFPolicyClient.Environment;
+import org.openecomp.policy.utils.AAFEnvironment;
 import org.openecomp.policy.utils.PolicyUtils;
 import org.openecomp.policy.xacml.api.XACMLErrorConstants;
 import org.springframework.core.io.FileSystemResource;
@@ -902,13 +902,13 @@ public class StdPolicyEngine {
 				pass = clientKey.trim();
 			}
 			setClientEncoding();
-			environment = prop.getProperty("ENVIRONMENT", Environment.DEVL.toString());
-			if(environment.equalsIgnoreCase(Environment.TEST.toString())){
-				environment = Environment.TEST.toString();
-			}else if(environment.equalsIgnoreCase(Environment.PROD.toString())){
-				environment = Environment.PROD.toString();
+			environment = prop.getProperty("ENVIRONMENT", AAFEnvironment.DEVL.toString());
+			if(environment.equalsIgnoreCase(AAFEnvironment.TEST.toString())){
+				environment = AAFEnvironment.TEST.toString();
+			}else if(environment.equalsIgnoreCase(AAFEnvironment.PROD.toString())){
+				environment = AAFEnvironment.PROD.toString();
 			}else{
-				environment = Environment.DEVL.toString();
+				environment = AAFEnvironment.DEVL.toString();
 			}
 			// Initializing the values.
 			pdps = new ArrayList<>();
-- 
cgit 1.2.3-korg