diff options
Diffstat (limited to 'id/server/moa-id-commons')
34 files changed, 396 insertions, 1851 deletions
diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml index a81744edf..d242147f1 100644 --- a/id/server/moa-id-commons/pom.xml +++ b/id/server/moa-id-commons/pom.xml @@ -114,7 +114,19 @@ <version>2.2.11</version> </dependency> - <dependency> + <dependency> + <groupId>org.jvnet.jaxb2_commons</groupId> + <artifactId>jaxb2-commons-lang</artifactId> + <version>2.4</version> + </dependency> + + <dependency> + <groupId>org.jvnet.jaxb2_commons</groupId> + <artifactId>jaxb2-basics-runtime</artifactId> + <version>0.11.0</version> + </dependency> + +<!-- <dependency> <groupId>org.hibernate.javax.persistence</groupId> <artifactId>hibernate-jpa-2.1-api</artifactId> <version>1.0.0.Final</version> @@ -144,7 +156,8 @@ <groupId>org.springframework</groupId> </exclusion> </exclusions> - </dependency> + </dependency> --> + <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> @@ -165,7 +178,7 @@ <artifactId>spring-orm</artifactId> </dependency> - <dependency> + <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> </dependency> @@ -190,12 +203,14 @@ <groupId>cglib</groupId> <artifactId>cglib</artifactId> <version>2.2.2</version> + <scope>test</scope> </dependency> <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> <version>1.4.178</version> + <scope>test</scope> </dependency> <dependency> @@ -204,6 +219,10 @@ <version>1.4</version> </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + </dependency> </dependencies> diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/MOAIDConstants.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/MOAIDConstants.java index a04b8f454..a28fe6a7b 100644 --- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/MOAIDConstants.java +++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/MOAIDConstants.java @@ -61,6 +61,7 @@ public class MOAIDConstants { public static final List<String> ALLOWED_KEYBOXIDENTIFIER; public static final List<String> ALLOWED_REDIRECTTARGETNAMES; public static final List<String> ALLOWED_STORKATTRIBUTEPROVIDERS; + public static final List<String> JDBC_DRIVER_NEEDS_WORKAROUND; static { @@ -105,4 +106,11 @@ public class MOAIDConstants { } + static { + List<String> jdbcDriverWorkaround = new ArrayList<String>(); + jdbcDriverWorkaround.add("oracle.jdbc."); + jdbcDriverWorkaround.add("com.microsoft.sqlserver."); + JDBC_DRIVER_NEEDS_WORKAROUND = Collections.unmodifiableList(jdbcDriverWorkaround); + } + } diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationMigrationUtils.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationMigrationUtils.java index c53aeff3f..63d8f463c 100644 --- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationMigrationUtils.java +++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationMigrationUtils.java @@ -1188,6 +1188,9 @@ public class ConfigurationMigrationUtils { result.put(MOAIDConfigurationConstants.GENERAL_PUBLICURLPREFIX, authgen.getPublicURLPreFix()); + result.put(MOAIDConfigurationConstants.GENERAL_ISVIRTUALIDPSENABLED, + String.valueOf(authgen.isVirtualPublicURLPrefixEnabled())); + TimeOuts timeouts = authgen.getTimeOuts(); if (timeouts != null) { @@ -1480,6 +1483,16 @@ public class ConfigurationMigrationUtils { dbauthgeneral.setPublicURLPreFix(moaconfig.get(MOAIDConfigurationConstants.GENERAL_PUBLICURLPREFIX)); + if (MiscUtil.isNotEmpty(moaconfig.get(MOAIDConfigurationConstants.GENERAL_ISVIRTUALIDPSENABLED))) { + dbauthgeneral.setVirtualPublicURLPrefixEnabled( + Boolean.valueOf( + moaconfig.get(MOAIDConfigurationConstants.GENERAL_ISVIRTUALIDPSENABLED))); + + } else { + dbauthgeneral.setVirtualPublicURLPrefixEnabled(false); + + } + if (MiscUtil.isNotEmpty(moaconfig.get(MOAIDConfigurationConstants.GENERAL_AUTH_CERTSTORE_URL))) dbauthgeneral.setCertStoreDirectory(moaconfig.get(MOAIDConfigurationConstants.GENERAL_AUTH_CERTSTORE_URL)); @@ -1788,11 +1801,17 @@ public class ConfigurationMigrationUtils { } // try { - List<TransformsInfoType> trans = new ArrayList<TransformsInfoType>(); - TransformsInfoType elem = new TransformsInfoType(); - elem.setTransformation(moaconfig.get(MOAIDConfigurationConstants.GENERAL_AUTH_AUTHBLOCK_TRANSFORMATION_BASE64).getBytes()); - elem.setFilename(moaconfig.get(MOAIDConfigurationConstants.GENERAL_AUTH_AUTHBLOCK_TRANSFORMATION_NAME)); - trans.add(elem); + List<TransformsInfoType> trans = new ArrayList<TransformsInfoType>(); + if (MiscUtil.isNotEmpty(moaconfig.get(MOAIDConfigurationConstants.GENERAL_AUTH_AUTHBLOCK_TRANSFORMATION_BASE64))) { + TransformsInfoType elem = new TransformsInfoType(); + elem.setTransformation(moaconfig.get(MOAIDConfigurationConstants.GENERAL_AUTH_AUTHBLOCK_TRANSFORMATION_BASE64).getBytes()); + elem.setFilename(moaconfig.get(MOAIDConfigurationConstants.GENERAL_AUTH_AUTHBLOCK_TRANSFORMATION_NAME)); + trans.add(elem); + + } else { + Logger.info("No AuthBlock-Transformation found."); + + } seclayertrans.setTransformsInfo(trans); // } catch (IOException e) { diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationUtil.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationUtil.java index 4130b2c5d..e24cb8606 100644 --- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationUtil.java +++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationUtil.java @@ -27,8 +27,6 @@ import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.STORK; import at.gv.egovernment.moa.logging.Logger; import at.gv.egovernment.moa.util.MiscUtil; -import com.fasterxml.jackson.core.JsonProcessingException; - public class ConfigurationUtil { final boolean isOverwriteData; @@ -83,7 +81,7 @@ public class ConfigurationUtil { * is thrown if problem occurred while serializing one of the * database values */ - public static Properties moaIdConfigToJsonProperties(MOAIDConfiguration config) throws JsonProcessingException { + public static Properties moaIdConfigToJsonProperties(MOAIDConfiguration config) { Properties result = new Properties(); diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/MOAIDConfigurationConstants.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/MOAIDConfigurationConstants.java index c338c65ba..7d9fc452a 100644 --- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/MOAIDConfigurationConstants.java +++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/MOAIDConfigurationConstants.java @@ -186,6 +186,7 @@ public final class MOAIDConfigurationConstants extends MOAIDConstants { //Namespaces for general MOA-ID config public static final String GENERAL_PUBLICURLPREFIX = PREFIX_MOAID_GENERAL + ".publicURLPrefix"; + public static final String GENERAL_ISVIRTUALIDPSENABLED = PREFIX_MOAID_GENERAL + ".isVirtualIDPsEnabled"; private static final String GENERAL_DEFAULTS = PREFIX_MOAID_GENERAL + ".defaults"; private static final String GENERAL_DEFAULTS_BKU = GENERAL_DEFAULTS + "." + BKU; diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/persistence/JsonMapper.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/persistence/JsonMapper.java deleted file mode 100644 index 6138d571b..000000000 --- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/persistence/JsonMapper.java +++ /dev/null @@ -1,73 +0,0 @@ -package at.gv.egovernment.moa.id.commons.config.persistence; - -import java.io.IOException; - -import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility; -import com.fasterxml.jackson.annotation.PropertyAccessor; -import com.fasterxml.jackson.core.JsonParseException; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.JavaType; -import com.fasterxml.jackson.databind.JsonMappingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializationFeature; -import com.fasterxml.jackson.databind.type.TypeFactory; - -/** - * Helper class to handle the JSON (de-)serialization. - * - */ -public class JsonMapper { - - private ObjectMapper mapper = new ObjectMapper(); - - /** - * The default constructor where the default pretty printer is disabled. - */ - public JsonMapper() { - this(false); - } - - /** - * The constructor. - * @param prettyPrint enables or disables the default pretty printer - */ - public JsonMapper(boolean prettyPrint) { - mapper.setVisibility(PropertyAccessor.ALL, Visibility.NONE); - mapper.setVisibility(PropertyAccessor.GETTER, Visibility.PUBLIC_ONLY); - mapper.setVisibility(PropertyAccessor.IS_GETTER, Visibility.PUBLIC_ONLY); - if (prettyPrint) { - mapper.enable(SerializationFeature.INDENT_OUTPUT); - } - } - - /** - * Serialize an object to a JSON string. - * @param value the object to serialize - * @return a JSON string - * @throws JsonProcessingException thrown when an error occurs during serialization - */ - public String serialize(Object value) throws JsonProcessingException { - return mapper.writeValueAsString(value); - } - - /** - * Deserialize a JSON string. - * - * @param value the JSON string to deserialize - * @param clazz optional parameter that determines the type of the returned object. If not set, an {@link Object} is returned. - * @return the deserialized JSON string as an object of type {@code clazz} or {@link Object} - * @throws JsonParseException if the JSON string contains invalid content. - * @throws JsonMappingException if the input JSON structure does not match structure expected for result type - * @throws IOException if an I/O problem occurs (e.g. unexpected end-of-input) - */ - public <T> Object deserialize(String value, Class<T> clazz) throws JsonParseException, JsonMappingException, IOException{ - - ObjectMapper mapper = new ObjectMapper(); - if (clazz != null) { - JavaType javaType = TypeFactory.defaultInstance().constructType(clazz); - return mapper.readValue(value, javaType); - } else { - return mapper.readValue(value, Object.class); - } - } -} diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBRead.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBRead.java deleted file mode 100644 index 3836d5a1e..000000000 --- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBRead.java +++ /dev/null @@ -1,403 +0,0 @@ -///******************************************************************************* -// * Copyright 2014 Federal Chancellery Austria -// * MOA-ID has been developed in a cooperation between BRZ, the Federal -// * Chancellery Austria - ICT staff unit, and Graz University of Technology. -// * -// * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by -// * the European Commission - subsequent versions of the EUPL (the "Licence"); -// * You may not use this work except in compliance with the Licence. -// * You may obtain a copy of the Licence at: -// * http://www.osor.eu/eupl/ -// * -// * Unless required by applicable law or agreed to in writing, software -// * distributed under the Licence is distributed on an "AS IS" basis, -// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// * See the Licence for the specific language governing permissions and -// * limitations under the Licence. -// * -// * This product combines work with different licenses. See the "NOTICE" text -// * file for details on the various modules and licenses. -// * The "NOTICE" text file is part of the distribution. Any derivative works -// * that you distribute must include a readable copy of the "NOTICE" text file. -// *******************************************************************************/ -//package at.gv.egovernment.moa.id.commons.db; -// -//import java.util.ArrayList; -//import java.util.HashMap; -//import java.util.List; -//import java.util.Map; -// -//import javax.persistence.EntityManager; -// -//import org.apache.commons.lang3.StringEscapeUtils; -// -//import at.gv.egovernment.moa.id.commons.db.dao.config.MOAIDConfiguration; -//import at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication; -//import at.gv.egovernment.moa.id.commons.db.dao.config.UserDatabase; -//import at.gv.egovernment.moa.logging.Logger; -//import at.gv.egovernment.moa.util.MiscUtil; -////import org.apache.commons.lang.StringEscapeUtils; -// -//import com.fasterxml.jackson.annotation.JsonProperty; -// -///** -// * -// * @author tlenz -// * -// * @deprecated -// */ -// -//@SuppressWarnings("rawtypes") -//public class ConfigurationDBRead { -// -// private static Map<String, String> QUERIES = new HashMap<String, String>(); -// -// static { -// QUERIES.put("getActiveOnlineApplicationWithID", "select onlineapplication from OnlineApplication onlineapplication where onlineapplication.publicURLPrefix = SUBSTRING(:id, 1, LENGTH(onlineapplication.publicURLPrefix)) and onlineapplication.isActive = '1'"); -// QUERIES.put("getOnlineApplicationWithID", "select onlineapplication from OnlineApplication onlineapplication where onlineapplication.publicURLPrefix = SUBSTRING(:id, 1, LENGTH(onlineapplication.publicURLPrefix))"); -// QUERIES.put("getOnlineApplicationWithDBID", "select onlineapplication from OnlineApplication onlineapplication where onlineapplication.hjid = :id"); -// QUERIES.put("getAllOnlineApplications", "select onlineapplication from OnlineApplication onlineapplication"); -// QUERIES.put("getAllActiveOnlineApplications", "select onlineapplication from OnlineApplication onlineapplication where onlineapplication.isActive = '1'"); -// QUERIES.put("getAllNewOnlineApplications", "select onlineapplication from OnlineApplication onlineapplication where onlineapplication.isActive = '0' and onlineapplication.isAdminRequired = '1'"); -// QUERIES.put("getMOAIDConfiguration", "select moaidconfiguration from MOAIDConfiguration moaidconfiguration"); -// QUERIES.put("getUserWithUserID", "select userdatabase from UserDatabase userdatabase where userdatabase.hjid = :id"); -// QUERIES.put("getNewUserWithUserTokken", "select userdatabase from UserDatabase userdatabase where userdatabase.userRequestTokken = :tokken"); -// QUERIES.put("getAllNewUsers", "select userdatabase from UserDatabase userdatabase where userdatabase.userRequestTokken is null and userdatabase.isAdminRequest = '1' and userdatabase.isMailAddressVerified = '1'"); -// QUERIES.put("getAllOpenUsersRequests", "select userdatabase from UserDatabase userdatabase where userdatabase.userRequestTokken is not null and userdatabase.isAdminRequest = '1' and userdatabase.isMailAddressVerified = '0'"); -// QUERIES.put("getUserWithUserBPKWBPK", "select userdatabase from UserDatabase userdatabase where userdatabase.bpk = :bpk"); -// QUERIES.put("getUserWithUserUsername", "select userdatabase from UserDatabase userdatabase where userdatabase.username = :username"); -// QUERIES.put("getAllUsers", "select userdatabase from UserDatabase userdatabase"); -// QUERIES.put("getUsersWithOADBID", "select userdatabase from UserDatabase userdatabase inner join userdatabase.onlineApplication oa where oa.hjid = :id"); -// QUERIES.put("searchOnlineApplicationsWithID", "select onlineapplication from OnlineApplication onlineapplication where onlineapplication.friendlyName like :id"); -// } -// -//// public static OnlineApplication getActiveOnlineApplication(String id) { -//// MiscUtil.assertNotNull(id, "OnlineApplictionID"); -//// Logger.trace("Getting OnlineApplication with ID " + id + " from database."); -//// -//// List result; -//// EntityManager session = ConfigurationDBUtils.getCurrentSession(); -//// -//// javax.persistence.Query query = session.createQuery(QUERIES.get("getActiveOnlineApplicationWithID")); -//// //query.setParameter("id", id+"%"); -//// query.setParameter("id", StringEscapeUtils.escapeHtml4(id)); -//// result = query.getResultList(); -//// -//// Logger.trace("Found entries: " + result.size()); -//// -//// if (result.size() == 0) { -//// Logger.debug("No entries found."); -//// return null; -//// } -//// -//// if (result.size() > 1) { -//// Logger.warn("OAIdentifier match to more then one DB-entry!"); -//// return null; -//// } -//// -//// return (OnlineApplication) result.get(0); -//// } -//// -//// public static OnlineApplication getOnlineApplication(String id) { -//// MiscUtil.assertNotNull(id, "OnlineApplictionID"); -//// Logger.trace("Getting OnlineApplication with ID " + id + " from database."); -//// -//// List result; -//// EntityManager session = ConfigurationDBUtils.getCurrentSession(); -//// -//// javax.persistence.Query query = session.createQuery(QUERIES.get("getOnlineApplicationWithID")); -//// //query.setParameter("id", id+"%"); -//// query.setParameter("id", id); -//// result = query.getResultList(); -//// -//// Logger.trace("Found entries: " + result.size()); -//// -//// if (result.size() == 0) { -//// Logger.trace("No entries found."); -//// return null; -//// } -//// -//// if (result.size() > 1) { -//// Logger.warn("OAIdentifier match to more then one DB-entry!"); -//// return null; -//// } -//// -//// return (OnlineApplication) result.get(0); -//// } -//// -//// public static OnlineApplication getOnlineApplication(long dbid) { -//// MiscUtil.assertNotNull(dbid, "OnlineApplictionID"); -//// Logger.trace("Getting OnlineApplication with DBID " + dbid + " from database."); -//// -//// List result; -//// EntityManager session = ConfigurationDBUtils.getCurrentSession(); -//// -//// javax.persistence.Query query = session.createQuery(QUERIES.get("getOnlineApplicationWithDBID")); -//// //query.setParameter("id", id+"%"); -//// query.setParameter("id", dbid); -//// result = query.getResultList(); -//// -//// Logger.trace("Found entries: " + result.size()); -//// -//// if (result.size() == 0) { -//// Logger.trace("No entries found."); -//// return null; -//// } -//// -//// return (OnlineApplication) result.get(0); -//// } -//// -//// @JsonProperty("getMOAIDConfiguration") -//// public static MOAIDConfiguration getMOAIDConfiguration() { -//// Logger.trace("Load MOAID Configuration from database."); -//// -//// List<MOAIDConfiguration> result; -//// EntityManager session = ConfigurationDBUtils.getCurrentSession(); -//// -//// javax.persistence.Query query = session.createQuery(QUERIES.get("getMOAIDConfiguration")); -//// result = query.getResultList(); -//// -//// Logger.trace("Found entries: " + result.size()); -//// -//// if (result.size() == 0) { -//// Logger.trace("No entries found. Create fresh instance."); -//// return null; -//// } -//// -//// return (MOAIDConfiguration) result.get(0); -//// } -//// -//// @JsonProperty("getAllOnlineApplications") -//// public static List<OnlineApplication> getAllOnlineApplications() { -//// Logger.trace("Get All OnlineApplications from database."); -//// -//// List<OnlineApplication> result = null; -//// EntityManager session = ConfigurationDBUtils.getCurrentSession(); -//// -//// javax.persistence.Query query = session.createQuery(QUERIES.get("getAllOnlineApplications")); -//// result = query.getResultList(); -//// -//// Logger.trace("Found entries: " + result.size()); -//// -//// if (result.size() == 0) { -//// Logger.trace("No entries found."); -//// return null; -//// } -//// return result; -//// } -//// -//// public static List<OnlineApplication> getAllNewOnlineApplications() { -//// Logger.trace("Get All OnlineApplications from database."); -//// -//// List<OnlineApplication> result; -//// EntityManager session = ConfigurationDBUtils.getCurrentSession(); -//// -//// javax.persistence.Query query = session.createQuery(QUERIES.get("getAllNewOnlineApplications")); -//// result = query.getResultList(); -//// -//// Logger.trace("Found entries: " + result.size()); -//// -//// if (result.size() == 0) { -//// Logger.trace("No entries found."); -//// return null; -//// } -//// return result; -//// } -//// -//// @JsonProperty("getAllUsers") -//// public static List<UserDatabase> getAllUsers() { -//// Logger.trace("Get All OnlineApplications from database."); -//// -//// List<UserDatabase> result; -//// EntityManager session = ConfigurationDBUtils.getCurrentSession(); -//// -//// javax.persistence.Query query = session.createQuery(QUERIES.get("getAllUsers")); -//// result = query.getResultList(); -//// -//// Logger.trace("Found entries: " + result.size()); -//// -//// if (result.size() == 0) { -//// Logger.trace("No entries found."); -//// return null; -//// } -//// return result; -//// } -//// -//// public static List<OnlineApplication> getAllActiveOnlineApplications() { -//// Logger.trace("Get All active OnlineApplications from database."); -//// -//// List<OnlineApplication> result; -//// EntityManager session = ConfigurationDBUtils.getCurrentSession(); -//// -//// javax.persistence.Query query = session.createQuery(QUERIES.get("getAllActiveOnlineApplications")); -//// result = query.getResultList(); -//// -//// Logger.trace("Found entries: " + result.size()); -//// -//// if (result.size() == 0) { -//// Logger.trace("No entries found."); -//// result = new ArrayList<OnlineApplication>(); -//// -//// } -//// return result; -//// } -//// -//// @SuppressWarnings("rawtypes") -//// public static List<OnlineApplication> searchOnlineApplications(String id) { -//// MiscUtil.assertNotNull(id, "OnlineApplictionID"); -//// Logger.trace("Getting OnlineApplication with ID " + id + " from database."); -//// -//// List<OnlineApplication> result; -//// EntityManager session = ConfigurationDBUtils.getCurrentSession(); -//// -//// javax.persistence.Query query = session.createQuery(QUERIES.get("searchOnlineApplicationsWithID")); -//// query.setParameter("id", "%" + id + "%"); -//// -//// result = query.getResultList(); -//// -//// Logger.trace("Found entries: " + result.size()); -//// -//// if (result.size() == 0) { -//// Logger.trace("No entries found."); -//// return null; -//// } -//// -//// return result; -//// } -//// -//// public static UserDatabase getUserWithID(long id) { -//// MiscUtil.assertNotNull(id, "UserID"); -//// Logger.trace("Getting Userinformation with ID " + id + " from database."); -//// -//// List<UserDatabase> result; -//// EntityManager session = ConfigurationDBUtils.getCurrentSession(); -//// -//// javax.persistence.Query query = session.createQuery(QUERIES.get("getUserWithUserID")); -//// query.setParameter("id", id); -//// result = query.getResultList(); -//// -//// Logger.trace("Found entries: " + result.size()); -//// -//// if (result.size() == 0) { -//// Logger.trace("No entries found."); -//// return null; -//// } -//// return (UserDatabase) result.get(0); -//// } -//// -//// public static UserDatabase getUsersWithOADBID(long id) { -//// MiscUtil.assertNotNull(id, "OADBID"); -//// Logger.trace("Getting Userinformation with OADBID " + id + " from database."); -//// -//// List<UserDatabase> result; -//// EntityManager session = ConfigurationDBUtils.getCurrentSession(); -//// -//// javax.persistence.Query query = session.createQuery(QUERIES.get("getUsersWithOADBID")); -//// query.setParameter("id", id); -//// result = query.getResultList(); -//// -//// Logger.trace("Found entries: " + result.size()); -//// -//// if (result.size() == 0) { -//// Logger.trace("No entries found."); -//// return null; -//// } -//// return (UserDatabase) result.get(0); -//// } -//// -//// public static UserDatabase getUserWithUserName(String username) { -//// MiscUtil.assertNotNull(username, "UserName"); -//// Logger.trace("Getting Userinformation with ID " + username + " from database."); -//// -//// List<UserDatabase> result; -//// EntityManager session = ConfigurationDBUtils.getCurrentSession(); -//// -//// javax.persistence.Query query = session.createQuery(QUERIES.get("getUserWithUserUsername")); -//// query.setParameter("username", username); -//// result = query.getResultList(); -//// -//// Logger.trace("Found entries: " + result.size()); -//// -//// if (result.size() == 0) { -//// Logger.trace("No entries found."); -//// return null; -//// } -//// return (UserDatabase) result.get(0); -//// } -//// -//// public static UserDatabase getUserWithUserBPKWBPK(String bpkwbpk) { -//// MiscUtil.assertNotNull(bpkwbpk, "bpk/wbpk"); -//// Logger.trace("Getting Userinformation with ID " + bpkwbpk + " from database."); -//// -//// List<UserDatabase> result; -//// EntityManager session = ConfigurationDBUtils.getCurrentSession(); -//// -//// javax.persistence.Query query = session.createQuery(QUERIES.get("getUserWithUserBPKWBPK")); -//// query.setParameter("bpk", bpkwbpk); -//// result = query.getResultList(); -//// -//// Logger.trace("Found entries: " + result.size()); -//// -//// if (result.size() == 0) { -//// Logger.trace("No entries found."); -//// return null; -//// } -//// return (UserDatabase) result.get(0); -//// } -//// -//// public static UserDatabase getNewUserWithTokken(String tokken) { -//// MiscUtil.assertNotNull(tokken, "bpk/wbpk"); -//// Logger.trace("Getting Userinformation with Tokken " + tokken + " from database."); -//// -//// List<UserDatabase> result; -//// EntityManager session = ConfigurationDBUtils.getCurrentSession(); -//// -//// javax.persistence.Query query = session.createQuery(QUERIES.get("getNewUserWithUserTokken")); -//// query.setParameter("tokken", tokken); -//// result = query.getResultList(); -//// -//// Logger.trace("Found entries: " + result.size()); -//// -//// if (result.size() == 0) { -//// Logger.trace("No entries found."); -//// return null; -//// } -//// return (UserDatabase) result.get(0); -//// } -//// -//// public static List<UserDatabase> getAllNewUsers() { -//// Logger.trace("Get all new Users from Database"); -//// -//// List<UserDatabase> result; -//// EntityManager session = ConfigurationDBUtils.getCurrentSession(); -//// -//// javax.persistence.Query query = session.createQuery(QUERIES.get("getAllNewUsers")); -//// result = query.getResultList(); -//// -//// Logger.trace("Found entries: " + result.size()); -//// -//// if (result.size() == 0) { -//// Logger.trace("No entries found."); -//// return null; -//// } -//// return result; -//// } -//// -//// public static List<UserDatabase> getAllOpenUsersRequests() { -//// Logger.trace("Get all new Users from Database"); -//// -//// List<UserDatabase> result; -//// EntityManager session = ConfigurationDBUtils.getCurrentSession(); -//// -//// javax.persistence.Query query = session.createQuery(QUERIES.get("getAllOpenUsersRequests")); -//// result = query.getResultList(); -//// -//// Logger.trace("Found entries: " + result.size()); -//// -//// if (result.size() == 0) { -//// Logger.trace("No entries found."); -//// return null; -//// } -//// return result; -//// } -//} diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBUtils.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBUtils.java deleted file mode 100644 index 7f996cca7..000000000 --- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBUtils.java +++ /dev/null @@ -1,233 +0,0 @@ -///******************************************************************************* -// * Copyright 2014 Federal Chancellery Austria -// * MOA-ID has been developed in a cooperation between BRZ, the Federal -// * Chancellery Austria - ICT staff unit, and Graz University of Technology. -// * -// * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by -// * the European Commission - subsequent versions of the EUPL (the "Licence"); -// * You may not use this work except in compliance with the Licence. -// * You may obtain a copy of the Licence at: -// * http://www.osor.eu/eupl/ -// * -// * Unless required by applicable law or agreed to in writing, software -// * distributed under the Licence is distributed on an "AS IS" basis, -// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// * See the Licence for the specific language governing permissions and -// * limitations under the Licence. -// * -// * This product combines work with different licenses. See the "NOTICE" text -// * file for details on the various modules and licenses. -// * The "NOTICE" text file is part of the distribution. Any derivative works -// * that you distribute must include a readable copy of the "NOTICE" text file. -// *******************************************************************************/ -//package at.gv.egovernment.moa.id.commons.db; -// -//import java.util.Properties; -// -//import javax.persistence.EntityManager; -//import javax.persistence.EntityManagerFactory; -//import javax.persistence.EntityTransaction; -//import javax.persistence.Persistence; -// -//import org.hibernate.HibernateException; -// -//import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException; -//import at.gv.egovernment.moa.logging.Logger; -// -//public final class ConfigurationDBUtils { -// -// private static EntityManagerFactory entitymanagerfactory; -// -// @SuppressWarnings("rawtypes") -// private static final ThreadLocal THREAD_LOCAL_CONFIG = new ThreadLocal(); -// private static boolean automaticSessionHandling = false; -// -// protected ConfigurationDBUtils() { } -// -// public static void initHibernate(Properties props) throws MOADatabaseException { -// -//// try { -//// -//// Logger.debug("Creating initial session factory..."); -//// -//// entitymanagerfactory = -//// Persistence.createEntityManagerFactory("at.gv.egovernment.moa.id.commons.db.dao.config", -//// props); -//// -//// Logger.debug("Initial ConfigDB session factory successfully created."); -//// -//// -//// } catch (Throwable ex) { -//// Logger.error("Initial session factory creation failed: " + ex.getMessage()); -//// throw new MOADatabaseException("Initialization of Configuration Hibernate session factory failed.",ex); -//// } -// } -// -// -//// /** -//// * Checks if a session factory is currently available. If necessary a new -//// * session factory is created. -//// * -//// * @return current (or new) session factory -//// * @throws HibernateException -//// * thrown if a hibernate error occurs -//// */ -//// public static EntityManager getCurrentSession() { -//// if (automaticSessionHandling) { -//// -//// return entitymanagerfactory.createEntityManager(); -//// } -//// -//// EntityManager session = (EntityManager) THREAD_LOCAL_CONFIG.get(); -//// -//// if (session != null && session.isOpen()) { -//// -//// //maybe a hack, but sometimes we do not know if the session is closed (session already closed but isOpen()=true) -//// try { -//// javax.persistence.Query query = session.createQuery("select userdatabase from UserDatabase userdatabase"); -//// query.getResultList(); -//// -//// } catch (Throwable e) { -//// Logger.warn("JPA Session Handling Warning!!!! - This error should not occur."); -//// session = getNewSession(); -//// } -//// -//// } else -//// session = getNewSession(); -//// -//// return session; -//// } -//// -//// @SuppressWarnings("unchecked") -//// public static EntityManager getNewSession() { -//// if (automaticSessionHandling) { -//// Logger.warn("Session is being automatically handled by hibernate. Therefore this session maybe not being newly created. Use HibernateUtil.getCurrentSession() instead."); -//// return entitymanagerfactory.createEntityManager(); -//// } -//// EntityManager session = (EntityManager) THREAD_LOCAL_CONFIG.get(); -//// if (session != null ) { -//// Logger.warn("Previous session has not been closed; closing ConfigDB session now."); -//// closeSession(); -//// } -//// Logger.debug("Opening new ConfigDB hibernate session..."); -//// try { -//// session = entitymanagerfactory.createEntityManager(); -//// THREAD_LOCAL_CONFIG.set(session); -//// } catch (HibernateException hex) { -//// Logger.error(hex.getMessage()); -//// } -//// return session; -//// } -// -// /** -// * Closes the current session. -// * -// * @throws HibernateException -// * thrown if session is already closed or a hibernate error -// * occurs. -// * -// * @deprecated -// */ -//@SuppressWarnings("unchecked") -//public static void closeSession() { -// -//} -// -//// /** -//// * Closes the current session. -//// * -//// * @throws HibernateException -//// * thrown if session is already closed or a hibernate error -//// * occurs. -//// */ -//// @SuppressWarnings("unchecked") -//// public static void closeSession() { -//// if (automaticSessionHandling) { -//// Logger.warn("Session is being automatically handled by hibernate. Therefore the current session cannot be closed on demand."); -//// return; -//// } -//// Logger.debug("Closing current ConfigDB hibernate session..."); -//// EntityManager session = (EntityManager) THREAD_LOCAL_CONFIG.get(); -//// THREAD_LOCAL_CONFIG.set(null); -//// if (session != null) { -//// try { -//// session.close(); -//// -//// } catch (HibernateException hex) { -//// Logger.error(hex.getMessage()); -//// } -//// } -//// } -//// -//// public static boolean save(Object dbo) throws MOADatabaseException { -//// EntityTransaction tx = null; -//// -//// try { -//// EntityManager session = ConfigurationDBUtils.getCurrentSession(); -//// tx = session.getTransaction(); -//// -//// synchronized (session) { -//// tx.begin(); -//// session.merge(dbo); -//// tx.commit(); -//// -//// session.clear(); -//// } -//// return true; -//// -//// } catch(HibernateException e) { -//// Logger.warn("Error during Config database saveOrUpdate. Rollback.", e); -//// tx.rollback(); -//// throw new MOADatabaseException(e); -//// } -//// } -//// -//// -//// public static boolean saveOrUpdate(Object dbo) throws MOADatabaseException { -//// EntityTransaction tx = null; -//// -//// try { -//// EntityManager session = ConfigurationDBUtils.getCurrentSession(); -//// tx = session.getTransaction(); -//// -//// synchronized (session) { -//// tx.begin(); -//// -//// session.merge(dbo); -//// session.flush(); -//// -//// tx.commit(); -//// -//// //session.clear(); -//// } -//// return true; -//// -//// } catch(HibernateException e) { -//// Logger.warn("Error during Config database saveOrUpdate. Rollback.", e); -//// tx.rollback(); -//// throw new MOADatabaseException(e); -//// } -//// } -//// -//// public static boolean delete(Object dbo) { -//// EntityTransaction tx = null; -//// try { -//// EntityManager session = ConfigurationDBUtils.getCurrentSession(); -//// tx = session.getTransaction(); -//// -//// synchronized (session) { -//// tx.begin(); -//// session.remove(session.contains(dbo) ? dbo : session.merge(dbo)); -//// tx.commit(); -//// } -//// -//// return true; -//// -//// } catch(HibernateException e) { -//// Logger.warn("Error during Config database delete. Rollback.", e); -//// tx.rollback(); -//// return false; -//// } -//// } -// -//} diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/MOASessionDBUtils.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/MOASessionDBUtils.java index 49e0634cb..ecb13ef34 100644 --- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/MOASessionDBUtils.java +++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/MOASessionDBUtils.java @@ -32,7 +32,6 @@ import org.hibernate.Transaction; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.cfg.Configuration; import org.hibernate.service.ServiceRegistry; -import org.hibernate.service.ServiceRegistryBuilder; import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException; import at.gv.egovernment.moa.logging.Logger; 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 c049eebc4..28c705c71 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 @@ -12,8 +12,6 @@ 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.db.dao.config.UserDatabase; import at.gv.egovernment.moa.id.commons.utils.KeyValueUtils; import at.gv.egovernment.moa.logging.Logger; diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/NewConfigurationDBWrite.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/NewConfigurationDBWrite.java deleted file mode 100644 index ccc7f33f1..000000000 --- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/NewConfigurationDBWrite.java +++ /dev/null @@ -1,52 +0,0 @@ -//package at.gv.egovernment.moa.id.commons.db; -// -//import java.util.Date; -//import java.util.List; -// -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.stereotype.Component; -// -//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.AuthComponentGeneral; -//import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.ChainingModes; -//import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.DefaultBKUs; -//import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.GenericConfiguration; -//import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.OnlineApplication; -//import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.SLRequestTemplates; -//import at.gv.egovernment.moa.id.commons.db.dao.config.UserDatabase; -//import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException; -// -///** -// * This class is used for writing to the key-value database. -// */ -//@Component -//public class NewConfigurationDBWrite { -// -// private static MOAIDConfiguration conf; -// -// @Autowired(required = true) -// public void setConfiguration(MOAIDConfiguration conf) { -// // https://jira.spring.io/browse/SPR-3845 -// NewConfigurationDBWrite.conf = conf; -// } -// -// -// -// /** -// * @param user -// */ -// public void saveOrUpdate(UserDatabase user) throws MOADatabaseException{ -// // TODO Auto-generated method stub -// -// } -// -// /** -// * @param dbuser -// */ -// public void delete(UserDatabase dbuser) { -// // TODO Auto-generated method stub -// -// } -// -//} diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/StatisticLogDBUtils.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/StatisticLogDBUtils.java index eac47f93f..7e031cc76 100644 --- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/StatisticLogDBUtils.java +++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/StatisticLogDBUtils.java @@ -32,7 +32,6 @@ import org.hibernate.Transaction; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.cfg.Configuration; import org.hibernate.service.ServiceRegistry; -import org.hibernate.service.ServiceRegistryBuilder; import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException; import at.gv.egovernment.moa.logging.Logger; diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/CPEPS.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/CPEPS.java index 11eca81f5..6dacc2ec4 100644 --- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/CPEPS.java +++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/CPEPS.java @@ -11,20 +11,10 @@ package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated; import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.persistence.Basic; + import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; import javax.persistence.JoinTable; import javax.persistence.ManyToMany; -import javax.persistence.OneToMany; -import javax.persistence.Table; import javax.persistence.Transient; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -35,8 +25,7 @@ import javax.xml.bind.annotation.XmlSchemaType; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import com.sun.tools.xjc.runtime.ZeroOneBooleanAdapter; -import org.jvnet.hyperjaxb3.item.ItemUtils; + import org.jvnet.jaxb2_commons.lang.Equals; import org.jvnet.jaxb2_commons.lang.EqualsStrategy; import org.jvnet.jaxb2_commons.lang.HashCode; @@ -46,6 +35,8 @@ import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy; import org.jvnet.jaxb2_commons.locator.ObjectLocator; import org.jvnet.jaxb2_commons.locator.util.LocatorUtils; +import com.sun.tools.xjc.runtime.ZeroOneBooleanAdapter; + /** * <p>Java class for anonymous complex type. @@ -99,7 +90,7 @@ public class CPEPS protected Boolean supportsXMLSignature; @XmlAttribute(name = "Hjid") protected Long hjid; - protected transient List<CPEPSAttributeValueItem> attributeValueItems; + // protected transient List<CPEPSAttributeValueItem> attributeValueItems; /** * Gets the value of the attributeValue property. @@ -293,31 +284,31 @@ public class CPEPS this.hjid = value; } - @OneToMany(targetEntity = CPEPSAttributeValueItem.class, cascade = { - CascadeType.ALL - }) - - public List<CPEPSAttributeValueItem> getAttributeValueItems() { - if (this.attributeValueItems == null) { - this.attributeValueItems = new ArrayList<CPEPSAttributeValueItem>(); - } - if (ItemUtils.shouldBeWrapped(this.attributeValue)) { - this.attributeValue = ItemUtils.wrap(this.attributeValue, this.attributeValueItems, CPEPSAttributeValueItem.class); - } - return this.attributeValueItems; - } - - public void setAttributeValueItems(List<CPEPSAttributeValueItem> value) { - this.attributeValue = null; - this.attributeValueItems = null; - this.attributeValueItems = value; - if (this.attributeValueItems == null) { - this.attributeValueItems = new ArrayList<CPEPSAttributeValueItem>(); - } - if (ItemUtils.shouldBeWrapped(this.attributeValue)) { - this.attributeValue = ItemUtils.wrap(this.attributeValue, this.attributeValueItems, CPEPSAttributeValueItem.class); - } - } +// @OneToMany(targetEntity = CPEPSAttributeValueItem.class, cascade = { +// CascadeType.ALL +// }) +// +// public List<CPEPSAttributeValueItem> getAttributeValueItems() { +// if (this.attributeValueItems == null) { +// this.attributeValueItems = new ArrayList<CPEPSAttributeValueItem>(); +// } +// if (ItemUtils.shouldBeWrapped(this.attributeValue)) { +// this.attributeValue = ItemUtils.wrap(this.attributeValue, this.attributeValueItems, CPEPSAttributeValueItem.class); +// } +// return this.attributeValueItems; +// } +// +// public void setAttributeValueItems(List<CPEPSAttributeValueItem> value) { +// this.attributeValue = null; +// this.attributeValueItems = null; +// this.attributeValueItems = value; +// if (this.attributeValueItems == null) { +// this.attributeValueItems = new ArrayList<CPEPSAttributeValueItem>(); +// } +// if (ItemUtils.shouldBeWrapped(this.attributeValue)) { +// this.attributeValue = ItemUtils.wrap(this.attributeValue, this.attributeValueItems, CPEPSAttributeValueItem.class); +// } +// } public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { if (!(object instanceof CPEPS)) { diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/CPEPSAttributeValueItem.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/CPEPSAttributeValueItem.java deleted file mode 100644 index 0af8c64b4..000000000 --- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/CPEPSAttributeValueItem.java +++ /dev/null @@ -1,93 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.07.20 at 12:19:30 PM CEST -// - - -package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated; - -import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import org.jvnet.hyperjaxb3.item.Item; - -@XmlAccessorType(XmlAccessType.FIELD) - - - -public class CPEPSAttributeValueItem - implements Serializable, Item<String> -{ - - @XmlElement(name = "AttributeValue", namespace = "http://www.buergerkarte.at/namespaces/moaconfig#") - protected String item; - @XmlAttribute(name = "Hjid") - protected Long hjid; - - /** - * Gets the value of the item property. - * - * @return - * possible object is - * {@link String } - * - */ - - - public String getItem() { - return item; - } - - /** - * Sets the value of the item property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setItem(String value) { - this.item = value; - } - - /** - * Gets the value of the hjid property. - * - * @return - * possible object is - * {@link Long } - * - */ - - - - public Long getHjid() { - return hjid; - } - - /** - * Sets the value of the hjid property. - * - * @param value - * allowed object is - * {@link Long } - * - */ - public void setHjid(Long value) { - this.hjid = value; - } - -} diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/Contact.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/Contact.java index 38835db05..25a9c03ea 100644 --- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/Contact.java +++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/Contact.java @@ -11,18 +11,7 @@ package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated; import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.Table; + import javax.persistence.Transient; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -32,7 +21,7 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import org.jvnet.hyperjaxb3.item.ItemUtils; + import org.jvnet.jaxb2_commons.lang.Equals; import org.jvnet.jaxb2_commons.lang.EqualsStrategy; import org.jvnet.jaxb2_commons.lang.HashCode; @@ -41,6 +30,7 @@ import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy; import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy; import org.jvnet.jaxb2_commons.locator.ObjectLocator; import org.jvnet.jaxb2_commons.locator.util.LocatorUtils; +//import org.jvnet.hyperjaxb3.item.ItemUtils; /** @@ -109,8 +99,8 @@ public class Contact protected List<String> phone; @XmlAttribute(name = "Hjid") protected Long hjid; - protected transient List<ContactMailItem> mailItems; - protected transient List<ContactPhoneItem> phoneItems; +// protected transient List<ContactMailItem> mailItems; +// protected transient List<ContactPhoneItem> phoneItems; /** * Gets the value of the surName property. @@ -319,57 +309,57 @@ public class Contact this.hjid = value; } - @OneToMany(targetEntity = ContactMailItem.class, cascade = { - CascadeType.ALL - }) - - public List<ContactMailItem> getMailItems() { - if (this.mailItems == null) { - this.mailItems = new ArrayList<ContactMailItem>(); - } - if (ItemUtils.shouldBeWrapped(this.mail)) { - this.mail = ItemUtils.wrap(this.mail, this.mailItems, ContactMailItem.class); - } - return this.mailItems; - } - - public void setMailItems(List<ContactMailItem> value) { - this.mail = null; - this.mailItems = null; - this.mailItems = value; - if (this.mailItems == null) { - this.mailItems = new ArrayList<ContactMailItem>(); - } - if (ItemUtils.shouldBeWrapped(this.mail)) { - this.mail = ItemUtils.wrap(this.mail, this.mailItems, ContactMailItem.class); - } - } - - @OneToMany(targetEntity = ContactPhoneItem.class, cascade = { - CascadeType.ALL - }) - - public List<ContactPhoneItem> getPhoneItems() { - if (this.phoneItems == null) { - this.phoneItems = new ArrayList<ContactPhoneItem>(); - } - if (ItemUtils.shouldBeWrapped(this.phone)) { - this.phone = ItemUtils.wrap(this.phone, this.phoneItems, ContactPhoneItem.class); - } - return this.phoneItems; - } - - public void setPhoneItems(List<ContactPhoneItem> value) { - this.phone = null; - this.phoneItems = null; - this.phoneItems = value; - if (this.phoneItems == null) { - this.phoneItems = new ArrayList<ContactPhoneItem>(); - } - if (ItemUtils.shouldBeWrapped(this.phone)) { - this.phone = ItemUtils.wrap(this.phone, this.phoneItems, ContactPhoneItem.class); - } - } +// @OneToMany(targetEntity = ContactMailItem.class, cascade = { +// CascadeType.ALL +// }) +// +// public List<ContactMailItem> getMailItems() { +// if (this.mailItems == null) { +// this.mailItems = new ArrayList<ContactMailItem>(); +// } +// if (ItemUtils.shouldBeWrapped(this.mail)) { +// this.mail = ItemUtils.wrap(this.mail, this.mailItems, ContactMailItem.class); +// } +// return this.mailItems; +// } +// +// public void setMailItems(List<ContactMailItem> value) { +// this.mail = null; +// this.mailItems = null; +// this.mailItems = value; +// if (this.mailItems == null) { +// this.mailItems = new ArrayList<ContactMailItem>(); +// } +// if (ItemUtils.shouldBeWrapped(this.mail)) { +// this.mail = ItemUtils.wrap(this.mail, this.mailItems, ContactMailItem.class); +// } +// } +// +// @OneToMany(targetEntity = ContactPhoneItem.class, cascade = { +// CascadeType.ALL +// }) +// +// public List<ContactPhoneItem> getPhoneItems() { +// if (this.phoneItems == null) { +// this.phoneItems = new ArrayList<ContactPhoneItem>(); +// } +// if (ItemUtils.shouldBeWrapped(this.phone)) { +// this.phone = ItemUtils.wrap(this.phone, this.phoneItems, ContactPhoneItem.class); +// } +// return this.phoneItems; +// } +// +// public void setPhoneItems(List<ContactPhoneItem> value) { +// this.phone = null; +// this.phoneItems = null; +// this.phoneItems = value; +// if (this.phoneItems == null) { +// this.phoneItems = new ArrayList<ContactPhoneItem>(); +// } +// if (ItemUtils.shouldBeWrapped(this.phone)) { +// this.phone = ItemUtils.wrap(this.phone, this.phoneItems, ContactPhoneItem.class); +// } +// } public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { if (!(object instanceof Contact)) { diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/ContactMailItem.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/ContactMailItem.java deleted file mode 100644 index d7c656bd7..000000000 --- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/ContactMailItem.java +++ /dev/null @@ -1,93 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.07.20 at 12:19:30 PM CEST -// - - -package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated; - -import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import org.jvnet.hyperjaxb3.item.Item; - -@XmlAccessorType(XmlAccessType.FIELD) - - - -public class ContactMailItem - implements Serializable, Item<String> -{ - - @XmlElement(name = "Mail", namespace = "http://www.buergerkarte.at/namespaces/moaconfig#") - protected String item; - @XmlAttribute(name = "Hjid") - protected Long hjid; - - /** - * Gets the value of the item property. - * - * @return - * possible object is - * {@link String } - * - */ - - - public String getItem() { - return item; - } - - /** - * Sets the value of the item property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setItem(String value) { - this.item = value; - } - - /** - * Gets the value of the hjid property. - * - * @return - * possible object is - * {@link Long } - * - */ - - - - public Long getHjid() { - return hjid; - } - - /** - * Sets the value of the hjid property. - * - * @param value - * allowed object is - * {@link Long } - * - */ - public void setHjid(Long value) { - this.hjid = value; - } - -} diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/ContactPhoneItem.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/ContactPhoneItem.java deleted file mode 100644 index ae9c57ea0..000000000 --- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/ContactPhoneItem.java +++ /dev/null @@ -1,93 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.07.20 at 12:19:30 PM CEST -// - - -package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated; - -import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import org.jvnet.hyperjaxb3.item.Item; - -@XmlAccessorType(XmlAccessType.FIELD) - - - -public class ContactPhoneItem - implements Serializable, Item<String> -{ - - @XmlElement(name = "Phone", namespace = "http://www.buergerkarte.at/namespaces/moaconfig#") - protected String item; - @XmlAttribute(name = "Hjid") - protected Long hjid; - - /** - * Gets the value of the item property. - * - * @return - * possible object is - * {@link String } - * - */ - - - public String getItem() { - return item; - } - - /** - * Sets the value of the item property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setItem(String value) { - this.item = value; - } - - /** - * Gets the value of the hjid property. - * - * @return - * possible object is - * {@link Long } - * - */ - - - - public Long getHjid() { - return hjid; - } - - /** - * Sets the value of the hjid property. - * - * @param value - * allowed object is - * {@link Long } - * - */ - public void setHjid(Long value) { - this.hjid = value; - } - -} diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/GeneralConfiguration.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/GeneralConfiguration.java index 883245da8..d3e454e51 100644 --- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/GeneralConfiguration.java +++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/GeneralConfiguration.java @@ -27,6 +27,7 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlTransient; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.sun.tools.xjc.runtime.ZeroOneBooleanAdapter; @@ -107,6 +108,9 @@ public class GeneralConfiguration @XmlAttribute(name = "Hjid") protected Long hjid; + @XmlTransient + protected boolean virtualPublicURLPrefixEnabled = false; + /** * Gets the value of the timeOuts property. * @@ -322,7 +326,24 @@ public class GeneralConfiguration return true; } - public boolean equals(Object object) { + + + /** + * @return the virtualPublicURLPrefixEnabled + */ + public boolean isVirtualPublicURLPrefixEnabled() { + return virtualPublicURLPrefixEnabled; + } + + /** + * @param virtualPublicURLPrefixEnabled the virtualPublicURLPrefixEnabled to set + */ + public void setVirtualPublicURLPrefixEnabled( + boolean virtualPublicURLPrefixEnabled) { + this.virtualPublicURLPrefixEnabled = virtualPublicURLPrefixEnabled; + } + + public boolean equals(Object object) { final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE; return equals(null, null, object, strategy); } diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/IdentityLinkSigners.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/IdentityLinkSigners.java index c48d4522d..90f46efe1 100644 --- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/IdentityLinkSigners.java +++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/IdentityLinkSigners.java @@ -11,24 +11,14 @@ package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated; import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.Table; + import javax.persistence.Transient; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; -import org.jvnet.hyperjaxb3.item.ItemUtils; + import org.jvnet.jaxb2_commons.lang.Equals; import org.jvnet.jaxb2_commons.lang.EqualsStrategy; import org.jvnet.jaxb2_commons.lang.HashCode; @@ -73,7 +63,7 @@ public class IdentityLinkSigners protected List<String> x509SubjectName; @XmlAttribute(name = "Hjid") protected Long hjid; - protected transient List<IdentityLinkSignersX509SubjectNameItem> x509SubjectNameItems; +// protected transient List<IdentityLinkSignersX509SubjectNameItem> x509SubjectNameItems; /** * Gets the value of the x509SubjectName property. @@ -140,31 +130,31 @@ public class IdentityLinkSigners this.hjid = value; } - @OneToMany(targetEntity = IdentityLinkSignersX509SubjectNameItem.class, cascade = { - CascadeType.ALL - }) - - public List<IdentityLinkSignersX509SubjectNameItem> getX509SubjectNameItems() { - if (this.x509SubjectNameItems == null) { - this.x509SubjectNameItems = new ArrayList<IdentityLinkSignersX509SubjectNameItem>(); - } - if (ItemUtils.shouldBeWrapped(this.x509SubjectName)) { - this.x509SubjectName = ItemUtils.wrap(this.x509SubjectName, this.x509SubjectNameItems, IdentityLinkSignersX509SubjectNameItem.class); - } - return this.x509SubjectNameItems; - } - - public void setX509SubjectNameItems(List<IdentityLinkSignersX509SubjectNameItem> value) { - this.x509SubjectName = null; - this.x509SubjectNameItems = null; - this.x509SubjectNameItems = value; - if (this.x509SubjectNameItems == null) { - this.x509SubjectNameItems = new ArrayList<IdentityLinkSignersX509SubjectNameItem>(); - } - if (ItemUtils.shouldBeWrapped(this.x509SubjectName)) { - this.x509SubjectName = ItemUtils.wrap(this.x509SubjectName, this.x509SubjectNameItems, IdentityLinkSignersX509SubjectNameItem.class); - } - } +// @OneToMany(targetEntity = IdentityLinkSignersX509SubjectNameItem.class, cascade = { +// CascadeType.ALL +// }) +// +// public List<IdentityLinkSignersX509SubjectNameItem> getX509SubjectNameItems() { +// if (this.x509SubjectNameItems == null) { +// this.x509SubjectNameItems = new ArrayList<IdentityLinkSignersX509SubjectNameItem>(); +// } +// if (ItemUtils.shouldBeWrapped(this.x509SubjectName)) { +// this.x509SubjectName = ItemUtils.wrap(this.x509SubjectName, this.x509SubjectNameItems, IdentityLinkSignersX509SubjectNameItem.class); +// } +// return this.x509SubjectNameItems; +// } +// +// public void setX509SubjectNameItems(List<IdentityLinkSignersX509SubjectNameItem> value) { +// this.x509SubjectName = null; +// this.x509SubjectNameItems = null; +// this.x509SubjectNameItems = value; +// if (this.x509SubjectNameItems == null) { +// this.x509SubjectNameItems = new ArrayList<IdentityLinkSignersX509SubjectNameItem>(); +// } +// if (ItemUtils.shouldBeWrapped(this.x509SubjectName)) { +// this.x509SubjectName = ItemUtils.wrap(this.x509SubjectName, this.x509SubjectNameItems, IdentityLinkSignersX509SubjectNameItem.class); +// } +// } public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { if (!(object instanceof IdentityLinkSigners)) { diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/IdentityLinkSignersX509SubjectNameItem.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/IdentityLinkSignersX509SubjectNameItem.java deleted file mode 100644 index c0679df1c..000000000 --- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/IdentityLinkSignersX509SubjectNameItem.java +++ /dev/null @@ -1,93 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.07.20 at 12:19:30 PM CEST -// - - -package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated; - -import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import org.jvnet.hyperjaxb3.item.Item; - -@XmlAccessorType(XmlAccessType.FIELD) - - - -public class IdentityLinkSignersX509SubjectNameItem - implements Serializable, Item<String> -{ - - @XmlElement(name = "X509SubjectName", namespace = "http://www.buergerkarte.at/namespaces/moaconfig#") - protected String item; - @XmlAttribute(name = "Hjid") - protected Long hjid; - - /** - * Gets the value of the item property. - * - * @return - * possible object is - * {@link String } - * - */ - - - public String getItem() { - return item; - } - - /** - * Sets the value of the item property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setItem(String value) { - this.item = value; - } - - /** - * Gets the value of the hjid property. - * - * @return - * possible object is - * {@link Long } - * - */ - - - - public Long getHjid() { - return hjid; - } - - /** - * Sets the value of the hjid property. - * - * @param value - * allowed object is - * {@link Long } - * - */ - public void setHjid(Long value) { - this.hjid = value; - } - -} diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/LegacyAllowed.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/LegacyAllowed.java index 12a48c88e..1a45642d1 100644 --- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/LegacyAllowed.java +++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/LegacyAllowed.java @@ -11,24 +11,14 @@ package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated; import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.Table; + import javax.persistence.Transient; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; -import org.jvnet.hyperjaxb3.item.ItemUtils; + import org.jvnet.jaxb2_commons.lang.Equals; import org.jvnet.jaxb2_commons.lang.EqualsStrategy; import org.jvnet.jaxb2_commons.lang.HashCode; @@ -73,7 +63,7 @@ public class LegacyAllowed protected List<String> protocolName; @XmlAttribute(name = "Hjid") protected Long hjid; - protected transient List<LegacyAllowedProtocolNameItem> protocolNameItems; +// protected transient List<LegacyAllowedProtocolNameItem> protocolNameItems; /** * Gets the value of the protocolName property. @@ -140,31 +130,31 @@ public class LegacyAllowed this.hjid = value; } - @OneToMany(targetEntity = LegacyAllowedProtocolNameItem.class, cascade = { - CascadeType.ALL - }) - - public List<LegacyAllowedProtocolNameItem> getProtocolNameItems() { - if (this.protocolNameItems == null) { - this.protocolNameItems = new ArrayList<LegacyAllowedProtocolNameItem>(); - } - if (ItemUtils.shouldBeWrapped(this.protocolName)) { - this.protocolName = ItemUtils.wrap(this.protocolName, this.protocolNameItems, LegacyAllowedProtocolNameItem.class); - } - return this.protocolNameItems; - } - - public void setProtocolNameItems(List<LegacyAllowedProtocolNameItem> value) { - this.protocolName = null; - this.protocolNameItems = null; - this.protocolNameItems = value; - if (this.protocolNameItems == null) { - this.protocolNameItems = new ArrayList<LegacyAllowedProtocolNameItem>(); - } - if (ItemUtils.shouldBeWrapped(this.protocolName)) { - this.protocolName = ItemUtils.wrap(this.protocolName, this.protocolNameItems, LegacyAllowedProtocolNameItem.class); - } - } +// @OneToMany(targetEntity = LegacyAllowedProtocolNameItem.class, cascade = { +// CascadeType.ALL +// }) +// +// public List<LegacyAllowedProtocolNameItem> getProtocolNameItems() { +// if (this.protocolNameItems == null) { +// this.protocolNameItems = new ArrayList<LegacyAllowedProtocolNameItem>(); +// } +// if (ItemUtils.shouldBeWrapped(this.protocolName)) { +// this.protocolName = ItemUtils.wrap(this.protocolName, this.protocolNameItems, LegacyAllowedProtocolNameItem.class); +// } +// return this.protocolNameItems; +// } +// +// public void setProtocolNameItems(List<LegacyAllowedProtocolNameItem> value) { +// this.protocolName = null; +// this.protocolNameItems = null; +// this.protocolNameItems = value; +// if (this.protocolNameItems == null) { +// this.protocolNameItems = new ArrayList<LegacyAllowedProtocolNameItem>(); +// } +// if (ItemUtils.shouldBeWrapped(this.protocolName)) { +// this.protocolName = ItemUtils.wrap(this.protocolName, this.protocolNameItems, LegacyAllowedProtocolNameItem.class); +// } +// } public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { if (!(object instanceof LegacyAllowed)) { diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/LegacyAllowedProtocolNameItem.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/LegacyAllowedProtocolNameItem.java deleted file mode 100644 index 91aae9742..000000000 --- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/LegacyAllowedProtocolNameItem.java +++ /dev/null @@ -1,93 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.07.20 at 12:19:30 PM CEST -// - - -package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated; - -import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import org.jvnet.hyperjaxb3.item.Item; - -@XmlAccessorType(XmlAccessType.FIELD) - - - -public class LegacyAllowedProtocolNameItem - implements Serializable, Item<String> -{ - - @XmlElement(name = "ProtocolName", namespace = "http://www.buergerkarte.at/namespaces/moaconfig#") - protected String item; - @XmlAttribute(name = "Hjid") - protected Long hjid; - - /** - * Gets the value of the item property. - * - * @return - * possible object is - * {@link String } - * - */ - - - public String getItem() { - return item; - } - - /** - * Sets the value of the item property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setItem(String value) { - this.item = value; - } - - /** - * Gets the value of the hjid property. - * - * @return - * possible object is - * {@link Long } - * - */ - - - - public Long getHjid() { - return hjid; - } - - /** - * Sets the value of the hjid property. - * - * @param value - * allowed object is - * {@link Long } - * - */ - public void setHjid(Long value) { - this.hjid = value; - } - -} diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/MOAIDConfiguration.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/MOAIDConfiguration.java index 64e4be82b..810139c84 100644 --- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/MOAIDConfiguration.java +++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/MOAIDConfiguration.java @@ -12,19 +12,10 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.Date; import java.util.List; -import javax.persistence.Basic; + import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.OneToMany; -import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; import javax.persistence.Transient; @@ -37,8 +28,7 @@ import javax.xml.bind.annotation.XmlSchemaType; import javax.xml.bind.annotation.XmlTransient; import javax.xml.bind.annotation.XmlType; import javax.xml.datatype.XMLGregorianCalendar; -import org.jvnet.hyperjaxb3.xml.bind.annotation.adapters.XMLGregorianCalendarAsDateTime; -import org.jvnet.hyperjaxb3.xml.bind.annotation.adapters.XmlAdapterUtils; + import org.jvnet.jaxb2_commons.lang.Equals; import org.jvnet.jaxb2_commons.lang.EqualsStrategy; import org.jvnet.jaxb2_commons.lang.HashCode; @@ -511,22 +501,24 @@ public class MOAIDConfiguration @Temporal(TemporalType.TIMESTAMP) public Date getTimestampItem() { - return XmlAdapterUtils.unmarshall(XMLGregorianCalendarAsDateTime.class, this.getTimestamp()); + //return XmlAdapterUtils.unmarshall(XMLGregorianCalendarAsDateTime.class, this.getTimestamp()); + return new Date(); } public void setTimestampItem(Date target) { - setTimestamp(XmlAdapterUtils.marshall(XMLGregorianCalendarAsDateTime.class, target)); + //setTimestamp(XmlAdapterUtils.marshall(XMLGregorianCalendarAsDateTime.class, target)); } @Temporal(TemporalType.TIMESTAMP) public Date getPvp2RefreshItem() { - return XmlAdapterUtils.unmarshall(XMLGregorianCalendarAsDateTime.class, this.getPvp2Refresh()); + //return XmlAdapterUtils.unmarshall(XMLGregorianCalendarAsDateTime.class, this.getPvp2Refresh()); + return new Date(); } public void setPvp2RefreshItem(Date target) { - setPvp2Refresh(XmlAdapterUtils.marshall(XMLGregorianCalendarAsDateTime.class, target)); + //setPvp2Refresh(XmlAdapterUtils.marshall(XMLGregorianCalendarAsDateTime.class, target)); } public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/Mandates.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/Mandates.java index 247be940c..a87a6d1f6 100644 --- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/Mandates.java +++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/Mandates.java @@ -11,25 +11,14 @@ package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated; import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.Table; + import javax.persistence.Transient; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; -import org.jvnet.hyperjaxb3.item.ItemUtils; + import org.jvnet.jaxb2_commons.lang.Equals; import org.jvnet.jaxb2_commons.lang.EqualsStrategy; import org.jvnet.jaxb2_commons.lang.HashCode; @@ -38,6 +27,7 @@ import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy; import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy; import org.jvnet.jaxb2_commons.locator.ObjectLocator; import org.jvnet.jaxb2_commons.locator.util.LocatorUtils; +//import org.jvnet.hyperjaxb3.item.ItemUtils; /** @@ -78,7 +68,7 @@ public class Mandates protected List<String> profileName; @XmlAttribute(name = "Hjid") protected Long hjid; - protected transient List<MandatesProfileNameItem> profileNameItems; +// protected transient List<MandatesProfileNameItem> profileNameItems; /** * Gets the value of the profiles property. @@ -171,31 +161,31 @@ public class Mandates this.hjid = value; } - @OneToMany(targetEntity = MandatesProfileNameItem.class, cascade = { - CascadeType.ALL - }) - - public List<MandatesProfileNameItem> getProfileNameItems() { - if (this.profileNameItems == null) { - this.profileNameItems = new ArrayList<MandatesProfileNameItem>(); - } - if (ItemUtils.shouldBeWrapped(this.profileName)) { - this.profileName = ItemUtils.wrap(this.profileName, this.profileNameItems, MandatesProfileNameItem.class); - } - return this.profileNameItems; - } - - public void setProfileNameItems(List<MandatesProfileNameItem> value) { - this.profileName = null; - this.profileNameItems = null; - this.profileNameItems = value; - if (this.profileNameItems == null) { - this.profileNameItems = new ArrayList<MandatesProfileNameItem>(); - } - if (ItemUtils.shouldBeWrapped(this.profileName)) { - this.profileName = ItemUtils.wrap(this.profileName, this.profileNameItems, MandatesProfileNameItem.class); - } - } +// @OneToMany(targetEntity = MandatesProfileNameItem.class, cascade = { +// CascadeType.ALL +// }) +// +// public List<MandatesProfileNameItem> getProfileNameItems() { +// if (this.profileNameItems == null) { +// this.profileNameItems = new ArrayList<MandatesProfileNameItem>(); +// } +// if (ItemUtils.shouldBeWrapped(this.profileName)) { +// this.profileName = ItemUtils.wrap(this.profileName, this.profileNameItems, MandatesProfileNameItem.class); +// } +// return this.profileNameItems; +// } +// +// public void setProfileNameItems(List<MandatesProfileNameItem> value) { +// this.profileName = null; +// this.profileNameItems = null; +// this.profileNameItems = value; +// if (this.profileNameItems == null) { +// this.profileNameItems = new ArrayList<MandatesProfileNameItem>(); +// } +// if (ItemUtils.shouldBeWrapped(this.profileName)) { +// this.profileName = ItemUtils.wrap(this.profileName, this.profileNameItems, MandatesProfileNameItem.class); +// } +// } public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { if (!(object instanceof Mandates)) { diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/MandatesProfileNameItem.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/MandatesProfileNameItem.java deleted file mode 100644 index 0ef09c0dc..000000000 --- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/MandatesProfileNameItem.java +++ /dev/null @@ -1,93 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.07.20 at 12:19:30 PM CEST -// - - -package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated; - -import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import org.jvnet.hyperjaxb3.item.Item; - -@XmlAccessorType(XmlAccessType.FIELD) - - - -public class MandatesProfileNameItem - implements Serializable, Item<String> -{ - - @XmlElement(name = "ProfileName", namespace = "http://www.buergerkarte.at/namespaces/moaconfig#") - protected String item; - @XmlAttribute(name = "Hjid") - protected Long hjid; - - /** - * Gets the value of the item property. - * - * @return - * possible object is - * {@link String } - * - */ - - - public String getItem() { - return item; - } - - /** - * Sets the value of the item property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setItem(String value) { - this.item = value; - } - - /** - * Gets the value of the hjid property. - * - * @return - * possible object is - * {@link Long } - * - */ - - - - public Long getHjid() { - return hjid; - } - - /** - * Sets the value of the hjid property. - * - * @param value - * allowed object is - * {@link Long } - * - */ - public void setHjid(Long value) { - this.hjid = value; - } - -} diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/OAPVP2.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/OAPVP2.java index d5cee7b83..ea34d7a06 100644 --- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/OAPVP2.java +++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/OAPVP2.java @@ -10,16 +10,8 @@ package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated; import java.io.Serializable; import java.util.Date; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + import javax.persistence.Lob; -import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; import javax.persistence.Transient; @@ -31,8 +23,7 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlSchemaType; import javax.xml.bind.annotation.XmlType; import javax.xml.datatype.XMLGregorianCalendar; -import org.jvnet.hyperjaxb3.xml.bind.annotation.adapters.XMLGregorianCalendarAsDateTime; -import org.jvnet.hyperjaxb3.xml.bind.annotation.adapters.XmlAdapterUtils; + import org.jvnet.jaxb2_commons.lang.Equals; import org.jvnet.jaxb2_commons.lang.EqualsStrategy; import org.jvnet.jaxb2_commons.lang.HashCode; @@ -196,11 +187,12 @@ public class OAPVP2 @Temporal(TemporalType.TIMESTAMP) public Date getUpdateRequiredItem() { - return XmlAdapterUtils.unmarshall(XMLGregorianCalendarAsDateTime.class, this.getUpdateRequired()); + //return XmlAdapterUtils.unmarshall(XMLGregorianCalendarAsDateTime.class, this.getUpdateRequired()); + return new Date(); } public void setUpdateRequiredItem(Date target) { - setUpdateRequired(XmlAdapterUtils.marshall(XMLGregorianCalendarAsDateTime.class, target)); + //setUpdateRequired(XmlAdapterUtils.marshall(XMLGregorianCalendarAsDateTime.class, target)); } public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/TestCredentials.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/TestCredentials.java index 2e80cb0d5..673e7b9ce 100644 --- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/TestCredentials.java +++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/TestCredentials.java @@ -11,18 +11,7 @@ package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated; import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.Table; + import javax.persistence.Transient; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -31,8 +20,7 @@ import javax.xml.bind.annotation.XmlSchemaType; import javax.xml.bind.annotation.XmlTransient; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import com.sun.tools.xjc.runtime.ZeroOneBooleanAdapter; -import org.jvnet.hyperjaxb3.item.ItemUtils; + import org.jvnet.jaxb2_commons.lang.Equals; import org.jvnet.jaxb2_commons.lang.EqualsStrategy; import org.jvnet.jaxb2_commons.lang.HashCode; @@ -42,6 +30,8 @@ import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy; import org.jvnet.jaxb2_commons.locator.ObjectLocator; import org.jvnet.jaxb2_commons.locator.util.LocatorUtils; +import com.sun.tools.xjc.runtime.ZeroOneBooleanAdapter; + /** * <p>Java class for anonymous complex type. @@ -81,7 +71,7 @@ public class TestCredentials protected Boolean enableTestCredentials; @XmlAttribute(name = "Hjid") protected Long hjid; - protected transient List<TestCredentialsCredentialOIDItem> credentialOIDItems; + //protected transient List<TestCredentialsCredentialOIDItem> credentialOIDItems; @XmlTransient protected boolean useTestIDLTrustStore; @@ -185,31 +175,31 @@ public class TestCredentials this.hjid = value; } - @OneToMany(targetEntity = TestCredentialsCredentialOIDItem.class, cascade = { - CascadeType.ALL - }) - - public List<TestCredentialsCredentialOIDItem> getCredentialOIDItems() { - if (this.credentialOIDItems == null) { - this.credentialOIDItems = new ArrayList<TestCredentialsCredentialOIDItem>(); - } - if (ItemUtils.shouldBeWrapped(this.credentialOID)) { - this.credentialOID = ItemUtils.wrap(this.credentialOID, this.credentialOIDItems, TestCredentialsCredentialOIDItem.class); - } - return this.credentialOIDItems; - } - - public void setCredentialOIDItems(List<TestCredentialsCredentialOIDItem> value) { - this.credentialOID = null; - this.credentialOIDItems = null; - this.credentialOIDItems = value; - if (this.credentialOIDItems == null) { - this.credentialOIDItems = new ArrayList<TestCredentialsCredentialOIDItem>(); - } - if (ItemUtils.shouldBeWrapped(this.credentialOID)) { - this.credentialOID = ItemUtils.wrap(this.credentialOID, this.credentialOIDItems, TestCredentialsCredentialOIDItem.class); - } - } +// @OneToMany(targetEntity = TestCredentialsCredentialOIDItem.class, cascade = { +// CascadeType.ALL +// }) +// +// public List<TestCredentialsCredentialOIDItem> getCredentialOIDItems() { +// if (this.credentialOIDItems == null) { +// this.credentialOIDItems = new ArrayList<TestCredentialsCredentialOIDItem>(); +// } +// if (ItemUtils.shouldBeWrapped(this.credentialOID)) { +// this.credentialOID = ItemUtils.wrap(this.credentialOID, this.credentialOIDItems, TestCredentialsCredentialOIDItem.class); +// } +// return this.credentialOIDItems; +// } +// +// public void setCredentialOIDItems(List<TestCredentialsCredentialOIDItem> value) { +// this.credentialOID = null; +// this.credentialOIDItems = null; +// this.credentialOIDItems = value; +// if (this.credentialOIDItems == null) { +// this.credentialOIDItems = new ArrayList<TestCredentialsCredentialOIDItem>(); +// } +// if (ItemUtils.shouldBeWrapped(this.credentialOID)) { +// this.credentialOID = ItemUtils.wrap(this.credentialOID, this.credentialOIDItems, TestCredentialsCredentialOIDItem.class); +// } +// } diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/TestCredentialsCredentialOIDItem.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/TestCredentialsCredentialOIDItem.java deleted file mode 100644 index 3e386be66..000000000 --- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/TestCredentialsCredentialOIDItem.java +++ /dev/null @@ -1,93 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.07.20 at 12:19:30 PM CEST -// - - -package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated; - -import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import org.jvnet.hyperjaxb3.item.Item; - -@XmlAccessorType(XmlAccessType.FIELD) - - - -public class TestCredentialsCredentialOIDItem - implements Serializable, Item<String> -{ - - @XmlElement(name = "credentialOID", namespace = "http://www.buergerkarte.at/namespaces/moaconfig#") - protected String item; - @XmlAttribute(name = "Hjid") - protected Long hjid; - - /** - * Gets the value of the item property. - * - * @return - * possible object is - * {@link String } - * - */ - - - public String getItem() { - return item; - } - - /** - * Sets the value of the item property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setItem(String value) { - this.item = value; - } - - /** - * Gets the value of the hjid property. - * - * @return - * possible object is - * {@link Long } - * - */ - - - - public Long getHjid() { - return hjid; - } - - /** - * Sets the value of the hjid property. - * - * @param value - * allowed object is - * {@link Long } - * - */ - public void setHjid(Long value) { - this.hjid = value; - } - -} diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/VerifyAuthBlock.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/VerifyAuthBlock.java index 155863b03..01a5c9b1b 100644 --- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/VerifyAuthBlock.java +++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/VerifyAuthBlock.java @@ -11,18 +11,7 @@ package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated; import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.Table; + import javax.persistence.Transient; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -30,7 +19,7 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlTransient; import javax.xml.bind.annotation.XmlType; -import org.jvnet.hyperjaxb3.item.ItemUtils; + import org.jvnet.jaxb2_commons.lang.Equals; import org.jvnet.jaxb2_commons.lang.EqualsStrategy; import org.jvnet.jaxb2_commons.lang.HashCode; @@ -39,6 +28,7 @@ import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy; import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy; import org.jvnet.jaxb2_commons.locator.ObjectLocator; import org.jvnet.jaxb2_commons.locator.util.LocatorUtils; +//import org.jvnet.hyperjaxb3.item.ItemUtils; /** @@ -79,7 +69,7 @@ public class VerifyAuthBlock protected List<String> verifyTransformsInfoProfileID; @XmlAttribute(name = "Hjid") protected Long hjid; - protected transient List<VerifyAuthBlockVerifyTransformsInfoProfileIDItem> verifyTransformsInfoProfileIDItems; +// protected List<VerifyAuthBlockVerifyTransformsInfoProfileIDItem> verifyTransformsInfoProfileIDItems; @XmlTransient protected String TestTrustProfileID; @@ -192,31 +182,31 @@ public class VerifyAuthBlock this.hjid = value; } - @OneToMany(targetEntity = VerifyAuthBlockVerifyTransformsInfoProfileIDItem.class, cascade = { - CascadeType.ALL - }) +// @OneToMany(targetEntity = VerifyAuthBlockVerifyTransformsInfoProfileIDItem.class, cascade = { +// CascadeType.ALL +// }) - public List<VerifyAuthBlockVerifyTransformsInfoProfileIDItem> getVerifyTransformsInfoProfileIDItems() { - if (this.verifyTransformsInfoProfileIDItems == null) { - this.verifyTransformsInfoProfileIDItems = new ArrayList<VerifyAuthBlockVerifyTransformsInfoProfileIDItem>(); - } - if (ItemUtils.shouldBeWrapped(this.verifyTransformsInfoProfileID)) { - this.verifyTransformsInfoProfileID = ItemUtils.wrap(this.verifyTransformsInfoProfileID, this.verifyTransformsInfoProfileIDItems, VerifyAuthBlockVerifyTransformsInfoProfileIDItem.class); - } - return this.verifyTransformsInfoProfileIDItems; - } - - public void setVerifyTransformsInfoProfileIDItems(List<VerifyAuthBlockVerifyTransformsInfoProfileIDItem> value) { - this.verifyTransformsInfoProfileID = null; - this.verifyTransformsInfoProfileIDItems = null; - this.verifyTransformsInfoProfileIDItems = value; - if (this.verifyTransformsInfoProfileIDItems == null) { - this.verifyTransformsInfoProfileIDItems = new ArrayList<VerifyAuthBlockVerifyTransformsInfoProfileIDItem>(); - } - if (ItemUtils.shouldBeWrapped(this.verifyTransformsInfoProfileID)) { - this.verifyTransformsInfoProfileID = ItemUtils.wrap(this.verifyTransformsInfoProfileID, this.verifyTransformsInfoProfileIDItems, VerifyAuthBlockVerifyTransformsInfoProfileIDItem.class); - } - } +// public List<VerifyAuthBlockVerifyTransformsInfoProfileIDItem> getVerifyTransformsInfoProfileIDItems() { +// if (this.verifyTransformsInfoProfileIDItems == null) { +// this.verifyTransformsInfoProfileIDItems = new ArrayList<VerifyAuthBlockVerifyTransformsInfoProfileIDItem>(); +// } +// if (ItemUtils.shouldBeWrapped(this.verifyTransformsInfoProfileID)) { +// this.verifyTransformsInfoProfileID = ItemUtils.wrap(this.verifyTransformsInfoProfileID, this.verifyTransformsInfoProfileIDItems, VerifyAuthBlockVerifyTransformsInfoProfileIDItem.class); +// } +// return this.verifyTransformsInfoProfileIDItems; +// } +// +// public void setVerifyTransformsInfoProfileIDItems(List<VerifyAuthBlockVerifyTransformsInfoProfileIDItem> value) { +// this.verifyTransformsInfoProfileID = null; +// this.verifyTransformsInfoProfileIDItems = null; +// this.verifyTransformsInfoProfileIDItems = value; +// if (this.verifyTransformsInfoProfileIDItems == null) { +// this.verifyTransformsInfoProfileIDItems = new ArrayList<VerifyAuthBlockVerifyTransformsInfoProfileIDItem>(); +// } +// if (ItemUtils.shouldBeWrapped(this.verifyTransformsInfoProfileID)) { +// this.verifyTransformsInfoProfileID = ItemUtils.wrap(this.verifyTransformsInfoProfileID, this.verifyTransformsInfoProfileIDItems, VerifyAuthBlockVerifyTransformsInfoProfileIDItem.class); +// } +// } public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { if (!(object instanceof VerifyAuthBlock)) { diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/VerifyAuthBlockVerifyTransformsInfoProfileIDItem.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/VerifyAuthBlockVerifyTransformsInfoProfileIDItem.java deleted file mode 100644 index 8955525dd..000000000 --- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/VerifyAuthBlockVerifyTransformsInfoProfileIDItem.java +++ /dev/null @@ -1,93 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.07.20 at 12:19:30 PM CEST -// - - -package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated; - -import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import org.jvnet.hyperjaxb3.item.Item; - -@XmlAccessorType(XmlAccessType.FIELD) - - - -public class VerifyAuthBlockVerifyTransformsInfoProfileIDItem - implements Serializable, Item<String> -{ - - @XmlElement(name = "VerifyTransformsInfoProfileID", namespace = "http://www.buergerkarte.at/namespaces/moaconfig#") - protected String item; - @XmlAttribute(name = "Hjid") - protected Long hjid; - - /** - * Gets the value of the item property. - * - * @return - * possible object is - * {@link String } - * - */ - - - public String getItem() { - return item; - } - - /** - * Sets the value of the item property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setItem(String value) { - this.item = value; - } - - /** - * Gets the value of the hjid property. - * - * @return - * possible object is - * {@link Long } - * - */ - - - - public Long getHjid() { - return hjid; - } - - /** - * Sets the value of the hjid property. - * - * @param value - * allowed object is - * {@link Long } - * - */ - public void setHjid(Long value) { - this.hjid = value; - } - -} diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/session/InterfederationSessionStore.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/session/InterfederationSessionStore.java index 7b298a7d9..54216edc4 100644 --- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/session/InterfederationSessionStore.java +++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/session/InterfederationSessionStore.java @@ -62,6 +62,9 @@ public class InterfederationSessionStore implements Serializable{ @Column(name = "QAALevel", unique=false, nullable=false) private String QAALevel; + @Column(name = "authURL", unique=false, nullable=false) + private String authURL; + @Column(name = "attributesRequested", unique=false, nullable=true) private boolean attributesRequested; @@ -207,6 +210,20 @@ public class InterfederationSessionStore implements Serializable{ this.storeSSOInformation = storeSSOInformation; } + /** + * @return the authURL + */ + public String getAuthURL() { + return authURL; + } + + /** + * @param authURL the authURL to set + */ + public void setAuthURL(String authURL) { + this.authURL = authURL; + } + } diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/session/OASessionStore.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/session/OASessionStore.java index 0daeba40e..8b720e901 100644 --- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/session/OASessionStore.java +++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/session/OASessionStore.java @@ -65,6 +65,9 @@ public class OASessionStore implements Serializable{ @Column(name = "protocolType", unique=false, nullable=true) private String protocolType; + @Column(name = "authURL", unique=false, nullable=false) + private String authURL; + @Column(name = "attributequeryused", unique=false, nullable=false) private boolean attributeQueryUsed = false; @@ -183,6 +186,20 @@ public class OASessionStore implements Serializable{ this.userNameIDFormat = userNameIDFormat; } + /** + * @return the authURL + */ + public String getAuthURL() { + return authURL; + } + + /** + * @param authURL the authURL to set + */ + public void setAuthURL(String authURL) { + this.authURL = authURL; + } + diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/KeyValueUtils.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/KeyValueUtils.java index 8f3a8402d..cbdd13d0e 100644 --- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/KeyValueUtils.java +++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/KeyValueUtils.java @@ -31,6 +31,8 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; +import org.apache.commons.lang3.StringUtils; + import at.gv.egovernment.moa.util.MiscUtil; /** @@ -40,6 +42,7 @@ import at.gv.egovernment.moa.util.MiscUtil; public class KeyValueUtils { public static final String KEY_DELIMITER = "."; + public static final String CSV_DELIMITER = ","; /** * Extract the first child of an input key after a the prefix @@ -237,7 +240,8 @@ public class KeyValueUtils { * Normalize a CSV encoded list of value of an key/value pair * * This method removes all whitespace at the begin or the - * end of CSV values + * end of CSV values and remove newLine signs at the end of value. + * The ',' is used as list delimiter * * @param value CSV encoded input data * @return normalized CSV encoded data or null if {value} is null or empty @@ -245,7 +249,7 @@ public class KeyValueUtils { public static String normalizeCSVValueString(String value) { String normalizedCodes = null; if (MiscUtil.isNotEmpty(value)) { - String[] codes = value.split(","); + String[] codes = value.split(CSV_DELIMITER); for (String el: codes) { if (normalizedCodes == null) normalizedCodes = el.trim(); @@ -256,4 +260,39 @@ public class KeyValueUtils { } return normalizedCodes; } + + + /** + * Check a String if it is a comma separated list of values + * + * This method uses the ',' as list delimiter. + * + * @param value CSV encoded input data + * @return true if the input data contains a ',' and has more then 1 list element, otherwise false + */ + public static boolean isCSVValueString(String value) { + if (MiscUtil.isNotEmpty(value)) { + String[] codes = value.split(CSV_DELIMITER); + if (codes.length >= 2) { + if (MiscUtil.isNotEmpty(codes[1].trim())) + return true; + + } + } + + return false; + } + + + /** + * This method remove all newline delimiter (\n or \r\n) from input data + * + * @param value Input String + * @return Input String without newline characters + */ + public static String removeAllNewlineFromString(String value) { + return value.replaceAll("(\\t|\\r?\\n)+", ""); + + } + } diff --git a/id/server/moa-id-commons/src/main/java/org/apache/commons/httpclient/MOAHttpClient.java b/id/server/moa-id-commons/src/main/java/org/apache/commons/httpclient/MOAHttpClient.java index 758209193..edf7ce268 100644 --- a/id/server/moa-id-commons/src/main/java/org/apache/commons/httpclient/MOAHttpClient.java +++ b/id/server/moa-id-commons/src/main/java/org/apache/commons/httpclient/MOAHttpClient.java @@ -50,7 +50,7 @@ public class MOAHttpClient extends HttpClient { else port = url.getPort(); - Protocol authhttps = new Protocol("https", protoSocketFactory, port); + Protocol authhttps = new Protocol("https", protoSocketFactory, 443); getHostConfiguration().setHost(url.getHost(), port, authhttps); } |