diff options
| author | Florian Reimair <florian.reimair@iaik.tugraz.at> | 2014-01-30 20:59:16 +0100 | 
|---|---|---|
| committer | Florian Reimair <florian.reimair@iaik.tugraz.at> | 2014-01-31 17:17:31 +0100 | 
| commit | e1e410da00a399a8b059645a14a7848b39d3525c (patch) | |
| tree | 98b2a66311e4faa4740bb3b0e75d5595a88072f2 /id/ConfigWebTool | |
| parent | 20c7b74026da669ff560281e69b4df37392154fd (diff) | |
| download | moa-id-spss-e1e410da00a399a8b059645a14a7848b39d3525c.tar.gz moa-id-spss-e1e410da00a399a8b059645a14a7848b39d3525c.tar.bz2 moa-id-spss-e1e410da00a399a8b059645a14a7848b39d3525c.zip | |
removed old saml-engine
Diffstat (limited to 'id/ConfigWebTool')
| -rw-r--r-- | id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ImportExportAction.java | 18 | 
1 files changed, 1 insertions, 17 deletions
| diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ImportExportAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ImportExportAction.java index 428cbbe6f..28be60e07 100644 --- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ImportExportAction.java +++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ImportExportAction.java @@ -34,8 +34,6 @@ import at.gv.egovernment.moa.id.util.Random;  import com.opensymphony.xwork2.ActionSupport; -import eu.stork.vidp.messages.common.STORKBootstrap; -  public class ImportExportAction extends ActionSupport   implements ServletRequestAware, ServletResponseAware { @@ -114,21 +112,7 @@ implements ServletRequestAware, ServletResponseAware {  				session.setAttribute(Constants.SESSION_FORMID, formID);  				return Constants.STRUTS_ERROR_VALIDATION;  			} -			 -			//Initialize OpenSAML for STORK -			log.info("Starting initialization of OpenSAML..."); -			try { -				STORKBootstrap.bootstrap(); -				 -			} catch (org.opensaml.xml.ConfigurationException e1) { -				log.info("Legacy configuration has an Import Error", e1); -				addActionError(LanguageHelper.getErrorString("errors.importexport.legacyimport", new Object[] {e1.getMessage()})); -				 -				formID = Random.nextRandom(); -				session.setAttribute(Constants.SESSION_FORMID, formID); -				return Constants.STRUTS_ERROR_VALIDATION; -			} -			log.debug("OpenSAML successfully initialized"); +  			try {  				MOAIDConfiguration moaidconfig = ConfigurationDBRead.getMOAIDConfiguration(); | 
