aboutsummaryrefslogtreecommitdiff
path: root/id
diff options
context:
space:
mode:
authorAlexander Marsalek <amarsalek@iaik.tugraz.at>2014-10-24 15:40:17 +0200
committerAlexander Marsalek <amarsalek@iaik.tugraz.at>2014-10-24 15:40:17 +0200
commita36f28e84cd86196c8b750cbaa4f61977996aa6e (patch)
treefcf995faff5dd4bb08fdbe972f545c2b7aa4d61e /id
parentbda377810ebe5467439d2098d683788ba4e7e602 (diff)
parent481963320bb314cd5b3fd459abe93f448bd677e9 (diff)
downloadmoa-id-spss-a36f28e84cd86196c8b750cbaa4f61977996aa6e.tar.gz
moa-id-spss-a36f28e84cd86196c8b750cbaa4f61977996aa6e.tar.bz2
moa-id-spss-a36f28e84cd86196c8b750cbaa4f61977996aa6e.zip
Merge branch 'merge' into moa-2.1-Snapshot
Diffstat (limited to 'id')
-rw-r--r--id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java21
-rw-r--r--id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html2
-rw-r--r--id/server/idserverlib/pom.xml4
-rw-r--r--id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html2
-rw-r--r--id/server/idserverlib/src/main/resources/resources/templates/saml2-post-binding-moa.vm2
-rw-r--r--id/server/moa-id-commons/pom.xml3
6 files changed, 21 insertions, 13 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
index 7f609d95e..a4ca3e403 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
@@ -222,15 +222,15 @@ public class EditGeneralConfigAction extends BasicAction {
private String saveFormToDatabase() {
log.debug("Saving form to database");
- log.error("Saving form to db");
- log.info("SV frm db");
+// log.error("Saving form to db");
+// log.info("SV frm db");
- for (Object obj : Collections.list(request.getParameterNames())) {
- log.error(" PARAM: " + obj.toString());
- }
- for (Object obj : Collections.list(request.getSession().getAttributeNames())) {
- log.error(" SES PARAM: " + obj.toString());
- }
+// for (Object obj : Collections.list(request.getParameterNames())) {
+// log.error(" PARAM: " + obj.toString());
+// }
+// for (Object obj : Collections.list(request.getSession().getAttributeNames())) {
+// log.error(" SES PARAM: " + obj.toString());
+// }
try {
log.error(" ASSERTION " + moaconfig.getTimeoutAssertion());
@@ -523,8 +523,11 @@ public class EditGeneralConfigAction extends BasicAction {
ForeignIdentities foreign = dbauth.getForeignIdentities();
if (foreign != null) {
STORK stork = foreign.getSTORK();
- if (stork == null)
+ if (stork == null) {
stork = new STORK();
+ foreign.setSTORK(stork);
+
+ }
try {
log.error("QAAAA " + storkconfig.getDefaultQaa());
diff --git a/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html b/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html
index ef070b8eb..7e2ddc491 100644
--- a/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html
+++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html
@@ -720,7 +720,7 @@
}
}
function onChangeChecks() {
- if (top.innerWidth < 650) {
+ if (self.innerWidth < 650) {
document.getElementById("moaidform").setAttribute("target","_parent");
} else {
document.getElementById("moaidform").removeAttribute("target");
diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index 00d128ca5..08c406cf1 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -241,6 +241,10 @@
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
</exclusion>
+ <exclusion>
+ <artifactId>bcprov-jdk15on</artifactId>
+ <groupId>org.bouncycastle</groupId>
+ </exclusion>
</exclusions>
</dependency>
diff --git a/id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html b/id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html
index ef070b8eb..7e2ddc491 100644
--- a/id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html
+++ b/id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html
@@ -720,7 +720,7 @@
}
}
function onChangeChecks() {
- if (top.innerWidth < 650) {
+ if (self.innerWidth < 650) {
document.getElementById("moaidform").setAttribute("target","_parent");
} else {
document.getElementById("moaidform").removeAttribute("target");
diff --git a/id/server/idserverlib/src/main/resources/resources/templates/saml2-post-binding-moa.vm b/id/server/idserverlib/src/main/resources/resources/templates/saml2-post-binding-moa.vm
index cac0bda76..8beb601c6 100644
--- a/id/server/idserverlib/src/main/resources/resources/templates/saml2-post-binding-moa.vm
+++ b/id/server/idserverlib/src/main/resources/resources/templates/saml2-post-binding-moa.vm
@@ -18,7 +18,7 @@
</p>
</noscript>
- <form action="${action}" method="post" target="_parent">
+ <form action="${action}" method="post" target="_top">
<div>
#if($RelayState)<input type="hidden" name="RelayState" value="${RelayState}"/>#end
diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml
index e6d708eca..efeb2a4be 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -175,7 +175,8 @@
<artifactId>maven-hyperjaxb3-plugin</artifactId>
<version>0.5.6</version>
<executions>
- <execution>
+ <execution>
+ <phase>generate-sources</phase>
<goals>
<goal>generate</goal>
</goals>