[jboss-cvs] JBossAS SVN: r111762 - in projects/bootstrap/trunk: build and 20 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Jul 15 13:35:58 EDT 2011


Author: ALRubinger
Date: 2011-07-15 13:35:58 -0400 (Fri, 15 Jul 2011)
New Revision: 111762

Modified:
   projects/bootstrap/trunk/api-as/src/main/java/org/jboss/bootstrap/api/as/config/JBossASServerConfig.java
   projects/bootstrap/trunk/build/pom.xml
   projects/bootstrap/trunk/impl-as/pom.xml
   projects/bootstrap/trunk/impl-as/src/test/resources/jbossas/server/default/
   projects/bootstrap/trunk/impl-base/
   projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/
   projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/config/AbstractBasicConfigurationInitializer.java
   projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/config/AbstractBasicConfigurationValidator.java
   projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/config/AbstractBasicServerConfig.java
   projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/config/SecurityActions.java
   projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/server/AbstractBasicServerInitializer.java
   projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/server/AbstractServer.java
   projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/server/AbstractVersion.java
   projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/server/SecurityActions.java
   projects/bootstrap/trunk/impl-base/src/test/java/org/
   projects/bootstrap/trunk/impl-base/src/test/java/org/jboss/bootstrap/impl/
   projects/bootstrap/trunk/impl-base/src/test/java/org/jboss/bootstrap/impl/base/config/
   projects/bootstrap/trunk/impl-base/src/test/java/org/jboss/bootstrap/impl/base/server/
   projects/bootstrap/trunk/impl-base/src/test/java/org/jboss/bootstrap/impl/base/server/TestNoOpServer.java
   projects/bootstrap/trunk/impl-base/src/test/resources/
   projects/bootstrap/trunk/impl-mc/pom.xml
   projects/bootstrap/trunk/impl-mc/src/main/java/org/jboss/bootstrap/impl/mc/deployer/TempBasicXMLDeployer.java
   projects/bootstrap/trunk/impl-mc/src/main/java/org/jboss/bootstrap/impl/mc/server/AbstractMCServerBase.java
   projects/bootstrap/trunk/main/
   projects/bootstrap/trunk/spi-as/src/main/java/org/jboss/bootstrap/spi/as/config/JBossASBasedConfigurationInitializer.java
   projects/bootstrap/trunk/spi-as/src/main/java/org/jboss/bootstrap/spi/as/metadata/BootstrapMetaData.java
   projects/bootstrap/trunk/spi-as/src/main/resources/schema/
   projects/bootstrap/trunk/spi-test/pom.xml
   projects/bootstrap/trunk/spi/src/main/java/org/jboss/bootstrap/spi/Bootstrap.java
Log:
[JBBOOT-134] Revert ClassPool support for the time being, causing problems when upgraded into AS6.


Property changes on: projects/bootstrap/trunk/api-as/src/main/java/org/jboss/bootstrap/api/as/config/JBossASServerConfig.java
___________________________________________________________________
Deleted: svn:mergeinfo
   - 

Modified: projects/bootstrap/trunk/build/pom.xml
===================================================================
--- projects/bootstrap/trunk/build/pom.xml	2011-07-15 17:11:11 UTC (rev 111761)
+++ projects/bootstrap/trunk/build/pom.xml	2011-07-15 17:35:58 UTC (rev 111762)
@@ -31,10 +31,6 @@
     <version.org.jboss.logging_jboss.logging.spi>2.2.0.CR1</version.org.jboss.logging_jboss.logging.spi>
     <version.org.jboss.kernel_jboss.kernel>2.2.0.GA</version.org.jboss.kernel_jboss.kernel>
     <version.org.jboss_jbossxb>2.0.2.Beta7</version.org.jboss_jbossxb>
-    <version.javassist_javassist>3.12.0.GA</version.javassist_javassist>
-    <version.org.jboss.classpool_jboss.classpool>1.0.0.Alpha6</version.org.jboss.classpool_jboss.classpool>
-    <version.org.jboss.reflect_jboss.reflect>2.2.0.Alpha4</version.org.jboss.reflect_jboss.reflect>
-    <version.org.jboss.cl_jboss.classloading>2.2.0.Alpha4</version.org.jboss.cl_jboss.classloading>
     <version.org.jboss_jboss.common.core>2.2.17.GA</version.org.jboss_jboss.common.core>
     <version.org.jboss_jboss.mdr>2.2.0.Alpha1</version.org.jboss_jboss.mdr>
     <version.junit_junit>4.7</version.junit_junit>
@@ -175,12 +171,6 @@
       </dependency>
 
       <dependency>
-        <groupId>org.jboss.kernel</groupId>
-        <artifactId>jboss-aop-mc-int</artifactId>
-        <version>${version.org.jboss.kernel_jboss.kernel}</version>
-      </dependency>
-
-      <dependency>
         <groupId>org.jboss</groupId>
         <artifactId>jboss-common-core</artifactId>
         <version>${version.org.jboss_jboss.common.core}</version>
@@ -192,43 +182,6 @@
         <version>${version.org.jboss_jboss.mdr}</version>
       </dependency>
 
-      <dependency>
-        <groupId>org.jboss</groupId>
-        <artifactId>jboss-reflect</artifactId>
-        <version>${version.org.jboss.reflect_jboss.reflect}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>javassist</groupId>
-        <artifactId>javassist</artifactId>
-        <version>${version.javassist_javassist}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>javassist</groupId>
-        <artifactId>javassist</artifactId>
-        <version>${version.javassist_javassist}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.jboss.classpool</groupId>
-        <artifactId>jboss-classpool</artifactId>
-        <version>${version.org.jboss.classpool_jboss.classpool}</version>
-      </dependency>
-      
-      <dependency>
-        <groupId>org.jboss.classpool</groupId>
-        <artifactId>jboss-classpool-jbosscl</artifactId>
-        <version>${version.org.jboss.classpool_jboss.classpool}</version>
-      </dependency>
-
-    
-     <dependency>
-       <groupId>org.jboss.cl</groupId>
-       <artifactId>jboss-classloading</artifactId>
-       <version>${version.org.jboss.cl_jboss.classloading}</version>
-     </dependency>
-
     </dependencies>
   </dependencyManagement>
 

Modified: projects/bootstrap/trunk/impl-as/pom.xml
===================================================================
--- projects/bootstrap/trunk/impl-as/pom.xml	2011-07-15 17:11:11 UTC (rev 111761)
+++ projects/bootstrap/trunk/impl-as/pom.xml	2011-07-15 17:35:58 UTC (rev 111762)
@@ -81,12 +81,6 @@
       <version>${version.jetty}</version>
       <scope>test</scope>
     </dependency>
-    
-    <dependency>
-      <groupId>org.jboss.cl</groupId>
-      <artifactId>jboss-classloading</artifactId>
-      <scope>test</scope>
-    </dependency>
 
   </dependencies>
 </project>


Property changes on: projects/bootstrap/trunk/impl-as/src/test/resources/jbossas/server/default
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: projects/bootstrap/trunk/impl-base
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/config/AbstractBasicConfigurationInitializer.java
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/config/AbstractBasicConfigurationValidator.java
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/config/AbstractBasicServerConfig.java
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/config/SecurityActions.java
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/server/AbstractBasicServerInitializer.java
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/server/AbstractServer.java
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/server/AbstractVersion.java
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/server/SecurityActions.java
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: projects/bootstrap/trunk/impl-base/src/test/java/org
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: projects/bootstrap/trunk/impl-base/src/test/java/org/jboss/bootstrap/impl
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: projects/bootstrap/trunk/impl-base/src/test/java/org/jboss/bootstrap/impl/base/config
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: projects/bootstrap/trunk/impl-base/src/test/java/org/jboss/bootstrap/impl/base/server
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: projects/bootstrap/trunk/impl-base/src/test/java/org/jboss/bootstrap/impl/base/server/TestNoOpServer.java
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: projects/bootstrap/trunk/impl-base/src/test/resources
___________________________________________________________________
Deleted: svn:mergeinfo
   - 

Modified: projects/bootstrap/trunk/impl-mc/pom.xml
===================================================================
--- projects/bootstrap/trunk/impl-mc/pom.xml	2011-07-15 17:11:11 UTC (rev 111761)
+++ projects/bootstrap/trunk/impl-mc/pom.xml	2011-07-15 17:35:58 UTC (rev 111762)
@@ -86,35 +86,6 @@
       <groupId>org.jboss.kernel</groupId>
       <artifactId>jboss-kernel</artifactId>
     </dependency>
-    
-    <!-- javassist:javassist -->
-    <dependency>
-      <groupId>javassist</groupId>
-      <artifactId>javassist</artifactId>
-    </dependency>
 
-    <!--  org.jboss.classpool:jboss-classpool -->    
-    <dependency>
-      <groupId>org.jboss.classpool</groupId>
-      <artifactId>jboss-classpool</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.jboss.classpool</groupId>
-      <artifactId>jboss-classpool-jbosscl</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.jboss.kernel</groupId>
-      <artifactId>jboss-aop-mc-int</artifactId>
-      <scope>test</scope>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.jboss.cl</groupId>
-      <artifactId>jboss-classloading</artifactId>
-      <scope>test</scope>
-    </dependency>
-
   </dependencies>
 </project>


Property changes on: projects/bootstrap/trunk/impl-mc/src/main/java/org/jboss/bootstrap/impl/mc/deployer/TempBasicXMLDeployer.java
___________________________________________________________________
Deleted: svn:mergeinfo
   - 

Modified: projects/bootstrap/trunk/impl-mc/src/main/java/org/jboss/bootstrap/impl/mc/server/AbstractMCServerBase.java
===================================================================
--- projects/bootstrap/trunk/impl-mc/src/main/java/org/jboss/bootstrap/impl/mc/server/AbstractMCServerBase.java	2011-07-15 17:11:11 UTC (rev 111761)
+++ projects/bootstrap/trunk/impl-mc/src/main/java/org/jboss/bootstrap/impl/mc/server/AbstractMCServerBase.java	2011-07-15 17:35:58 UTC (rev 111762)
@@ -27,10 +27,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.jboss.beans.metadata.api.model.AutowireType;
-import org.jboss.beans.metadata.api.model.InjectOption;
-import org.jboss.beans.metadata.plugins.AbstractInjectionValueMetaData;
-import org.jboss.beans.metadata.spi.ValueMetaData;
 import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
 import org.jboss.bootstrap.api.config.InvalidConfigurationException;
 import org.jboss.bootstrap.api.config.ServerConfig;
@@ -40,15 +36,12 @@
 import org.jboss.bootstrap.impl.base.server.AbstractServer;
 import org.jboss.bootstrap.impl.mc.deployer.TempBasicXMLDeployer;
 import org.jboss.bootstrap.spi.mc.server.MCBasedServerProvider;
-import org.jboss.classpool.plugins.jbosscl.JBossClClassPoolConfig;
 import org.jboss.kernel.Kernel;
 import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap;
 import org.jboss.kernel.spi.dependency.KernelController;
 import org.jboss.kernel.spi.deployment.KernelDeployment;
 import org.jboss.logging.Logger;
 import org.jboss.managed.api.annotation.ManagementProperty;
-import org.jboss.reflect.plugins.javassist.JavassistTypeInfoFactoryImpl;
-import org.jboss.reflect.plugins.javassist.classpool.RepositoryClassPoolFactory;
 
 /**
  * AbstractMCServerBase
@@ -137,20 +130,19 @@
    // Required Implementations -----------------------------------------------------------||
    //-------------------------------------------------------------------------------------||
 
-   /**
+   /* (non-Javadoc)
     * @see org.jboss.bootstrap.spi.mc.server.MCServer#getKernel()
     */
-   @Override
    @ManagementProperty(ignored = true)
    public Kernel getKernel()
    {
       return this.getBootstrap().getKernel();
    }
 
-   /**
+   /*
+    * (non-Javadoc)
     * @see org.jboss.bootstrap.spi.mc.server.MCBasedServer#getDeployments()
     */
-   @Override
    @ManagementProperty(ignored = true)
    public Map<String, KernelDeployment> getDeployments()
    {
@@ -229,14 +221,6 @@
       setupURLStreamHandlerFactory("org.jboss.net.protocol.URLStreamHandlerFactory", cl);
 
       /*
-       * Make sure we have the correct classpools set up  
-       */
-      //Initialize jboss-reflect to use the correct classpools
-      JBossClClassPoolConfig config = JBossClClassPoolConfig.getInstance();
-      RepositoryClassPoolFactory factory = new RepositoryClassPoolFactory(config.getClassPoolRepository());
-      JavassistTypeInfoFactoryImpl.setPoolFactory(factory);
-
-      /*
        * We need to start the bootstrap here so we can set the kernel
        * before we fire start kernel events 
        */
@@ -244,25 +228,6 @@
 
       // Call Super implementation
       super.doInitialize();
-
-      //Install the bean configuring the classpools
-      BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder("JBossClClassPoolConfig", JBossClClassPoolConfig.class.getName());
-      builder.setFactoryClass(JBossClClassPoolConfig.class.getName());
-      builder.setFactoryMethod("getInstance");
-      ValueMetaData inject = builder.createContextualInject(null, null, AutowireType.BY_NAME, InjectOption.CALLBACK);
-      //TODO add name to BeanMetaDataBuilder
-      ((AbstractInjectionValueMetaData)inject).setValue("ClassLoading");
-      builder.addPropertyMetaData("classLoading", inject);
-      
-      try
-      {
-         getKernel().getController().install(builder.getBeanMetaData());
-      }
-      catch (Throwable e)
-      {
-         // AutoGenerated
-         throw new RuntimeException(e);
-      }
    }
 
    /**


Property changes on: projects/bootstrap/trunk/main
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: projects/bootstrap/trunk/spi/src/main/java/org/jboss/bootstrap/spi/Bootstrap.java
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: projects/bootstrap/trunk/spi-as/src/main/java/org/jboss/bootstrap/spi/as/config/JBossASBasedConfigurationInitializer.java
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: projects/bootstrap/trunk/spi-as/src/main/java/org/jboss/bootstrap/spi/as/metadata/BootstrapMetaData.java
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: projects/bootstrap/trunk/spi-as/src/main/resources/schema
___________________________________________________________________
Deleted: svn:mergeinfo
   - 

Modified: projects/bootstrap/trunk/spi-test/pom.xml
===================================================================
--- projects/bootstrap/trunk/spi-test/pom.xml	2011-07-15 17:11:11 UTC (rev 111761)
+++ projects/bootstrap/trunk/spi-test/pom.xml	2011-07-15 17:35:58 UTC (rev 111762)
@@ -33,6 +33,7 @@
     <version.org.jboss.kernel_jboss.aop.mc.int>2.2.0.Alpha2</version.org.jboss.kernel_jboss.aop.mc.int>
     <version.org.jboss_jbossxb>2.0.2.Beta4</version.org.jboss_jbossxb>
     <version.org.jboss_jboss.common.core>2.2.17.GA</version.org.jboss_jboss.common.core>
+    <version.org.jboss_jboss.reflect>2.0.0.GA</version.org.jboss_jboss.reflect>
     <version.apache_xerces_xml.apis>2.9.1</version.apache_xerces_xml.apis>
     <version.apache_xerces_xercesImpl>2.9.1</version.apache_xerces_xercesImpl>
     <version.wutka_dtdparser_dtdparser121>1.2.1</version.wutka_dtdparser_dtdparser121>
@@ -124,7 +125,7 @@
                 <artifactItem>
                   <groupId>org.jboss</groupId>
                   <artifactId>jboss-reflect</artifactId>
-                  <version>${version.org.jboss.reflect_jboss.reflect}</version>
+                  <version>${version.org.jboss_jboss.reflect}</version>
                 </artifactItem>
                 <artifactItem>
                   <groupId>apache-xerces</groupId>
@@ -202,31 +203,6 @@
                   <artifactId>javassist</artifactId>
                   <version>${version.javassist_javassist}</version>
                 </artifactItem>
-                <artifactItem>
-                  <groupId>org.jboss.classpool</groupId>
-                  <artifactId>jboss-classpool</artifactId>
-                  <version>${version.org.jboss.classpool_jboss.classpool}</version>
-                </artifactItem>
-                <artifactItem>
-                  <groupId>org.jboss.classpool</groupId>
-                  <artifactId>jboss-classpool-jbosscl</artifactId>
-                  <version>${version.org.jboss.classpool_jboss.classpool}</version>
-                </artifactItem>
-                <artifactItem>
-                  <groupId>org.jboss.classpool</groupId>
-                  <artifactId>jboss-classpool-scoped</artifactId>
-                  <version>${version.org.jboss.classpool_jboss.classpool}</version>
-                </artifactItem>
-                <artifactItem>
-                  <groupId>org.jboss.cl</groupId>
-                  <artifactId>jboss-classloading</artifactId>
-                  <version>${version.org.jboss.cl_jboss.classloading}</version>
-                </artifactItem>
-                <artifactItem>
-                  <groupId>org.jboss.cl</groupId>
-                  <artifactId>jboss-classloader</artifactId>
-                  <version>${version.org.jboss.cl_jboss.classloading}</version>
-                </artifactItem>
               </artifactItems>
             </configuration>
           </execution>



More information about the jboss-cvs-commits mailing list