Config to Classpath.

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

diff --git a/src/edu/internet2/middleware/shibboleth/hs/HandleServlet.java b/src/edu/internet2/middleware/shibboleth/hs/HandleServlet.java
index dec11bf..0baa28b 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/hs/HandleServlet.java
+++ b/src/edu/internet2/middleware/shibboleth/hs/HandleServlet.java
@@ -169,8 +169,10 @@ public class HandleServlet extends HttpServlet {
                        KeyStore keyStore = KeyStore.getInstance("JKS");
 
                        keyStore.load(
-                               getServletContext().getResourceAsStream(
-                                       configuration.getProperty("edu.internet2.middleware.shibboleth.hs.HandleServlet.keyStorePath")),
+                               new ShibResource(
+                                       configuration.getProperty("edu.internet2.middleware.shibboleth.hs.HandleServlet.keyStorePath"),
+                                       this.getClass())
+                                       .getInputStream(),
                                configuration
                                        .getProperty("edu.internet2.middleware.shibboleth.hs.HandleServlet.keyStorePassword")
                                        .toCharArray());

diff --git a/webApplication/WEB-INF/conf/keystore.jks b/webApplication/WEB-INF/classes/conf/keystore.jks
similarity index 100%
rename from webApplication/WEB-INF/conf/keystore.jks
rename to webApplication/WEB-INF/classes/conf/keystore.jks

diff --git a/webApplication/WEB-INF/classes/conf/origin.properties b/webApplication/WEB-INF/classes/conf/origin.properties
index b4edc6e..162c9a5 100755 (executable)
--- a/webApplication/WEB-INF/classes/conf/origin.properties
+++ b/webApplication/WEB-INF/classes/conf/origin.properties
@@ -23,7 +23,7 @@ edu.internet2.middleware.shibboleth.hs.provider.CryptoHandleRepository.keyStoreP
        
 edu.internet2.middleware.shibboleth.hs.BaseHandleRepository.handleTTL = 10000
 edu.internet2.middleware.shibboleth.hs.HandleServlet.issuer = shib2.internet2.edu
-edu.internet2.middleware.shibboleth.hs.HandleServlet.keyStorePath = /WEB-INF/conf/keystore.jks
+edu.internet2.middleware.shibboleth.hs.HandleServlet.keyStorePath = /conf/keystore.jks
 edu.internet2.middleware.shibboleth.hs.HandleServlet.authenticationDomain = shibdev.edu
 edu.internet2.middleware.shibboleth.hs.HandleServlet.AAUrl = http://snc.cc.columbia.edu/shibboleth/AA
 edu.internet2.middleware.shibboleth.hs.HandleServlet.keyStorePassword = shibhs