Moved to latest OpenSAML.

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@568 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/src/edu/internet2/middleware/shibboleth/aa/AAServlet.java b/src/edu/internet2/middleware/shibboleth/aa/AAServlet.java
index a553222..2e0e902 100755 (executable)
--- a/src/edu/internet2/middleware/shibboleth/aa/AAServlet.java
+++ b/src/edu/internet2/middleware/shibboleth/aa/AAServlet.java
@@ -67,7 +67,6 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.apache.log4j.Logger;
 import org.apache.log4j.MDC;
-import org.opensaml.Init;
 import org.opensaml.QName;
 import org.opensaml.SAMLException;
 import org.opensaml.SAMLIdentifier;
@@ -113,7 +112,6 @@ public class AAServlet extends HttpServlet {
 
                        handleRepository = HandleRepositoryFactory.getInstance(configuration);
 
-                       Init.init();
                        responder = new AAResponder(arpEngine, resolver);
 
                        log.info("Attribute Authority initialization complete.");

diff --git a/src/edu/internet2/middleware/shibboleth/common/Init.java b/src/edu/internet2/middleware/shibboleth/common/Init.java
index 0639757..734401a 100755 (executable)
--- a/src/edu/internet2/middleware/shibboleth/common/Init.java
+++ b/src/edu/internet2/middleware/shibboleth/common/Init.java
@@ -70,7 +70,6 @@ public class Init
 
         initialized = true;
         
-        org.opensaml.Init.init();
         org.opensaml.XML.parserPool.registerSchema(XML.SHIB_NS, XML.SHIB_SCHEMA_ID, new XML.SchemaResolver());
     }
 

diff --git a/src/edu/internet2/middleware/shibboleth/hs/HandleServlet.java b/src/edu/internet2/middleware/shibboleth/hs/HandleServlet.java
index 70aef48..8b0a320 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/hs/HandleServlet.java
+++ b/src/edu/internet2/middleware/shibboleth/hs/HandleServlet.java
@@ -74,7 +74,6 @@ import javax.servlet.http.HttpServletResponse;
 import org.apache.log4j.Logger;
 import org.apache.log4j.MDC;
 import org.doomdark.uuid.UUIDGenerator;
-import org.opensaml.Init;
 import org.opensaml.QName;
 import org.opensaml.SAMLAuthorityBinding;
 import org.opensaml.SAMLBinding;
@@ -174,8 +173,6 @@ public class HandleServlet extends HttpServlet {
                        log.info("Initializing Handle Service.");
                        configuration = loadConfiguration();
 
-                       Init.init();
-
                        initPKI();
 
                        postProfile =

diff --git a/webApplication/WEB-INF/lib/opensaml.jar b/webApplication/WEB-INF/lib/opensaml.jar
index 18a3f9a..a67e341 100644 (file)
Binary files a/webApplication/WEB-INF/lib/opensaml.jar and b/webApplication/WEB-INF/lib/opensaml.jar differ