From 2c82d41a98e2617088cdcf3db72b40d9747ae292 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 26 Sep 2013 08:05:52 +0200
Subject: Features: -- Add additional parameters to customize BKUSelectionForm
 and SendAssertionForm -- change Target configuration -- insert some logging

Bugfixes:
-- Nullpointerexceptions in combination of an old userdatabase entry and a actual configuration tool version
---
 .../moa/id/commons/db/dao/statistic/StatisticLog.java            | 9 +++++----
 .../src/main/resources/config/moaid_config_2.0.xsd               | 8 ++++++++
 2 files changed, 13 insertions(+), 4 deletions(-)

(limited to 'id/server/moa-id-commons/src')

diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/statistic/StatisticLog.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/statistic/StatisticLog.java
index 643136e70..7639fd29e 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/statistic/StatisticLog.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/statistic/StatisticLog.java
@@ -8,6 +8,8 @@ import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
 import javax.persistence.Table;
 
 import org.hibernate.annotations.DynamicUpdate;
@@ -17,10 +19,9 @@ import org.hibernate.annotations.DynamicUpdate;
 @Entity
 @DynamicUpdate(value=true)
 @Table(name = "statisiclog")
-//@NamedQueries({
-//    @NamedQuery(name="getAssertionWithArtifact", query = "select assertionstore from AssertionStore assertionstore where assertionstore.artifact = :artifact"),
-//    @NamedQuery(name="getAssertionWithTimeOut", query = "select assertionstore from AssertionStore assertionstore where assertionstore.timestamp < :timeout")
-//})
+@NamedQueries({
+    @NamedQuery(name="getAllEntriesNotBeforeTimeStamp", query = "select statisiclog from StatisticLog statisiclog where statisiclog.timestamp > :timeout")
+})
 
 public class StatisticLog implements Serializable{
 
diff --git a/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd b/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd
index dd696f42f..20251d3bb 100644
--- a/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd
+++ b/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd
@@ -451,6 +451,7 @@
 		<xsd:sequence>
 			<xsd:element name="Template" type="TemplateType" minOccurs="0" maxOccurs="3"/>
 			<xsd:element name="AditionalAuthBlockText" type="xsd:string" minOccurs="0"/>
+			<xsd:element name="BKUSelectionCustomization"  type="BKUSelectionCustomizationType" minOccurs="0" maxOccurs="1"/>
 		</xsd:sequence>
 	</xsd:complexType>
 	<xsd:complexType name="TemplateType">
@@ -948,4 +949,11 @@
 			<xsd:element name="OnlineApplication" type="OnlineApplication" minOccurs="0" maxOccurs="unbounded"/>
 		</xsd:sequence>
 	</xsd:complexType>
+	<xsd:complexType name="BKUSelectionCustomizationType">
+		<xsd:sequence>
+			<xsd:element name="BackGroundColor" type="xsd:string" minOccurs="0" maxOccurs="1"/>
+			<xsd:element name="MandateLoginButton" type="xsd:boolean" minOccurs="0" maxOccurs="1" default="true"/>
+			<xsd:element name="OnlyMandateLoginAllowed" type="xsd:boolean" minOccurs="0" maxOccurs="1" default="false" />
+		</xsd:sequence>
+	</xsd:complexType>	
 </xsd:schema>
-- 
cgit v1.2.3