diff options
author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2015-08-27 12:07:52 +0200 |
---|---|---|
committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2015-08-27 12:07:52 +0200 |
commit | 1051a42329a603821f415383343d253724d4cd65 (patch) | |
tree | f8a0b6e8445b7034dfe38d6ba3a61f1429a75a6e /id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationEngine.java | |
parent | bb1b12ac5b240629e16ea1c7a50891e99f4adc14 (diff) | |
parent | eb0cf88708f3d689c2cb6bb0dbf83dd290bee887 (diff) | |
download | moa-id-spss-1051a42329a603821f415383343d253724d4cd65.tar.gz moa-id-spss-1051a42329a603821f415383343d253724d4cd65.tar.bz2 moa-id-spss-1051a42329a603821f415383343d253724d4cd65.zip |
Merge STORK-SAML-Engine 1.5.1 and STORK-Commons 1.5.1
Conflicts:
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeProviderFactory.java
id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/CustomAttributeQueryValidator.java
id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/MultipleAssertionResponseValidator.java
Diffstat (limited to 'id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationEngine.java')
-rw-r--r-- | id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationEngine.java | 74 |
1 files changed, 38 insertions, 36 deletions
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationEngine.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationEngine.java index d9e7e467a..9dbed386e 100644 --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationEngine.java +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationEngine.java @@ -24,46 +24,48 @@ import java.util.Map; */ public class ConfigurationEngine { - /** The name of the configuration file. */ - private String name; + /** The name of the configuration file. */ + private String name; - /** The parameters. */ - private Map<String, String> parameters; + /** The parameters. */ + private Map<String, String> parameters; - /** - * Gets the name. - * - * @return the name - */ - public final String getName() { - return name; - } + /** + * Gets the name. + * + * @return the name + */ + public final String getName() { + return name; + } - /** - * Gets the parameters. - * - * @return the parameters - */ - public final Map<String, String> getParameters() { - return parameters; - } + /** + * Gets the parameters. + * + * @return the parameters + */ + public final Map<String, String> getParameters() { + return parameters; + } - /** - * Sets the name. - * - * @param newName the new name - */ - public final void setName(final String newName) { - this.name = newName; - } + /** + * Sets the name. + * + * @param newName + * the new name + */ + public final void setName(final String newName) { + this.name = newName; + } - /** - * Sets the parameters. - * - * @param newParameters the parameters - */ - public final void setParameters(final Map<String, String> newParameters) { - this.parameters = newParameters; - } + /** + * Sets the parameters. + * + * @param newParameters + * the parameters + */ + public final void setParameters(final Map<String, String> newParameters) { + this.parameters = newParameters; + } } |