Moved origin properties file to classpath.

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@469 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 36a9b6f..3f95d45 100755 (executable)
--- a/src/edu/internet2/middleware/shibboleth/aa/AAServlet.java
+++ b/src/edu/internet2/middleware/shibboleth/aa/AAServlet.java
@@ -78,6 +78,7 @@ import edu.internet2.middleware.eduPerson.Init;
 import edu.internet2.middleware.shibboleth.aa.arp.ArpEngine;
 import edu.internet2.middleware.shibboleth.aa.arp.ArpException;
 import edu.internet2.middleware.shibboleth.common.AuthNPrincipal;
+import edu.internet2.middleware.shibboleth.common.ShibResource;
 import edu.internet2.middleware.shibboleth.hs.HandleRepository;
 import edu.internet2.middleware.shibboleth.hs.HandleRepositoryException;
 import edu.internet2.middleware.shibboleth.hs.HandleRepositoryFactory;
@@ -165,7 +166,7 @@ public class AAServlet extends HttpServlet {
                        "edu.internet2.middleware.shibboleth.aaLocal.EchoCtxFactory");
                defaultProps.setProperty(
                        "edu.internet2.middleware.shibboleth.hs.provider.CryptoHandleRepository.keyStorePath",
-                       getServletContext().getRealPath("/WEB-INF/conf/handle.jks"));
+                       getServletContext().getRealPath("/conf/handle.jks"));
 
                //Load from file
                Properties properties = new Properties(defaultProps);
@@ -175,7 +176,7 @@ public class AAServlet extends HttpServlet {
                }
                try {
                        log.debug("Loading Configuration from (" + propertiesFileLocation + ").");
-                       properties.load(getServletContext().getResourceAsStream(propertiesFileLocation));
+                       properties.load(new ShibResource(propertiesFileLocation, this.getClass()).getInputStream());
                } catch (IOException e) {
                        log.error("Could not load AA servlet configuration: " + e);
                        throw new AAException("Could not load AA servlet configuration.");
@@ -186,9 +187,7 @@ public class AAServlet extends HttpServlet {
                        PrintStream debugPrinter = new PrintStream(debugStream);
                        properties.list(debugPrinter);
                        log.debug(
-                               "Runtime configuration parameters: "
-                                       + System.getProperty("line.separator")
-                                       + debugStream.toString());
+                               "Runtime configuration parameters: " + System.getProperty("line.separator") + debugStream.toString());
                }
 
                return properties;

diff --git a/src/edu/internet2/middleware/shibboleth/hs/HandleServlet.java b/src/edu/internet2/middleware/shibboleth/hs/HandleServlet.java
index a512c3b..5b5e0da 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/hs/HandleServlet.java
+++ b/src/edu/internet2/middleware/shibboleth/hs/HandleServlet.java
@@ -85,6 +85,7 @@ import edu.internet2.middleware.shibboleth.common.AuthNPrincipal;
 import edu.internet2.middleware.shibboleth.common.Constants;
 import edu.internet2.middleware.shibboleth.common.ShibPOSTProfile;
 import edu.internet2.middleware.shibboleth.common.ShibPOSTProfileFactory;
+import edu.internet2.middleware.shibboleth.common.ShibResource;
 
 public class HandleServlet extends HttpServlet {
 
@@ -111,11 +112,11 @@ public class HandleServlet extends HttpServlet {
                Properties properties = new Properties(defaultProps);
                String propertiesFileLocation = getInitParameter("OriginPropertiesFile");
                if (propertiesFileLocation == null) {
-                       propertiesFileLocation = "/WEB-INF/conf/origin.properties";
+                       propertiesFileLocation = "/conf/origin.properties";
                }
                try {
                        log.debug("Loading Configuration from (" + propertiesFileLocation + ").");
-                       properties.load(getServletContext().getResourceAsStream(propertiesFileLocation));
+                       properties.load(new ShibResource(propertiesFileLocation, this.getClass()).getInputStream());
                } catch (IOException e) {
                        log.error("Could not load HS servlet configuration: " + e);
                        throw new HSConfigurationException("Could not load HS servlet configuration.");

diff --git a/webApplication/WEB-INF/classes/conf/log4j.properties b/webApplication/WEB-INF/classes/conf/log4j.properties
new file mode 100755 (executable)
index 0000000..26e426c
--- /dev/null
+++ b/webApplication/WEB-INF/classes/conf/log4j.properties
@@ -0,0 +1,32 @@
+##
+#
+# Shibboleth Log4J configuration
+#
+##
+
+
+#
+
+log4j.rootCategory=DEBUG, stdout
+log4j.logger.org.apache.xml.security=OFF
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%-5p %-41X{serviceId} %d{ISO8601} (%c:%L) - %m%n
+
+
+# The following block represents an example of how to direct logging output to a file.
+
+#log4j.rootCategory=INFO, file
+#log4j.logger.org.apache.xml.security=OFF
+#log4j.logger.org.opensaml=OFF
+#log4j.appender.file=org.apache.log4j.RollingFileAppender
+#log4j.appender.file.File=/var/log/shib.log
+#log4j.appender.file.MaxFileSize=100KB
+#log4j.appender.file.MaxBackupIndex=1
+#log4j.appender.file.layout=org.apache.log4j.PatternLayout
+#log4j.appender.file.layout.ConversionPattern=%-5p %-41X{serviceId} %d{ISO8601} - %m%n
+
+
+# Uncomment the following line to enable verbose debugging output concerning log4j initialization.
+
+#log4j.debug=TRUE
\ No newline at end of file

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