[jboss-cvs] JBossAS SVN: r111766 - in trunk: main/src/main/java/org/jboss and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: ALRubinger
Date: 2011-07-15 14:10:34 -0400 (Fri, 15 Jul 2011)
New Revision: 111766

Modified:
   trunk/component-matrix/pom.xml
   trunk/main/src/main/java/org/jboss/Main.java
Log:
[JBAS-9417] Upgrade to jboss-bootstrap:2.1.0-alpha-6

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2011-07-15 17:50:43 UTC (rev 111765)
+++ trunk/component-matrix/pom.xml	2011-07-15 18:10:34 UTC (rev 111766)
@@ -76,7 +76,7 @@
     <version.org.jboss.aspects.remoting>1.0.1.GA</version.org.jboss.aspects.remoting>
     <version.org.jboss.aspects.security>1.0.1</version.org.jboss.aspects.security>
     <version.org.jboss.aspects.transaction>1.0.0.GA</version.org.jboss.aspects.transaction>
-    <version.org.jboss.bootstrap>2.1.0-alpha-5</version.org.jboss.bootstrap>
+    <version.org.jboss.bootstrap>2.1.0-alpha-6</version.org.jboss.bootstrap>
     <version.org.jboss.cl>2.2.0.GA</version.org.jboss.cl>
     <version.org.jboss.classpool>1.0.0.GA</version.org.jboss.classpool>
     <version.org.jboss.cluster.client>1.1.2.Final</version.org.jboss.cluster.client>

Modified: trunk/main/src/main/java/org/jboss/Main.java
===================================================================
--- trunk/main/src/main/java/org/jboss/Main.java	2011-07-15 17:50:43 UTC (rev 111765)
+++ trunk/main/src/main/java/org/jboss/Main.java	2011-07-15 18:10:34 UTC (rev 111766)
@@ -465,9 +465,6 @@
          // 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();
 
@@ -482,26 +479,6 @@
    }
 
    /**
-    * 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.
     *
     */