aboutsummaryrefslogtreecommitdiff
path: root/id/server
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2014-04-02 17:31:57 +0200
committerThomas Lenz <tlenz@iaik.tugraz.at>2014-04-02 17:31:57 +0200
commit449595209b9eef4dc5ac161663593fe4a25a64f1 (patch)
treed9484185bdf1ca5cccb7a28ba130fb0e82e9e198 /id/server
parent88090f446e0289d5ad303e07ce6ddb48daffff32 (diff)
parent5d1bbe135b0d8d9ff0d8934f9d0a4311b61f46fb (diff)
downloadmoa-id-spss-449595209b9eef4dc5ac161663593fe4a25a64f1.tar.gz
moa-id-spss-449595209b9eef4dc5ac161663593fe4a25a64f1.tar.bz2
moa-id-spss-449595209b9eef4dc5ac161663593fe4a25a64f1.zip
Add new language selection
Conflicts: id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/helper/LanguageHelper.java
Diffstat (limited to 'id/server')
-rw-r--r--id/server/data/deploy/conf/moa-id/log4j.properties1
-rw-r--r--id/server/stork2-saml-engine/pom.xml4
2 files changed, 3 insertions, 2 deletions
diff --git a/id/server/data/deploy/conf/moa-id/log4j.properties b/id/server/data/deploy/conf/moa-id/log4j.properties
index 1a9787815..310b58a3d 100644
--- a/id/server/data/deploy/conf/moa-id/log4j.properties
+++ b/id/server/data/deploy/conf/moa-id/log4j.properties
@@ -9,6 +9,7 @@ log4j.logger.iaik.server=info
log4j.logger.at.gv.egovernment.moa.id=info
log4j.logger.at.gv.egovernment.moa.id.proxy=info
log4j.logger.eu.stork=info
+log4j.logger.org.hibernate=warn
# configure the stdout appender
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
diff --git a/id/server/stork2-saml-engine/pom.xml b/id/server/stork2-saml-engine/pom.xml
index e4af3d90e..015697c5c 100644
--- a/id/server/stork2-saml-engine/pom.xml
+++ b/id/server/stork2-saml-engine/pom.xml
@@ -133,8 +133,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>