Policy 1707 commit to LF

Change-Id: Ibe6f01d92f9a434c040abb05d5386e89d675ae65
Signed-off-by: ITSERVICES\rb7147 <rb7147@att.com>

1 files changed, 7 insertions, 44 deletions

diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/WebConfig.java b/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/WebConfig.java
index b84049c87..069d1ba5b 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/WebConfig.java
+++ b/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/WebConfig.java
@@ -20,61 +20,24 @@
 
 package org.openecomp.policy.pap.xacml.rest;
 
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Base64;
-import java.util.Properties;
-
 import javax.servlet.ServletContext;
 import javax.servlet.ServletRegistration;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.springframework.web.WebApplicationInitializer;
-import org.springframework.web.context.support.XmlWebApplicationContext;
+import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
 import org.springframework.web.servlet.DispatcherServlet;
 
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
-
-
 public class WebConfig implements WebApplicationInitializer {
 	
-	private static final Log logger	= LogFactory.getLog(WebConfig.class);
-	
 	@Override
 	public void onStartup(ServletContext container) {
-		
-		//need to get properties for userid and password on the pap to get authorization string used in URI Mapping
-		Properties prop = new Properties();
-		String propFileName = "xacml.pap.properties";
-		
-		try {
-			InputStream is = new FileInputStream(propFileName);
-			prop.load(is);
-		} catch (Exception e) {
-			logger.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "property file '" + propFileName + "' not found in the classpath");
-		}
-		
-		String papID = prop.getProperty("xacml.rest.pap.userid");
-		String papPass = prop.getProperty("xacml.rest.pap.password");
-		
-		String usernameAndPassword = papID+":"+papPass;		
-		String authorizationString = Base64.getEncoder().encodeToString(usernameAndPassword.getBytes());
-		
-		
-		XmlWebApplicationContext appContext = new XmlWebApplicationContext();
-		appContext.setConfigLocation("classpath:spring.xml");
-		
-		System.out.println("Spring XML File Location: " + appContext.getConfigLocations());
-		logger.info("Spring XML File Location: " + appContext.getConfigLocations());
-
-		ServletRegistration.Dynamic dispatcher =
-				container.addServlet("dispatcher", new DispatcherServlet(appContext));
+		AnnotationConfigWebApplicationContext ctx = new AnnotationConfigWebApplicationContext();
+		ctx.register(PAPRestConfig.class);
+		ctx.setServletContext(container);
+		ctx.refresh();
+		ServletRegistration.Dynamic dispatcher = container.addServlet("dispatcher", new DispatcherServlet(ctx));
 		dispatcher.setLoadOnStartup(1);
-		dispatcher.addMapping("/@Auth@"+authorizationString+"/ecomp/*");
+		dispatcher.addMapping("/ecomp/*");
 	}
 
-
 }