User: starksm
Date: 01/05/24 18:05:50
Modified: src/main/org/jboss Tag: Branch_2_2 Main.java
Log:
The JAAS login config file URL should be determined by querying the
class loader for confName/auth.conf, not from the jboss.properties file.
Fix some NPEs in the login modules
Revision Changes Path
No revision
No revision
1.30.2.5 +16 -2 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.30.2.4
retrieving revision 1.30.2.5
diff -u -r1.30.2.4 -r1.30.2.5
--- Main.java 2001/05/24 18:10:31 1.30.2.4
+++ Main.java 2001/05/25 01:05:50 1.30.2.5
@@ -32,7 +32,7 @@
* @see <related>
* @author Rickard Öberg ([EMAIL PROTECTED])
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel O'Connor</a>.
- * @version $Revision: 1.30.2.4 $
+ * @version $Revision: 1.30.2.5 $
*/
public class Main
{
@@ -81,9 +81,23 @@
}
System.out.println("jboss.home = "+System.getProperty("jboss.home"));
+ // Set the JAAS login config file if not already set
+ if( System.getProperty("java.security.auth.login.config") == null )
+ {
+ URL loginConfig =
Main.class.getClassLoader().getResource(confName+"/auth.conf");
+ if( loginConfig != null )
+ {
+ System.getProperty("java.security.auth.login.config",
loginConfig.toExternalForm());
+ System.out.println("Using JAAS LoginConfig:
"+loginConfig.toExternalForm());
+ }
+ else
+ {
+ System.out.println("Warning: no auth.conf found in config="+confName);
+ }
+ }
+
// Set security
URL serverPolicy =
Main.class.getClassLoader().getResource(confName+"/server.policy");
-
if ( serverPolicy == null )
{
throw new IOException("server.policy missing");
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
