namespace refactoring

3 files changed, 0 insertions, 180 deletions

diff --git a/connector_lib/src/main/java/at/gv/egiz/eidas/specific/connector/gui/DefaultGUIBuilderImpl.java b/connector_lib/src/main/java/at/gv/egiz/eidas/specific/connector/gui/DefaultGUIBuilderImpl.java
deleted file mode 100644
index b75c2e23..00000000
--- a/connector_lib/src/main/java/at/gv/egiz/eidas/specific/connector/gui/DefaultGUIBuilderImpl.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package at.gv.egiz.eidas.specific.connector.gui;
-
-import java.io.InputStream;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-
-import at.gv.egiz.eaaf.core.api.gui.IGUIBuilderConfiguration;
-import at.gv.egiz.eaaf.core.api.gui.IGUIFormBuilder;
-import at.gv.egiz.eaaf.core.exceptions.GUIBuildException;
-import at.gv.egiz.eaaf.core.impl.gui.AbstractGUIFormBuilderImpl;
-
-@Service("DefaultGUIBuilderImpl")
-public class DefaultGUIBuilderImpl extends AbstractGUIFormBuilderImpl implements IGUIFormBuilder {
-	private static final Logger log = LoggerFactory.getLogger(DefaultGUIBuilderImpl.class);
-	
-	private static final String CLASSPATH_HTMLTEMPLATES_DIR = "templates/";
-	
-	public DefaultGUIBuilderImpl() throws GUIBuildException {
-		super(); 
-		 
-	}
-
-	@Override
-	protected InputStream getInternalTemplate(IGUIBuilderConfiguration config) throws GUIBuildException {
-		String viewName = config.getViewName();
-		log.debug("GUI template:" + viewName + " is not found in configuration directory. "
-				+ " Load template from project library ... ");					
-		String pathLocation = getInternalClasspathTemplateDir(config, CLASSPATH_HTMLTEMPLATES_DIR) + viewName;
-		try  {			
-			InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(pathLocation);				
-			return is;						
-			
-		} catch (Exception e1) {
-			log.error("GUI template:" + pathLocation + " is NOT loadable  from classpath!", e1);
-			throw new GUIBuildException("GUI template:" + pathLocation + " is NOT loadable from classpath!", e1);
-			
-		}			
-		
-	}
-
-}
diff --git a/connector_lib/src/main/java/at/gv/egiz/eidas/specific/connector/gui/GUIBuilderConfigurationFactory.java b/connector_lib/src/main/java/at/gv/egiz/eidas/specific/connector/gui/GUIBuilderConfigurationFactory.java
deleted file mode 100644
index 8132c063..00000000
--- a/connector_lib/src/main/java/at/gv/egiz/eidas/specific/connector/gui/GUIBuilderConfigurationFactory.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- *******************************************************************************/
-package at.gv.egiz.eidas.specific.connector.gui;
-
-import java.net.MalformedURLException;
-import java.net.URI;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import at.gv.egiz.eaaf.core.api.IRequest;
-import at.gv.egiz.eaaf.core.api.gui.IGUIBuilderConfiguration;
-import at.gv.egiz.eaaf.core.api.gui.IGUIBuilderConfigurationFactory;
-import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
-import at.gv.egiz.eidas.specific.connector.MSeIDASNodeConstants;
-
-@Service("GUIBuilderConfigurationFactory")
-public class GUIBuilderConfigurationFactory implements IGUIBuilderConfigurationFactory {
-	@Autowired(required=true) private IConfiguration basicConfig; 
-	
-	@Override
-	public IGUIBuilderConfiguration getDefaultErrorGUI(String authURL) {
-		return new StaticGuiBuilderConfiguration(basicConfig, authURL, MSeIDASNodeConstants.TEMPLATE_HTML_ERROR, null);
-	}
-
-	@Override
-	public IGUIBuilderConfiguration getSPSpecificSAML2PostConfiguration(IRequest pendingReq, String viewName, URI configRootContextDir)
-			throws MalformedURLException {				
-		return new StaticGuiBuilderConfiguration(basicConfig, pendingReq,MSeIDASNodeConstants.TEMPLATE_HTML_PVP_POSTBINDING , null);
-	}
-
-}
diff --git a/connector_lib/src/main/java/at/gv/egiz/eidas/specific/connector/gui/StaticGuiBuilderConfiguration.java b/connector_lib/src/main/java/at/gv/egiz/eidas/specific/connector/gui/StaticGuiBuilderConfiguration.java
deleted file mode 100644
index 3a765eb5..00000000
--- a/connector_lib/src/main/java/at/gv/egiz/eidas/specific/connector/gui/StaticGuiBuilderConfiguration.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- *******************************************************************************/
-package at.gv.egiz.eidas.specific.connector.gui;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.lang.StringEscapeUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import at.gv.egiz.eaaf.core.api.IRequest;
-import at.gv.egiz.eaaf.core.api.gui.ModifyableGuiBuilderConfiguration;
-import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
-import at.gv.egiz.eaaf.core.impl.gui.AbstractGUIFormBuilderConfiguration;
-import at.gv.egiz.eaaf.core.impl.utils.FileUtils;
-import at.gv.egiz.eidas.specific.connector.MSeIDASNodeConstants;
-
-public class StaticGuiBuilderConfiguration extends AbstractGUIFormBuilderConfiguration implements ModifyableGuiBuilderConfiguration {
-	private static final Logger log = LoggerFactory.getLogger(StaticGuiBuilderConfiguration.class);
-	
-	private IRequest pendingReq = null;
-	private IConfiguration basicConfig = null;
-	Map<String, Object> params =  new HashMap<String, Object>();
-	
-	public StaticGuiBuilderConfiguration(IConfiguration basicConfig, String authURL, String viewName, String formSubmitEndpoint) {
-		super(authURL, viewName, formSubmitEndpoint);
-		this.basicConfig = basicConfig;
-	}
-
-	public StaticGuiBuilderConfiguration(IConfiguration basicConfig, IRequest pendingReq, String viewName, String formSubmitEndpoint) {
-		super(pendingReq.getAuthURL(), viewName, formSubmitEndpoint);
-		this.pendingReq = pendingReq;
-		this.basicConfig = basicConfig;
-		
-	}
-	
-	@Override
-	public String getClasspathTemplateDir() {
-		return MSeIDASNodeConstants.CLASSPATH_TEMPLATE_DIR;
-		
-	}
-
-	@Override
-	public String getDefaultContentType() {
-		return null;
-		
-	}
-
-	@Override
-	public InputStream getTemplate(String viewName) {
-		String templateURL = MSeIDASNodeConstants.FILESYSTEM_TEMPLATE_DIR + viewName;
-		try {			
-			String absURL = FileUtils.makeAbsoluteURL(templateURL, this.basicConfig.getConfigurationRootDirectory());				
-			if (!absURL.startsWith("file:")) {
-				log.warn("Path to template looks like NOT absolut: " + absURL + ". Template loading FAILED");
-			
-			} else {
-				log.debug("Load template URL for view: " + viewName + " from: " + absURL);
-				URI uri = new URL(absURL).toURI();
-				return new FileInputStream(new File(uri));
-				
-			}
-			
-			
-		} catch (MalformedURLException | URISyntaxException | FileNotFoundException e) {
-			log.info("Can can build filesytem path to template: " + templateURL
-					+ " Reason: " + e.getMessage());
-			
-		}
-		
-		return null;
-	}
-
-	@Override
-	protected Map<String, Object> getSpecificViewParameters() {		
-		if (pendingReq != null) {							
-			params.put(PARAM_PENDINGREQUESTID, StringEscapeUtils.escapeHtml(pendingReq.getPendingRequestId()));
-			
-		}	
-		
-		return params;
-	}
-
-	@Override
-	public void putCustomParameter(String key, String value) {
-		params.put(key, StringEscapeUtils.escapeHtml(value));
-		
-	}
-
-	@Override
-	public void putCustomParameterWithOutEscaption(String arg0, Object arg1) {
-		log.info("Add GUI-Template parameters WITHOUT escaption ARE NOT supported!!!!!");
-		
-	}
-
-}