Author: remy.maucherat(a)jboss.com Date: 2010-01-27 09:57:29 -0500 (Wed, 27 Jan 2010) New Revision: 1375 Modified: trunk/java/org/apache/catalina/startup/CatalinaProperties.java Log: - Also look for catalina.properties without the nesting. Modified: trunk/java/org/apache/catalina/startup/CatalinaProperties.java =================================================================== --- trunk/java/org/apache/catalina/startup/CatalinaProperties.java 2010-01-27 00:09:20 UTC (rev 1374) +++ trunk/java/org/apache/catalina/startup/CatalinaProperties.java 2010-01-27 14:57:29 UTC (rev 1375) @@ -107,6 +107,14 @@ if (is == null) { try { + is = CatalinaProperties.class.getResourceAsStream("catalina.properties"); + } catch (Throwable t) { + // Ignore + } + } + + if (is == null) { + try { is = CatalinaProperties.class.getResourceAsStream ("/org/apache/catalina/startup/catalina.properties"); } catch (Throwable t) {