Merge branch 'merge' into moa-2.1-Snapshot

7 files changed, 22 insertions, 14 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>
diff --git a/pom.xml b/pom.xml
index bed1565c6..e7dff64f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
 				<moa-id-version>2.1.1</moa-id-version>

 				<moa-id-proxy-version>2.0.0</moa-id-proxy-version>

         <moa-spss-version>2.0.2</moa-spss-version>

-				<configtool-version>1.1.2</configtool-version>

+				<configtool-version>1.1.3</configtool-version>

 				<demo-oa-version>2.0.2</demo-oa-version>

     </properties>