User: starksm Date: 01/11/29 02:02:12 Modified: src/main/org/jboss Tag: Branch_2_4 Main.java Log: We don't need no stinking jboss.properties file. If it exists read it, if not its not a fatal error. Revision Changes Path No revision No revision 1.35.2.17 +3 -4 jboss/src/main/org/jboss/Main.java Index: Main.java =================================================================== RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v retrieving revision 1.35.2.16 retrieving revision 1.35.2.17 diff -u -r1.35.2.16 -r1.35.2.17 --- Main.java 2001/11/28 20:55:04 1.35.2.16 +++ Main.java 2001/11/29 10:02:12 1.35.2.17 @@ -27,7 +27,7 @@ * @author Rickard Öberg ([EMAIL PROTECTED]) * @author <a href="mailto:[EMAIL PROTECTED]">Daniel O'Connor</a>. * @author [EMAIL PROTECTED] - * @version $Revision: 1.35.2.16 $ + * @version $Revision: 1.35.2.17 $ */ public class Main { @@ -68,12 +68,11 @@ // Load system properties URL jbossProps = Main.class.getClassLoader().getResource(confName+"/jboss.properties"); InputStream propertiesIn = Main.class.getClassLoader().getResourceAsStream(confName+"/jboss.properties"); - if ( propertiesIn == null ) + if ( propertiesIn != null ) { - throw new IOException("jboss.properties missing"); + System.getProperties().load(propertiesIn); } - System.getProperties().load(propertiesIn); /* Set a jboss.home property from the location of the Main.class jar if the property does not exist.
_______________________________________________ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development