aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Bonato <mbonato@datentechnik-innovation.com>2015-04-09 13:24:55 +0200
committerThomas Lenz <tlenz@iaik.tugraz.at>2015-06-19 11:09:55 +0200
commit0fb4c31f049d71e917dfbfdab96553a807195d0c (patch)
treeedeb1c502de674320928feb71bcd83c3056d135e
parent6d1f99a50744de690afccc12568539c23d839f93 (diff)
downloadmoa-id-spss-0fb4c31f049d71e917dfbfdab96553a807195d0c.tar.gz
moa-id-spss-0fb4c31f049d71e917dfbfdab96553a807195d0c.tar.bz2
moa-id-spss-0fb4c31f049d71e917dfbfdab96553a807195d0c.zip
Rename java packages
-rw-r--r--id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/ConfigurationToJSONConverter.java2
-rw-r--r--id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/NewAuthConfigurationProvider.java3
-rw-r--r--id/server/idserverlib/src/test/java/at/gv/egovnerment/moa/id/config/auth/AuthConfigurationProviderLegacyCompatibilityTest.java3
-rw-r--r--id/server/moa-id-commons/pom.xml2
-rw-r--r--id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationUtil.java (renamed from id/server/moa-id-commons/src/main/java/com/datentechnik/moa/id/conf/ConfigurationUtil.java)8
-rw-r--r--id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/MigrateConfiguration.java (renamed from id/server/moa-id-commons/src/main/java/com/datentechnik/moa/id/conf/MigrateConfiguration.java)6
-rw-r--r--id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/cli/CLIConstants.java (renamed from id/server/moa-id-commons/src/main/java/com/datentechnik/moa/id/conf/cli/CLIConstants.java)2
-rw-r--r--id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/cli/MOAIDConfCLI.java (renamed from id/server/moa-id-commons/src/main/java/com/datentechnik/moa/id/conf/cli/MOAIDConfCLI.java)2
-rw-r--r--id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/cli/MigrateConfigurationParams.java (renamed from id/server/moa-id-commons/src/main/java/com/datentechnik/moa/id/conf/cli/MigrateConfigurationParams.java)2
-rw-r--r--id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/persistence/Configuration.java (renamed from id/server/moa-id-commons/src/main/java/com/datentechnik/moa/id/conf/persistence/Configuration.java)2
-rw-r--r--id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/persistence/ConfigurationImpl.java (renamed from id/server/moa-id-commons/src/main/java/com/datentechnik/moa/id/conf/persistence/ConfigurationImpl.java)7
-rw-r--r--id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/persistence/JsonMapper.java (renamed from id/server/moa-id-commons/src/main/java/com/datentechnik/moa/id/conf/persistence/JsonMapper.java)2
-rw-r--r--id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/NewConfigurationDBRead.java3
-rw-r--r--id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/NewConfigurationDBWrite.java3
-rw-r--r--id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/ConfigPropertyDao.java (renamed from id/server/moa-id-commons/src/main/java/com/datentechnik/moa/id/conf/persistence/dal/ConfigPropertyDao.java)2
-rw-r--r--id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/ConfigPropertyDaoImpl.java (renamed from id/server/moa-id-commons/src/main/java/com/datentechnik/moa/id/conf/persistence/dal/ConfigPropertyDaoImpl.java)2
-rw-r--r--id/server/moa-id-commons/src/main/java/com/datentechnik/moa/id/conf/persistence/dal/ConfigProperty.java95
-rw-r--r--id/server/moa-id-commons/src/main/resources/META-INF/persistence.xml4
-rw-r--r--id/server/moa-id-commons/src/main/resources/configuration.beans.xml4
-rw-r--r--id/server/moa-id-commons/src/main/resources/persistence_template.xml2
-rw-r--r--id/server/moa-id-commons/src/test/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBReadTest.java2
-rw-r--r--id/server/moa-id-commons/src/test/resources/at/gv/egovernment/moa/id/commons/db/configuration.beans-test.xml4
-rw-r--r--id/server/moa-id-commons/src/test/resources/log4j.xml16
-rw-r--r--id/server/pom.xml2
24 files changed, 49 insertions, 131 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/ConfigurationToJSONConverter.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/ConfigurationToJSONConverter.java
index 39225a5b0..6f2c771ec 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/ConfigurationToJSONConverter.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/ConfigurationToJSONConverter.java
@@ -13,11 +13,11 @@ import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import at.gv.egovernment.moa.id.commons.config.persistence.Configuration;
import at.gv.egovernment.moa.id.commons.db.ConfigurationDBRead;
import at.gv.egovernment.moa.id.config.ConfigurationException;
import at.gv.egovernment.moa.id.config.ConfigurationProvider;
-import com.datentechnik.moa.id.conf.persistence.Configuration;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/NewAuthConfigurationProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/NewAuthConfigurationProvider.java
index 0be1dc94b..d8d368a76 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/NewAuthConfigurationProvider.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/NewAuthConfigurationProvider.java
@@ -15,6 +15,7 @@ import java.util.Properties;
import org.springframework.beans.factory.annotation.Autowired;
import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants;
+import at.gv.egovernment.moa.id.commons.config.persistence.Configuration;
import at.gv.egovernment.moa.id.commons.db.MOAIDConfigurationConstants;
import at.gv.egovernment.moa.id.commons.db.dao.config.AuthComponentGeneral;
import at.gv.egovernment.moa.id.commons.db.dao.config.ChainingModes;
@@ -50,8 +51,6 @@ import at.gv.egovernment.moa.id.config.stork.STORKConfig;
import at.gv.egovernment.moa.logging.Logger;
import at.gv.egovernment.moa.util.MiscUtil;
-import com.datentechnik.moa.id.conf.persistence.Configuration;
-
/**
* A class providing access to the Auth Part of the MOA-ID configuration data.
*/
diff --git a/id/server/idserverlib/src/test/java/at/gv/egovnerment/moa/id/config/auth/AuthConfigurationProviderLegacyCompatibilityTest.java b/id/server/idserverlib/src/test/java/at/gv/egovnerment/moa/id/config/auth/AuthConfigurationProviderLegacyCompatibilityTest.java
index bd997303a..7606bc9bf 100644
--- a/id/server/idserverlib/src/test/java/at/gv/egovnerment/moa/id/config/auth/AuthConfigurationProviderLegacyCompatibilityTest.java
+++ b/id/server/idserverlib/src/test/java/at/gv/egovnerment/moa/id/config/auth/AuthConfigurationProviderLegacyCompatibilityTest.java
@@ -10,6 +10,7 @@ import java.util.Collections;
import org.junit.Test;
import org.unitils.reflectionassert.ReflectionAssert;
+import at.gv.egovernment.moa.id.commons.config.persistence.Configuration;
import at.gv.egovernment.moa.id.commons.db.MOAIDConfigurationConstants;
import at.gv.egovernment.moa.id.commons.db.dao.config.AuthComponentGeneral;
import at.gv.egovernment.moa.id.commons.db.dao.config.ChainingModes;
@@ -29,8 +30,6 @@ import at.gv.egovernment.moa.id.config.ConfigurationException;
import at.gv.egovernment.moa.id.config.auth.NewAuthConfigurationProvider;
import at.gv.egovernment.moa.id.config.auth.data.ProtocolAllowed;
-import com.datentechnik.moa.id.conf.persistence.Configuration;
-
public class AuthConfigurationProviderLegacyCompatibilityTest {
private MOAIDConfiguration getMinimalMoaidConfiguration() {
diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml
index 7e520d96b..ee94fb49c 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -135,7 +135,7 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-tx</artifactId>
+ <artifactId>spring-orm</artifactId>
</dependency>
<dependency>
diff --git a/id/server/moa-id-commons/src/main/java/com/datentechnik/moa/id/conf/ConfigurationUtil.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationUtil.java
index e771b96a2..d8fde7eee 100644
--- a/id/server/moa-id-commons/src/main/java/com/datentechnik/moa/id/conf/ConfigurationUtil.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationUtil.java
@@ -1,4 +1,4 @@
-package com.datentechnik.moa.id.conf;
+package at.gv.egovernment.moa.id.commons.config;
import java.io.File;
import java.io.FileInputStream;
@@ -16,11 +16,11 @@ import javax.xml.bind.Unmarshaller;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import at.gv.egovernment.moa.id.commons.config.persistence.Configuration;
+import at.gv.egovernment.moa.id.commons.config.persistence.JsonMapper;
import at.gv.egovernment.moa.id.commons.db.MOAIDConfigurationConstants;
import at.gv.egovernment.moa.id.commons.db.dao.config.MOAIDConfiguration;
-import com.datentechnik.moa.id.conf.persistence.Configuration;
-import com.datentechnik.moa.id.conf.persistence.JsonMapper;
import com.fasterxml.jackson.core.JsonProcessingException;
public class ConfigurationUtil {
@@ -128,7 +128,7 @@ public class ConfigurationUtil {
ApplicationContext context = new ClassPathXmlApplicationContext("configuration.beans.xml");
Configuration dbConfiguration = (Configuration) context.getBean("config");
boolean prettyPrint = true;
- com.datentechnik.moa.id.conf.persistence.JsonMapper mapper = new JsonMapper(prettyPrint);
+ at.gv.egovernment.moa.id.commons.config.persistence.JsonMapper mapper = new JsonMapper(prettyPrint);
for (String key : MOAIDConfigurationConstants.getAllMOAIDConfigurationKeys()) {
diff --git a/id/server/moa-id-commons/src/main/java/com/datentechnik/moa/id/conf/MigrateConfiguration.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/MigrateConfiguration.java
index fefcf5028..4e8c7dffd 100644
--- a/id/server/moa-id-commons/src/main/java/com/datentechnik/moa/id/conf/MigrateConfiguration.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/MigrateConfiguration.java
@@ -1,4 +1,4 @@
-package com.datentechnik.moa.id.conf;
+package at.gv.egovernment.moa.id.commons.config;
import java.io.File;
import java.io.FileInputStream;
@@ -7,8 +7,8 @@ import java.io.IOException;
import javax.xml.bind.JAXBException;
-import com.datentechnik.moa.id.conf.cli.MOAIDConfCLI;
-import com.datentechnik.moa.id.conf.cli.MigrateConfigurationParams;
+import at.gv.egovernment.moa.id.commons.config.cli.MOAIDConfCLI;
+import at.gv.egovernment.moa.id.commons.config.cli.MigrateConfigurationParams;
/**
* CLI tool which is able to perform the following tasks:
diff --git a/id/server/moa-id-commons/src/main/java/com/datentechnik/moa/id/conf/cli/CLIConstants.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/cli/CLIConstants.java
index 481b6d6f6..c652645fc 100644
--- a/id/server/moa-id-commons/src/main/java/com/datentechnik/moa/id/conf/cli/CLIConstants.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/cli/CLIConstants.java
@@ -1,4 +1,4 @@
-package com.datentechnik.moa.id.conf.cli;
+package at.gv.egovernment.moa.id.commons.config.cli;
/**
* Constants for the CLI.
diff --git a/id/server/moa-id-commons/src/main/java/com/datentechnik/moa/id/conf/cli/MOAIDConfCLI.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/cli/MOAIDConfCLI.java
index ac5ead171..f2753c3d0 100644
--- a/id/server/moa-id-commons/src/main/java/com/datentechnik/moa/id/conf/cli/MOAIDConfCLI.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/cli/MOAIDConfCLI.java
@@ -1,4 +1,4 @@
-package com.datentechnik.moa.id.conf.cli;
+package at.gv.egovernment.moa.id.commons.config.cli;
import java.io.OutputStream;
import java.io.PrintWriter;
diff --git a/id/server/moa-id-commons/src/main/java/com/datentechnik/moa/id/conf/cli/MigrateConfigurationParams.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/cli/MigrateConfigurationParams.java
index da2cac31b..86bde1310 100644
--- a/id/server/moa-id-commons/src/main/java/com/datentechnik/moa/id/conf/cli/MigrateConfigurationParams.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/cli/MigrateConfigurationParams.java
@@ -1,4 +1,4 @@
-package com.datentechnik.moa.id.conf.cli;
+package at.gv.egovernment.moa.id.commons.config.cli;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.MissingOptionException;
diff --git a/id/server/moa-id-commons/src/main/java/com/datentechnik/moa/id/conf/persistence/Configuration.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/persistence/Configuration.java
index 406c21026..f357fc570 100644
--- a/id/server/moa-id-commons/src/main/java/com/datentechnik/moa/id/conf/persistence/Configuration.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/persistence/Configuration.java
@@ -1,4 +1,4 @@
-package com.datentechnik.moa.id.conf.persistence;
+package at.gv.egovernment.moa.id.commons.config.persistence;
import java.util.List;
diff --git a/id/server/moa-id-commons/src/main/java/com/datentechnik/moa/id/conf/persistence/ConfigurationImpl.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/persistence/ConfigurationImpl.java
index 43974de7a..c90b60440 100644
--- a/id/server/moa-id-commons/src/main/java/com/datentechnik/moa/id/conf/persistence/ConfigurationImpl.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/persistence/ConfigurationImpl.java
@@ -1,4 +1,4 @@
-package com.datentechnik.moa.id.conf.persistence;
+package at.gv.egovernment.moa.id.commons.config.persistence;
import java.io.IOException;
import java.util.ArrayList;
@@ -11,8 +11,9 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Required;
import org.springframework.stereotype.Component;
-import com.datentechnik.moa.id.conf.persistence.dal.ConfigProperty;
-import com.datentechnik.moa.id.conf.persistence.dal.ConfigPropertyDao;
+import at.gv.egovernment.moa.id.commons.db.dao.config.ConfigProperty;
+import at.gv.egovernment.moa.id.commons.db.dao.config.ConfigPropertyDao;
+
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/id/server/moa-id-commons/src/main/java/com/datentechnik/moa/id/conf/persistence/JsonMapper.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/persistence/JsonMapper.java
index 8e5d2e7c4..6138d571b 100644
--- a/id/server/moa-id-commons/src/main/java/com/datentechnik/moa/id/conf/persistence/JsonMapper.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/persistence/JsonMapper.java
@@ -1,4 +1,4 @@
-package com.datentechnik.moa.id.conf.persistence;
+package at.gv.egovernment.moa.id.commons.config.persistence;
import java.io.IOException;
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 0dd232773..28363a1eb 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
@@ -7,6 +7,7 @@ import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
+import at.gv.egovernment.moa.id.commons.config.persistence.Configuration;
import at.gv.egovernment.moa.id.commons.db.dao.config.AuthComponentGeneral;
import at.gv.egovernment.moa.id.commons.db.dao.config.ChainingModes;
import at.gv.egovernment.moa.id.commons.db.dao.config.DefaultBKUs;
@@ -17,8 +18,6 @@ import at.gv.egovernment.moa.id.commons.db.dao.config.SLRequestTemplates;
import at.gv.egovernment.moa.id.commons.db.dao.config.UserDatabase;
import at.gv.egovernment.moa.logging.Logger;
-import com.datentechnik.moa.id.conf.persistence.Configuration;
-
/**
*
*
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
index e1b51ee9b..de4a1789e 100644
--- 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
@@ -6,6 +6,7 @@ import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import at.gv.egovernment.moa.id.commons.config.persistence.Configuration;
import at.gv.egovernment.moa.id.commons.db.dao.config.AuthComponentGeneral;
import at.gv.egovernment.moa.id.commons.db.dao.config.ChainingModes;
import at.gv.egovernment.moa.id.commons.db.dao.config.DefaultBKUs;
@@ -15,8 +16,6 @@ import at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication;
import at.gv.egovernment.moa.id.commons.db.dao.config.SLRequestTemplates;
import at.gv.egovernment.moa.id.commons.db.dao.config.UserDatabase;
-import com.datentechnik.moa.id.conf.persistence.Configuration;
-
/**
* This class is used for writing to the key-value database.
*/
diff --git a/id/server/moa-id-commons/src/main/java/com/datentechnik/moa/id/conf/persistence/dal/ConfigPropertyDao.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/ConfigPropertyDao.java
index 8f00bd226..db35ba1df 100644
--- a/id/server/moa-id-commons/src/main/java/com/datentechnik/moa/id/conf/persistence/dal/ConfigPropertyDao.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/ConfigPropertyDao.java
@@ -1,4 +1,4 @@
-package com.datentechnik.moa.id.conf.persistence.dal;
+package at.gv.egovernment.moa.id.commons.db.dao.config;
import java.util.List;
import java.util.Set;
diff --git a/id/server/moa-id-commons/src/main/java/com/datentechnik/moa/id/conf/persistence/dal/ConfigPropertyDaoImpl.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/ConfigPropertyDaoImpl.java
index 6de10e9b9..6a76c1d17 100644
--- a/id/server/moa-id-commons/src/main/java/com/datentechnik/moa/id/conf/persistence/dal/ConfigPropertyDaoImpl.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/ConfigPropertyDaoImpl.java
@@ -1,4 +1,4 @@
-package com.datentechnik.moa.id.conf.persistence.dal;
+package at.gv.egovernment.moa.id.commons.db.dao.config;
import java.util.List;
import java.util.Set;
diff --git a/id/server/moa-id-commons/src/main/java/com/datentechnik/moa/id/conf/persistence/dal/ConfigProperty.java b/id/server/moa-id-commons/src/main/java/com/datentechnik/moa/id/conf/persistence/dal/ConfigProperty.java
deleted file mode 100644
index 7e4e217b0..000000000
--- a/id/server/moa-id-commons/src/main/java/com/datentechnik/moa/id/conf/persistence/dal/ConfigProperty.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.datentechnik.moa.id.conf.persistence.dal;
-
-import java.io.Serializable;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Lob;
-import javax.persistence.Table;
-
-/**
- * Reflects a MOAID configuration entry.
- *
- */
-@Table(name = "moaid_configuration")
-@Entity
-public class ConfigProperty implements Serializable {
- private static final long serialVersionUID = 1L;
-
- @Id
- @Column(name = "propertyKey", unique = true)
- private String key;
-
- @Lob
- @Column(name = "propertyValue")
- private String value;
-
- /**
- * Returns the property's key.
- * @return The key.
- */
- public String getKey() {
- return key;
- }
-
- /**
- * Sets the property's key.
- * @param key The key
- */
- public void setKey(String key) {
- this.key = key;
- }
-
- /**
- * Returns the property's value (which might be {@code null}).
- * @return The property's value (might be {@code null}).
- */
- public String getValue() {
- return value;
- }
-
- /**
- * Sets the property's value.
- * @param value The value
- */
- public void setValue(String value) {
- this.value = value;
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((key == null) ? 0 : key.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- ConfigProperty other = (ConfigProperty) obj;
- if (key == null) {
- if (other.key != null)
- return false;
- } else if (!key.equals(other.key))
- return false;
- return true;
- }
-
- @Override
- public String toString() {
- StringBuilder builder = new StringBuilder();
- builder.append("ConfigProperty [key=");
- builder.append(key);
- builder.append(", value=");
- builder.append(value);
- builder.append("]");
- return builder.toString();
- }
-}
diff --git a/id/server/moa-id-commons/src/main/resources/META-INF/persistence.xml b/id/server/moa-id-commons/src/main/resources/META-INF/persistence.xml
index 640c1504c..8ff384eb9 100644
--- a/id/server/moa-id-commons/src/main/resources/META-INF/persistence.xml
+++ b/id/server/moa-id-commons/src/main/resources/META-INF/persistence.xml
@@ -7,12 +7,12 @@ http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
<persistence-unit name="at.gv.egovernment.moa.id.commons.db.dao.config" transaction-type="RESOURCE_LOCAL">
<provider>org.hibernate.ejb.HibernatePersistence</provider>
- <class>com.datentechnik.moa.id.conf.persistence.dal.SOME_CLASS</class>
+ <class>at.gv.egovernment.moa.id.commons.config.persistence.dal.SOME_CLASS</class>
</persistence-unit>
<persistence-unit name="moaidconf" transaction-type="RESOURCE_LOCAL">
<provider>org.hibernate.ejb.HibernatePersistence</provider>
- <class>com.datentechnik.moa.id.conf.persistence.dal.ConfigProperty</class>
+ <class>at.gv.egovernment.moa.id.commons.db.dao.config.ConfigProperty</class>
<properties>
</properties>
</persistence-unit>
diff --git a/id/server/moa-id-commons/src/main/resources/configuration.beans.xml b/id/server/moa-id-commons/src/main/resources/configuration.beans.xml
index 444b01095..732c19721 100644
--- a/id/server/moa-id-commons/src/main/resources/configuration.beans.xml
+++ b/id/server/moa-id-commons/src/main/resources/configuration.beans.xml
@@ -16,8 +16,8 @@
<bean id="configPropertyDao"
- class="com.datentechnik.moa.id.conf.persistence.dal.ConfigPropertyDaoImpl" />
- <bean id="config" class="com.datentechnik.moa.id.conf.persistence.ConfigurationImpl">
+ class="at.gv.egovernment.moa.id.commons.db.dao.config.ConfigPropertyDaoImpl" />
+ <bean id="config" class="at.gv.egovernment.moa.id.commons.config.persistence.ConfigurationImpl">
<property name="configPropertyDao" ref="configPropertyDao" />
</bean>
diff --git a/id/server/moa-id-commons/src/main/resources/persistence_template.xml b/id/server/moa-id-commons/src/main/resources/persistence_template.xml
index f5bbe8555..06706e27a 100644
--- a/id/server/moa-id-commons/src/main/resources/persistence_template.xml
+++ b/id/server/moa-id-commons/src/main/resources/persistence_template.xml
@@ -5,7 +5,7 @@ http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistenc
<persistence-unit name="moaidconf" transaction-type="RESOURCE_LOCAL">
<provider>org.hibernate.ejb.HibernatePersistence</provider>
- <class>com.datentechnik.moa.id.conf.persistence.dal.ConfigProperty</class>
+ <class>at.gv.egovernment.moa.id.commons.db.dao.config.ConfigProperty</class>
<properties>
</properties>
</persistence-unit>
diff --git a/id/server/moa-id-commons/src/test/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBReadTest.java b/id/server/moa-id-commons/src/test/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBReadTest.java
index 7147cd5bc..cdfaf825f 100644
--- a/id/server/moa-id-commons/src/test/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBReadTest.java
+++ b/id/server/moa-id-commons/src/test/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBReadTest.java
@@ -19,11 +19,11 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import at.gv.egovernment.moa.id.commons.config.persistence.Configuration;
import at.gv.egovernment.moa.id.commons.db.dao.config.AuthComponentGeneral;
import at.gv.egovernment.moa.id.commons.db.dao.config.MOAIDConfiguration;
import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException;
-import com.datentechnik.moa.id.conf.persistence.Configuration;
import com.fasterxml.jackson.annotation.JsonProperty;
@RunWith(SpringJUnit4ClassRunner.class)
diff --git a/id/server/moa-id-commons/src/test/resources/at/gv/egovernment/moa/id/commons/db/configuration.beans-test.xml b/id/server/moa-id-commons/src/test/resources/at/gv/egovernment/moa/id/commons/db/configuration.beans-test.xml
index 4c7cd3ab1..cfe4db385 100644
--- a/id/server/moa-id-commons/src/test/resources/at/gv/egovernment/moa/id/commons/db/configuration.beans-test.xml
+++ b/id/server/moa-id-commons/src/test/resources/at/gv/egovernment/moa/id/commons/db/configuration.beans-test.xml
@@ -16,8 +16,8 @@
location="classpath:at/gv/egovernment/moa/id/commons/db/testDatabase.properties" />
<bean id="configPropertyDao"
- class="com.datentechnik.moa.id.conf.persistence.dal.ConfigPropertyDaoImpl" />
- <bean id="config" class="com.datentechnik.moa.id.conf.persistence.ConfigurationImpl">
+ class="at.gv.egovernment.moa.id.commons.db.dao.config.ConfigPropertyDaoImpl" />
+ <bean id="config" class="at.gv.egovernment.moa.id.commons.config.persistence.ConfigurationImpl">
<property name="configPropertyDao" ref="configPropertyDao" />
</bean>
diff --git a/id/server/moa-id-commons/src/test/resources/log4j.xml b/id/server/moa-id-commons/src/test/resources/log4j.xml
new file mode 100644
index 000000000..6685c1e82
--- /dev/null
+++ b/id/server/moa-id-commons/src/test/resources/log4j.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+ <appender name="consoleAppender" class="org.apache.log4j.ConsoleAppender">
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d{dd MMM yyyy HH:mm:ss} %5p %c{1} - %m%n" />
+ </layout>
+ </appender>
+
+ <root>
+ <priority value="info" />
+ <appender-ref ref="consoleAppender" />
+ </root>
+
+</log4j:configuration>
diff --git a/id/server/pom.xml b/id/server/pom.xml
index 9ce48bf60..22d9536d6 100644
--- a/id/server/pom.xml
+++ b/id/server/pom.xml
@@ -84,7 +84,7 @@
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-tx</artifactId>
+ <artifactId>spring-orm</artifactId>
<version>${org.springframework.version}</version>
</dependency>