aboutsummaryrefslogtreecommitdiff
path: root/id/server
diff options
context:
space:
mode:
authorAlexander Marsalek <amarsalek@iaik.tugraz.at>2014-07-08 10:55:12 +0200
committerAlexander Marsalek <amarsalek@iaik.tugraz.at>2014-07-08 10:55:12 +0200
commit487db6041f9c215e7d6cb93ed1d5b93ebb607ee3 (patch)
treec9302a52902d025c48105a87c9f43d5c2793bf92 /id/server
parent9d07e7a6dcd66c0ebff241e4f0113b787fcbcffb (diff)
parent49daddb4b7296311aa68fc717dfcb35005e16b3e (diff)
downloadmoa-id-spss-487db6041f9c215e7d6cb93ed1d5b93ebb607ee3.tar.gz
moa-id-spss-487db6041f9c215e7d6cb93ed1d5b93ebb607ee3.tar.bz2
moa-id-spss-487db6041f9c215e7d6cb93ed1d5b93ebb607ee3.zip
Merge branch 'moa-2.1-Snapshot' into authnrequest_signrequest_split
Conflicts: id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/stork/STORKResponseProcessor.java id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd
Diffstat (limited to 'id/server')
-rw-r--r--id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBRead.java4
-rw-r--r--id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBUtils.java2
-rw-r--r--id/server/moa-id-commons/src/main/resources/config/bindings.xjb20
-rw-r--r--id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd10
4 files changed, 28 insertions, 8 deletions
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
index 88220cded..e890e2145 100644
--- 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
@@ -147,8 +147,8 @@ public class ConfigurationDBRead {
Logger.trace("Found entries: " + result.size());
if (result.size() == 0) {
- Logger.trace("No entries found.");
- return null;
+ Logger.trace("No entries found. Create fresh instance.");
+ return new MOAIDConfiguration();
}
return (MOAIDConfiguration) result.get(0);
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
index 6bd987f96..cdb19340d 100644
--- 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
@@ -154,7 +154,7 @@ public final class ConfigurationDBUtils {
synchronized (session) {
tx.begin();
- session.persist(dbo);
+ session.merge(dbo);
tx.commit();
//session.clear();
diff --git a/id/server/moa-id-commons/src/main/resources/config/bindings.xjb b/id/server/moa-id-commons/src/main/resources/config/bindings.xjb
index cf04319c8..21714849b 100644
--- a/id/server/moa-id-commons/src/main/resources/config/bindings.xjb
+++ b/id/server/moa-id-commons/src/main/resources/config/bindings.xjb
@@ -2,6 +2,8 @@
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
+ xmlns:hj="http://hyperjaxb3.jvnet.org/ejb/schemas/customizations"
+ xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
jaxb:extensionBindingPrefixes="hj">
<jaxb:bindings schemaLocation="moaid_config_2.0.xsd" node="/xsd:schema">
@@ -12,4 +14,22 @@
adapter="com.sun.tools.xjc.runtime.ZeroOneBooleanAdapter"/>
</jaxb:globalBindings>
</jaxb:bindings>
+
+ <jaxb:bindings schemaLocation="moaid_config_2.0.xsd" node="/xsd:schema/xsd:element[@name='C-PEPS']//xsd:element[@ref='OA_STORK']">
+ <hj:many-to-many name="OA_STORK">
+ <orm:join-table name="OA_CPEPS">
+ <orm:join-column name="aid" referenced-column-name="hjid" />
+ <orm:inverse-join-column name="bid" referenced-column-name="hjid" />
+ </orm:join-table>
+ </hj:many-to-many>
+ </jaxb:bindings>
+
+ <jaxb:bindings schemaLocation="moaid_config_2.0.xsd" node="/xsd:schema/xsd:element[@name='OA_STORK']//xsd:element[@ref='C-PEPS']">
+ <hj:many-to-many name="CPEPS" mappedBy="OA_STORK">
+ <hj:cascade>
+ <hj:cascade-persist/>
+ </hj:cascade>
+ </hj:many-to-many>
+ </jaxb:bindings>
+
</jaxb:bindings> \ No newline at end of file
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 45adecb92..066967b44 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
@@ -803,6 +803,7 @@
<xsd:annotation>
<xsd:documentation>Name zum Key eines KeyStores, der den privaten
Schlüssel zum Erstellen einer Signatur darstellt
+
</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
@@ -821,12 +822,11 @@
</xsd:annotation>
<xsd:complexType>
<xsd:sequence>
- <xsd:element name="AttributeValue" type="xsd:string"
- minOccurs="0" maxOccurs="unbounded" />
+ <xsd:element name="AttributeValue" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element ref="OA_STORK" minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
- <xsd:attribute name="countryCode" type="CountryCodeType"
- use="required" />
- <xsd:attribute name="URL" type="xsd:anyURI" use="required" />
+ <xsd:attribute name="countryCode" type="CountryCodeType" use="required"/>
+ <xsd:attribute name="URL" type="xsd:anyURI" use="required"/>
<xsd:attribute name="supportsXMLSignature" type="xsd:boolean" default="true"></xsd:attribute>
</xsd:complexType>
</xsd:element>