diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2018-07-16 18:34:17 +0200 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2018-07-16 18:34:17 +0200 |
| commit | 43b57a3c903669fc9de36c46e99773bac97a2102 (patch) | |
| tree | 1e5cd74c040f79709d0265acb134bb50085848e3 /id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/NewConfigurationDBRead.java | |
| parent | 05d5c29bb3be38d40484f9c5bb5fdbdc131cba9f (diff) | |
| parent | 4ae32fabc822b3c8ed51d380969f7db682d1bfae (diff) | |
| download | moa-id-spss-43b57a3c903669fc9de36c46e99773bac97a2102.tar.gz moa-id-spss-43b57a3c903669fc9de36c46e99773bac97a2102.tar.bz2 moa-id-spss-43b57a3c903669fc9de36c46e99773bac97a2102.zip | |
Merge branch 'huge_refactoring' into development_preview
# Conflicts:
# id/server/doc/handbook/config/config.html
# id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameterDecorator.java
# id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
# id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/VerifyAuthenticationBlockTask.java
# id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/validator/CreateXMLSignatureResponseValidator.java
Diffstat (limited to 'id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/NewConfigurationDBRead.java')
| -rw-r--r-- | id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/NewConfigurationDBRead.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/NewConfigurationDBRead.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/NewConfigurationDBRead.java index 3928cf8c0..cada51b9a 100644 --- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/NewConfigurationDBRead.java +++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/NewConfigurationDBRead.java @@ -9,11 +9,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import at.gv.egiz.components.configuration.api.ConfigurationException; +import at.gv.egiz.eaaf.core.impl.utils.KeyValueUtils; import at.gv.egovernment.moa.id.commons.config.ConfigurationMigrationUtils; import at.gv.egovernment.moa.id.commons.config.MOAIDConfigurationConstants; import at.gv.egovernment.moa.id.commons.config.persistence.MOAIDConfiguration; import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.OnlineApplication; -import at.gv.egovernment.moa.id.commons.utils.KeyValueUtils; import at.gv.egovernment.moa.logging.Logger; /** @@ -84,13 +84,13 @@ public class NewConfigurationDBRead { String hjID = KeyValueUtils.getFirstChildAfterPrefix(oaKeyId, KeyValueUtils.getParentKey(oaKeyId)); //TODO: work-around for old configTool and new key/value configuration //see BasicOAAction.java line 493 - if (serviceType.equals(MOAIDConfigurationConstants.PREFIX_GATEWAY)) - jaxBOA.setHjid(Long.valueOf(hjID) + 1000000); - else if (serviceType.equals(MOAIDConfigurationConstants.PREFIX_IIDP)) - jaxBOA.setHjid(Long.valueOf(hjID) + 2000000); - else if (serviceType.equals(MOAIDConfigurationConstants.PREFIX_VIDP)) - jaxBOA.setHjid(Long.valueOf(hjID) + 3000000); - else +// if (serviceType.equals(MOAIDConfigurationConstants.PREFIX_GATEWAY)) +// jaxBOA.setHjid(Long.valueOf(hjID) + 1000000); +// else if (serviceType.equals(MOAIDConfigurationConstants.PREFIX_IIDP)) +// jaxBOA.setHjid(Long.valueOf(hjID) + 2000000); +// else if (serviceType.equals(MOAIDConfigurationConstants.PREFIX_VIDP)) +// jaxBOA.setHjid(Long.valueOf(hjID) + 3000000); +// else jaxBOA.setHjid(Long.valueOf(hjID)); Logger.debug("Transformation finished with JaxB hjID: " + hjID); |