[jboss-cvs] JBossAS SVN: r111641 - in trunk: main/src/main/java/org/jboss and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jun 20 00:39:12 EDT 2011
Author: alesj
Date: 2011-06-20 00:39:11 -0400 (Mon, 20 Jun 2011)
New Revision: 111641
Modified:
trunk/component-matrix/pom.xml
trunk/main/src/main/java/org/jboss/Main.java
trunk/main/src/main/java/org/jboss/SecurityActions.java
Log:
[JBAS-9211]; fix case sensitive VFS handling by updating to VFS3.0.1.GA.
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2011-06-18 04:09:46 UTC (rev 111640)
+++ trunk/component-matrix/pom.xml 2011-06-20 04:39:11 UTC (rev 111641)
@@ -138,7 +138,7 @@
<version.org.jboss.switchboard.depchain>1.0.0-alpha-15</version.org.jboss.switchboard.depchain>
<version.org.jboss.threads>2.0.0.CR7</version.org.jboss.threads>
<version.org.jboss.threads-metadata>2.0.0.CR4</version.org.jboss.threads-metadata>
- <version.org.jboss.vfs>3.0.0.GA</version.org.jboss.vfs>
+ <version.org.jboss.vfs>3.0.1.GA</version.org.jboss.vfs>
<version.org.jboss.weld>1.1.0.Final</version.org.jboss.weld>
<version.org.jboss.xnio>2.1.0.CR2</version.org.jboss.xnio>
<version.org.jboss.xnio.metadata>2.1.0.CR5</version.org.jboss.xnio.metadata>
Modified: trunk/main/src/main/java/org/jboss/Main.java
===================================================================
--- trunk/main/src/main/java/org/jboss/Main.java 2011-06-18 04:09:46 UTC (rev 111640)
+++ trunk/main/src/main/java/org/jboss/Main.java 2011-06-20 04:39:11 UTC (rev 111641)
@@ -25,19 +25,30 @@
import java.io.File;
import java.io.FilenameFilter;
import java.io.IOException;
-import java.net.*;
-import java.util.*;
+import java.net.InetAddress;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.net.URLDecoder;
+import java.net.URLStreamHandlerFactory;
+import java.net.UnknownHostException;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import gnu.getopt.Getopt;
+import gnu.getopt.LongOpt;
import org.jboss.bootstrap.api.as.config.JBossASServerConfig;
import org.jboss.bootstrap.api.as.server.JBossASServer;
import org.jboss.bootstrap.api.factory.ServerFactory;
import org.jboss.bootstrap.api.lifecycle.LifecycleState;
import org.jboss.bootstrap.spi.as.config.JBossASBasedConfigurationInitializer;
-import gnu.getopt.Getopt;
-import gnu.getopt.LongOpt;
-
/**
* Provides a command line interface to start the JBoss server.
*
@@ -46,6 +57,7 @@
* @author <a href="mailto:adrian.brock at happeningtimes.com">Adrian Brock</a>
* @author <a href="mailto:scott.stark at jboss.org">Scott Stark</a>
* @author <a href="mailto:dimitris at jboss.org">Dimitris Andreadis</a>
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
* @version $Revision$
*/
public class Main
@@ -431,8 +443,7 @@
}
// Make a ClassLoader to be used in loading the server
- final URL[] urlArray = urls.toArray(new URL[]
- {});
+ final URL[] urlArray = urls.toArray(new URL[]{});
final ClassLoader loadingCl = new URLClassLoader(urlArray, tccl);
// Load the server
@@ -454,6 +465,9 @@
// Set the CL
SecurityActions.setThreadContextClassLoader(loadingCl);
+ // Set URL stream handler factory from JBoss Commons
+ setupURLStreamHandlerFactory("org.jboss.net.protocol.URLStreamHandlerFactory", loadingCl);
+
// Initialize the server
server.initialize();
@@ -468,6 +482,26 @@
}
/**
+ * Setup URL stream handler factory.
+ *
+ * @param className the url stream handler factory classname
+ * @param cl the classloader to use to load the ushf class
+ */
+ protected void setupURLStreamHandlerFactory(String className, ClassLoader cl)
+ {
+ try
+ {
+ Class<?> clazz = cl.loadClass(className);
+ URLStreamHandlerFactory ushf = (URLStreamHandlerFactory) clazz.newInstance();
+ SecurityActions.setURLStreamHandlerFactory(ushf);
+ }
+ catch (Throwable t)
+ {
+ System.err.println("Cannot set URLStreamHandlerFactory: " + t);
+ }
+ }
+
+ /**
* Shutdown the booted Server instance.
*
*/
Modified: trunk/main/src/main/java/org/jboss/SecurityActions.java
===================================================================
--- trunk/main/src/main/java/org/jboss/SecurityActions.java 2011-06-18 04:09:46 UTC (rev 111640)
+++ trunk/main/src/main/java/org/jboss/SecurityActions.java 2011-06-20 04:39:11 UTC (rev 111641)
@@ -21,6 +21,8 @@
*/
package org.jboss;
+import java.net.URL;
+import java.net.URLStreamHandlerFactory;
import java.security.AccessController;
import java.security.PrivilegedAction;
@@ -70,8 +72,8 @@
/**
* Obtains the system property with the specified key
*
- * @param key
- * @return
+ * @param key the key
+ * @return system property for key
* @throws IllegalArgumentException If the key is null
*/
static String getSystemProperty(final String key) throws IllegalArgumentException
@@ -109,7 +111,7 @@
/**
* Sets the specified CL upon the current Thread's Context
*
- * @param cl
+ * @param cl the classloader
* @throws IllegalArgumentException If the CL was null
*/
static void setThreadContextClassLoader(final ClassLoader cl) throws IllegalArgumentException
@@ -125,14 +127,14 @@
{
Thread.currentThread().setContextClassLoader(cl);
return null;
- };
+ }
});
}
/**
* Adds the specified shutdown hook
*
- * @param shutdownHook
+ * @param shutdownHook the shutdown hook
*/
static void addShutdownHook(final Thread shutdownHook)
{
@@ -144,6 +146,22 @@
return null;
}
});
+ }
+ /**
+ * Set URL stream handler factory.
+ *
+ * @param ushf the url stream handler factory
+ */
+ static void setURLStreamHandlerFactory(final URLStreamHandlerFactory ushf)
+ {
+ AccessController.doPrivileged(new PrivilegedAction<Void>()
+ {
+ public Void run()
+ {
+ URL.setURLStreamHandlerFactory(ushf);
+ return null;
+ }
+ });
}
}
More information about the jboss-cvs-commits
mailing list