Merge branch 'currenteidas' into moapid-3.2-opb-redis

Conflicts:
	id/server/modules/moa-id-module-openID/src/test/java/test/at/gv/egovernment/moa/id/auth/oauth/CertTest.java

4 files changed, 15 insertions, 19 deletions

diff --git a/id/moa-spss-container/pom.xml b/id/moa-spss-container/pom.xml
index bddc25f71..824b5c555 100644
--- a/id/moa-spss-container/pom.xml
+++ b/id/moa-spss-container/pom.xml
@@ -12,7 +12,7 @@
   <description>This module holds MOA-SPSS and all required library</description>
   
   <properties>
-		<repositoryPath>${basedir}/../../../repository</repositoryPath>
+		<repositoryPath>${basedir}/../../repository</repositoryPath>
 	</properties>
   
   <repositories>
@@ -35,7 +35,7 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
         	<includes>
-          	<include>${basedir}/../../../repository/MOA/spss/ext_libs/*.jar</include>
+          	<include>${basedir}/../../repository/MOA/spss/ext_libs/*.jar</include>
            </includes>
          </configuration>
       </plugin>
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/CertStoreConfigurationImpl.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/CertStoreConfigurationImpl.java
index dcbec6bf6..d65cea08c 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/CertStoreConfigurationImpl.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/CertStoreConfigurationImpl.java
@@ -47,8 +47,7 @@
 package at.gv.egovernment.moa.id.commons.utils.ssl;
 
 import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.Collections;
 import java.util.Set;
 
 import at.gv.egovernment.moa.logging.Logger;
@@ -56,7 +55,6 @@ import iaik.pki.store.certstore.CertStoreConfiguration;
 import iaik.pki.store.certstore.CertStoreParameters;
 import iaik.pki.store.certstore.CertStoreTypes;
 import iaik.pki.store.certstore.directory.DirectoryCertStoreParameters;
-import iaik.pki.store.certstore.directory.VirtualCertStore;
 
 /**
  * Implementation of interface needed to initialize an IAIK JSSE <code>TrustManager</code>
@@ -132,7 +130,7 @@ public class CertStoreConfigurationImpl extends ObservableImpl
      * @see iaik.pki.store.certstore.directory.DirectoryCertStoreParameters#createNew()
      */
     public boolean createNew() {
-        return false;
+        return true;
     }
 
     /**
@@ -162,10 +160,8 @@ public class CertStoreConfigurationImpl extends ObservableImpl
 	 */
 	@Override
 	public Set getVirtualStores() {
-		//TODO: only for Testing and not complete !!!Ask Harald !!!!
-		
-		Map<String, VirtualCertStore> vCertStore = new HashMap<String, VirtualCertStore>();		
-		return vCertStore.keySet();
+		//TODO: only for Testing and not complete !!!Ask Harald !!!!				
+		return Collections.EMPTY_SET;
 		
 	}
 
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/RevocationConfigurationImpl.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/RevocationConfigurationImpl.java
index 40d081ea4..449f77209 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/RevocationConfigurationImpl.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/RevocationConfigurationImpl.java
@@ -49,8 +49,6 @@ package at.gv.egovernment.moa.id.commons.utils.ssl;
 import java.security.cert.X509Certificate;
 import java.util.Collections;
 import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Set;
 
 import iaik.pki.revocation.RevocationConfiguration;
@@ -98,10 +96,12 @@ public boolean getKeepRevocationInfo() {
 @Override
 public Set getPositiveOCSPResponders() {
 	
-	//TODO: !!!!! ASK Harald !!!!!
-	Map<String, String> test = new HashMap<String, String>();
-	test.put("ALL", "ALL");
-	return test.keySet();
+//	//TODO: !!!!! ASK Harald !!!!!
+//	Map<String, String> test = new HashMap<String, String>();
+//	test.put("ALL", "ALL");
+//	return test.keySet();
+	
+	return Collections.EMPTY_SET;
 }
 
 /* (non-Javadoc)
diff --git a/id/server/modules/moa-id-module-openID/src/test/java/test/at/gv/egovernment/moa/id/auth/oauth/CertTest.java b/id/server/modules/moa-id-module-openID/src/test/java/test/at/gv/egovernment/moa/id/auth/oauth/CertTest.java
index 22c98b152..35bbac6e7 100644
--- a/id/server/modules/moa-id-module-openID/src/test/java/test/at/gv/egovernment/moa/id/auth/oauth/CertTest.java
+++ b/id/server/modules/moa-id-module-openID/src/test/java/test/at/gv/egovernment/moa/id/auth/oauth/CertTest.java
@@ -26,9 +26,6 @@ import java.security.KeyStore;
 import java.security.PrivateKey;
 import java.security.cert.X509Certificate;
 
-import net.oauth.jsontoken.crypto.Signer;
-import net.oauth.jsontoken.crypto.Verifier;
-
 import org.opensaml.xml.security.x509.BasicX509Credential;
 import org.testng.Assert;
 import org.testng.annotations.Test;
@@ -37,6 +34,9 @@ import at.gv.egovernment.moa.id.protocols.oauth20.json.OAuth20SHA256Signer;
 import at.gv.egovernment.moa.id.protocols.oauth20.json.OAuth20SHA256Verifier;
 import at.gv.egovernment.moa.util.KeyStoreUtils;
 
+import net.oauth.jsontoken.crypto.Signer;
+import net.oauth.jsontoken.crypto.Verifier;
+
 public class CertTest {
 	
 	/** KeyStore Path */