From 59790d25a2a3869fd3d7b86b874c4dafe21fb9d7 Mon Sep 17 00:00:00 2001
From: Andreas Fitzek <andreas.fitzek@iaik.tugraz.at>
Date: Thu, 27 Jun 2013 15:17:32 +0200
Subject: Change entitiesDescriptor trust lookup, changed version to
 1.9.90-SNAPSHOT

---
 id/server/auth/pom.xml                                            | 4 ++--
 id/server/idserverlib/pom.xml                                     | 8 +++++++-
 .../moa/id/protocols/pvp2x/signer/CredentialProvider.java         | 4 ++--
 .../moa/id/protocols/pvp2x/verification/EntityVerifier.java       | 2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'id')

diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index e403c5ba7..f4e72fea4 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -9,7 +9,7 @@
 	<groupId>MOA.id.server</groupId>
 	<artifactId>moa-id-auth</artifactId>
 	<packaging>war</packaging>
-	<version>1.5.2</version>
+	<version>1.9.90-SNAPSHOT</version>
 	<name>MOA ID-Auth WebService</name>
 	
 	<properties>
@@ -72,7 +72,7 @@
 		<dependency>
 			<groupId>MOA.id.server</groupId>
 			<artifactId>moa-id-lib</artifactId>
-			<!--version>${project.version}</version -->
+			<version>${project.version}</version>
 		</dependency>
 		<!-- transitive dependencies we don't want to include into the war -->
 		<dependency>
diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index 1244d4bd6..9fcdedb7d 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -9,7 +9,7 @@
 	<groupId>MOA.id.server</groupId>
 	<artifactId>moa-id-lib</artifactId>
 	<packaging>jar</packaging>
-	<version>1.5.2</version>
+	<version>1.9.90-SNAPSHOT</version>
 	<name>MOA ID API</name>
 
 	<properties>
@@ -117,6 +117,12 @@
 			<groupId>edu.internet2.middleware</groupId>
 			<artifactId>shibboleth-common</artifactId>
 			<version>1.4.0</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>logback-classic</artifactId>
+					<groupId>ch.qos.logback</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>regexp</groupId>
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/signer/CredentialProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/signer/CredentialProvider.java
index 5f9f4d63b..9385c945f 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/signer/CredentialProvider.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/signer/CredentialProvider.java
@@ -83,7 +83,7 @@ public class CredentialProvider {
 		
 		return credential;
 	}
-	
+	/*
 	public static Credential getTrustedCredential() throws CredentialsNotAvailableException {
 		String filename = PVPConfiguration.getInstance().getTrustEntityCertificate("sp.crt");
 		
@@ -107,5 +107,5 @@ public class CredentialProvider {
 		credential.setPublicKey(cert.getPublicKey());
 		
 		return credential;
-	}
+	}*/
 }
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/verification/EntityVerifier.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/verification/EntityVerifier.java
index 5bd0878a4..d3acf9351 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/verification/EntityVerifier.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/verification/EntityVerifier.java
@@ -54,7 +54,7 @@ public class EntityVerifier {
 			throw new SAMLRequestNotSignedException(e);
 		}
 		
-		Credential credential = CredentialProvider.getTrustedCredential();
+		Credential credential = CredentialProvider.getSPTrustedCredential(entityDescriptor.getName());
 		if(credential == null) {
 			throw new NoCredentialsException("moaID IDP");
 		}
-- 
cgit v1.2.3