[jboss-cvs] JBossAS SVN: r86529 - in branches/Branch_5_x: main and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Mar 31 07:43:36 EDT 2009
Author: ALRubinger
Date: 2009-03-31 07:43:36 -0400 (Tue, 31 Mar 2009)
New Revision: 86529
Removed:
branches/Branch_5_x/main/src/main/org/jboss/system/NoAnnotationURLClassLoader.java
branches/Branch_5_x/main/src/main/org/jboss/system/server/
Modified:
branches/Branch_5_x/component-matrix/pom.xml
branches/Branch_5_x/main/build.xml
branches/Branch_5_x/main/src/assembly/run.xml
branches/Branch_5_x/main/src/main/org/jboss/Main.java
Log:
[JBAS-6698][EMB-21] Use ServerLoader, NoAnnotationURLClassLoader from jboss-bootstrap, remove these from jboss-as-system
Modified: branches/Branch_5_x/component-matrix/pom.xml
===================================================================
--- branches/Branch_5_x/component-matrix/pom.xml 2009-03-31 11:35:46 UTC (rev 86528)
+++ branches/Branch_5_x/component-matrix/pom.xml 2009-03-31 11:43:36 UTC (rev 86529)
@@ -51,7 +51,7 @@
<version.org.jboss.aspects.currentinvocation>1.0.0.GA</version.org.jboss.aspects.currentinvocation>
<version.org.jboss.aspects.remoting>1.0.1.GA</version.org.jboss.aspects.remoting>
<version.org.jboss.aspects.security>1.0.0.GA</version.org.jboss.aspects.security>
- <version.org.jboss.bootstrap>1.0.0-Beta-2</version.org.jboss.bootstrap>
+ <version.org.jboss.bootstrap>1.0.0-Beta-3</version.org.jboss.bootstrap>
<version.org.jboss.aspects.transaction>1.0.0.GA</version.org.jboss.aspects.transaction>
<version.org.jboss.cache.core>3.1.0.BETA2</version.org.jboss.cache.core>
<version.org.jboss.cache.pojo>3.0.0.GA</version.org.jboss.cache.pojo>
Modified: branches/Branch_5_x/main/build.xml
===================================================================
--- branches/Branch_5_x/main/build.xml 2009-03-31 11:35:46 UTC (rev 86528)
+++ branches/Branch_5_x/main/build.xml 2009-03-31 11:43:36 UTC (rev 86529)
@@ -174,6 +174,8 @@
</fileset>
<!-- Add some classes from Bootstrap -->
<fileset dir="${inflated.dir}">
+ <include name="org/jboss/bootstrap/NoAnnotationURLClassLoader.class"/>
+ <include name="org/jboss/bootstrap/ServerLoader.class"/>
<include name="org/jboss/bootstrap/spi/Server.class"/>
<include name="org/jboss/bootstrap/spi/ServerConfig.class"/>
<include name="org/jboss/bootstrap/spi/util/ServerConfigUtil.class"/>
Modified: branches/Branch_5_x/main/src/assembly/run.xml
===================================================================
--- branches/Branch_5_x/main/src/assembly/run.xml 2009-03-31 11:35:46 UTC (rev 86528)
+++ branches/Branch_5_x/main/src/assembly/run.xml 2009-03-31 11:43:36 UTC (rev 86529)
@@ -28,6 +28,8 @@
<unpack>true</unpack>
<unpackOptions>
<includes>
+ <include>org/jboss/bootstrap/NoAnnotationURLClassLoader.class</include>
+ <include>org/jboss/bootstrap/ServerLoader.class</include>
<include>org/jboss/bootstrap/spi/Server.class</include>
<include>org/jboss/bootstrap/spi/ServerConfig.class</include>
<include>org/jboss/bootstrap/spi/util/ServerConfigUtil.class</include>
Modified: branches/Branch_5_x/main/src/main/org/jboss/Main.java
===================================================================
--- branches/Branch_5_x/main/src/main/org/jboss/Main.java 2009-03-31 11:35:46 UTC (rev 86528)
+++ branches/Branch_5_x/main/src/main/org/jboss/Main.java 2009-03-31 11:43:36 UTC (rev 86529)
@@ -33,10 +33,10 @@
import java.util.List;
import java.util.Properties;
+import org.jboss.bootstrap.ServerLoader;
import org.jboss.bootstrap.spi.Server;
import org.jboss.bootstrap.spi.ServerConfig;
import org.jboss.bootstrap.spi.util.ServerConfigUtil;
-import org.jboss.system.server.ServerLoader;
/**
* Provides a command line interface to start the JBoss server.
Deleted: branches/Branch_5_x/main/src/main/org/jboss/system/NoAnnotationURLClassLoader.java
===================================================================
--- branches/Branch_5_x/main/src/main/org/jboss/system/NoAnnotationURLClassLoader.java 2009-03-31 11:35:46 UTC (rev 86528)
+++ branches/Branch_5_x/main/src/main/org/jboss/system/NoAnnotationURLClassLoader.java 2009-03-31 11:43:36 UTC (rev 86529)
@@ -1,120 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.system;
-
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.net.URLStreamHandlerFactory;
-
-/**
- * A URL classloader to avoid URL annotation of classes in RMI
- *
- * @author <a href="mailto:Adrian.Brock at HappeningTimes.com">Adrian Brock</a>
- * @version $Revision$
- */
-public class NoAnnotationURLClassLoader
- extends URLClassLoader
-{
- /** The value returned by {@link getURLs}. */
- private static final URL[] EMPTY_URL_ARRAY = {};
-
- /**
- * Create a classloader with the context classloader as parent
- *
- * @param urls the urls
- * @return the classloader
- */
- public static NoAnnotationURLClassLoader createClassLoader(URL... urls)
- {
- return createClassLoader(Thread.currentThread().getContextClassLoader(), urls);
- }
-
- /**
- * Create a classloader
- *
- * @param parent the parent classloader
- * @param urls the urls
- * @return the classloader
- */
- public static NoAnnotationURLClassLoader createClassLoader(ClassLoader parent, URL... urls)
- {
- return new NoAnnotationURLClassLoader(urls, parent);
- }
-
- /**
- * Construct a <tt>URLClassLoader</tt>
- *
- * @param urls the URLs to load classes from.
- */
- public NoAnnotationURLClassLoader(URL[] urls)
- {
- super(urls);
- }
-
- /**
- * Construct a <tt>URLClassLoader</tt>
- *
- * @param urls the URLs to load classes from.
- * @param parent the parent classloader.
- */
- public NoAnnotationURLClassLoader(URL[] urls, ClassLoader parent)
- {
- super(urls, parent);
- }
-
- /**
- * Construct a <tt>URLClassLoader</tt>
- *
- * @param urls the URLs to load classes from.
- * @param parent the parent classloader.
- * @param factory the url stream factory.
- */
- public NoAnnotationURLClassLoader(URL[] urls, ClassLoader parent,
- URLStreamHandlerFactory factory)
- {
- super(urls, parent, factory);
- }
-
- /**
- * Return all library URLs
- *
- * <p>Do not remove this method without running the WebIntegrationTestSuite
- * @return the urls
- */
- public URL[] getAllURLs()
- {
- return super.getURLs();
- }
-
- /**
- * Return an empty URL array to force the RMI marshalling subsystem to
- * use the <tt>java.server.codebase</tt> property as the annotated codebase.
- *
- * <p>Do not remove this method without discussing it on the dev list.
- *
- * @return Empty URL[]
- */
- public URL[] getURLs()
- {
- return EMPTY_URL_ARRAY;
- }
-}
More information about the jboss-cvs-commits
mailing list