[jboss-cvs] JBossAS SVN: r102415 - in trunk: component-matrix and 4 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Mon Mar 15 12:35:06 EDT 2010


Author: alesj
Date: 2010-03-15 12:35:04 -0400 (Mon, 15 Mar 2010)
New Revision: 102415

Removed:
   trunk/system/src/main/java/org/jboss/system/deployers/TempInMemoryClassesDeployer.java
Modified:
   trunk/build/build.xml
   trunk/build/pom.xml
   trunk/component-matrix/pom.xml
   trunk/main/src/main/java/org/jboss/Main.java
   trunk/server/src/etc/conf/all/bootstrap/deployers.xml
   trunk/testsuite/build.xml
Log:
[JBAS-7501]; update MC libs - Classpool 1.0.0.Alpha4, Reflect 2.0.0.Alpha4, Kernel 2.2.0.Alpha9, CL 2.2.0.Alpha4, Deployers 2.2.0.Alpha4, XB 2.2.0.Beta5.

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2010-03-15 16:28:25 UTC (rev 102414)
+++ trunk/build/build.xml	2010-03-15 16:35:04 UTC (rev 102415)
@@ -2069,6 +2069,7 @@
       <fileset refid="org.jboss.integration:jboss-classloading-spi:jar"/>
       <fileset refid="org.jboss.integration:jboss-profileservice-spi:jar"/>
       <fileset refid="org.jboss.classpool:jboss-classpool:jar"/>
+      <fileset refid="org.jboss.classpool:jboss-classpool-scoped:jar"/>
       <fileset refid="org.jboss.classpool:jboss-classpool-jbosscl:jar"/>
       <fileset refid="org.jboss:jboss-reflect:jar"/>
       <fileset refid="org.jboss:jboss-mdr:jar"/>

Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml	2010-03-15 16:28:25 UTC (rev 102414)
+++ trunk/build/pom.xml	2010-03-15 16:35:04 UTC (rev 102415)
@@ -746,6 +746,10 @@
 	    <artifactId>jboss-classpool</artifactId>
     </dependency>
     <dependency>
+     	<groupId>org.jboss.classpool</groupId>
+	    <artifactId>jboss-classpool-scoped</artifactId>
+    </dependency>
+    <dependency>
 	    <groupId>org.jboss.classpool</groupId>
 	    <artifactId>jboss-classpool-jbosscl</artifactId>
     </dependency> 

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2010-03-15 16:28:25 UTC (rev 102414)
+++ trunk/component-matrix/pom.xml	2010-03-15 16:35:04 UTC (rev 102415)
@@ -67,14 +67,14 @@
     <version.org.jboss.bootstrap>2.1.0-alpha-4</version.org.jboss.bootstrap>
     <version.org.jboss.cache.core>3.2.1.GA</version.org.jboss.cache.core>
     <version.org.jboss.cache.pojo>3.0.0.GA</version.org.jboss.cache.pojo>
-    <version.org.jboss.cl>2.2.0.Alpha3</version.org.jboss.cl>
-    <version.org.jboss.classpool>1.0.0.Alpha2</version.org.jboss.classpool>
+    <version.org.jboss.cl>2.2.0.Alpha4</version.org.jboss.cl>
+    <version.org.jboss.classpool>1.0.0.Alpha4</version.org.jboss.classpool>
     <version.org.jboss.cluster.cache.jbc>2.1.2.GA</version.org.jboss.cluster.cache.jbc>
     <version.org.jboss.cluster.cache.spi>2.0.0.GA</version.org.jboss.cluster.cache.spi>
     <version.org.jboss.cluster.client>1.1.1.GA</version.org.jboss.cluster.client>
     <version.org.jboss.cluster.server.api>1.1.1.GA</version.org.jboss.cluster.server.api>
     <version.org.jboss.common.core>2.2.17.GA</version.org.jboss.common.core>
-    <version.org.jboss.deployers>2.2.0.Alpha3</version.org.jboss.deployers>
+    <version.org.jboss.deployers>2.2.0.Alpha4</version.org.jboss.deployers>
     <version.org.jboss.ejb3>1.0.5</version.org.jboss.ejb3>
     <version.org.jboss.ejb3.common.client>1.0.2</version.org.jboss.ejb3.common.client>
     <version.org.jboss.ejb3.core.client>1.2.3</version.org.jboss.ejb3.core.client>
@@ -91,12 +91,12 @@
     <version.org.jboss.ejb3.vfs>1.0.0-alpha-1</version.org.jboss.ejb3.vfs>
     <version.org.jboss.ejb.api>1.0-alpha-1</version.org.jboss.ejb.api>
     <version.org.jboss.integration>6.0.0.Alpha9</version.org.jboss.integration>
-    <version.org.jboss.jbossxb>2.0.2.Beta3</version.org.jboss.jbossxb>
+    <version.org.jboss.jbossxb>2.0.2.Beta5</version.org.jboss.jbossxb>
     <version.org.jboss.jopr>1.4.0.Beta1</version.org.jboss.jopr>
     <version.org.jboss.jpa.deployers>1.0.2-alpha-1</version.org.jboss.jpa.deployers>
     <version.org.jboss.jpa.impl>2.0.0</version.org.jboss.jpa.impl>
     <version.org.jboss.jpa.spi>1.0.0</version.org.jboss.jpa.spi>
-    <version.org.jboss.kernel>2.2.0.Alpha8</version.org.jboss.kernel>
+    <version.org.jboss.kernel>2.2.0.Alpha9</version.org.jboss.kernel>
     <version.org.jboss.logging>2.2.0.CR1</version.org.jboss.logging>
     <version.org.jboss.logging-service-metadata>1.0.0.CR8</version.org.jboss.logging-service-metadata>
     <version.org.jboss.logmanager>1.2.0.CR1</version.org.jboss.logmanager>
@@ -114,7 +114,7 @@
     <version.org.jboss.mod_cluster>1.1.0.Beta1</version.org.jboss.mod_cluster>
     <version.org.jboss.mx>6.0.0.Beta5</version.org.jboss.mx>
     <version.org.jboss.naming>5.0.4.GA</version.org.jboss.naming>
-    <version.org.jboss.reflect>2.2.0.Alpha2</version.org.jboss.reflect>
+    <version.org.jboss.reflect>2.2.0.Alpha4</version.org.jboss.reflect>
     <version.org.jboss.reloaded.naming>0.1.0-alpha-2</version.org.jboss.reloaded.naming>
     <version.org.jboss.reloaded.naming.deployers>0.1.0-alpha-2</version.org.jboss.reloaded.naming.deployers>
     <version.org.jboss.resteasy>2.0-beta-1</version.org.jboss.resteasy>
@@ -1682,14 +1682,20 @@
       
       <dependency>
        	<groupId>org.jboss.classpool</groupId>
-	<artifactId>jboss-classpool</artifactId>
-	<version>${version.org.jboss.classpool}</version>
+	    <artifactId>jboss-classpool</artifactId>
+	    <version>${version.org.jboss.classpool}</version>
       </dependency>
 
       <dependency>
-	<groupId>org.jboss.classpool</groupId>
-	<artifactId>jboss-classpool-jbosscl</artifactId>
-	<version>${version.org.jboss.classpool}</version>
+       	<groupId>org.jboss.classpool</groupId>
+	    <artifactId>jboss-classpool-scoped</artifactId>
+	    <version>${version.org.jboss.classpool}</version>
+      </dependency>
+
+      <dependency>
+	    <groupId>org.jboss.classpool</groupId>
+	    <artifactId>jboss-classpool-jbosscl</artifactId>
+	    <version>${version.org.jboss.classpool}</version>
       </dependency> 
 
       <dependency>

Modified: trunk/main/src/main/java/org/jboss/Main.java
===================================================================
--- trunk/main/src/main/java/org/jboss/Main.java	2010-03-15 16:28:25 UTC (rev 102414)
+++ trunk/main/src/main/java/org/jboss/Main.java	2010-03-15 16:35:04 UTC (rev 102415)
@@ -107,7 +107,7 @@
          "jboss-bootstrap-api.jar",
          // Microcontainer
          "javassist.jar", "jboss-reflect.jar", "jboss-mdr.jar", "jboss-dependency.jar", "jboss-kernel.jar",
-         "jboss-metatype.jar", "jboss-managed.jar", "javax.inject.jar", "jboss-classpool.jar", "jboss-classpool-jbosscl.jar",
+         "jboss-metatype.jar", "jboss-managed.jar", "javax.inject.jar", "jboss-classpool.jar", "jboss-classpool-scoped.jar", "jboss-classpool-jbosscl.jar",
          // Fixme ClassLoading
          "jboss-vfs.jar", "jboss-classloading-spi.jar", "jboss-classloader.jar", "jboss-classloading.jar",
          "jboss-classloading-vfs.jar",
@@ -178,6 +178,9 @@
       if (useUnorderedSequence == null)
          System.setProperty("xb.builder.useUnorderedSequence", "true");
 
+      // Workaround for http://community.jboss.org/message/532042#532042 // TODO -- remove this after XB update/resolution
+      System.setProperty("xb.builder.repeatableParticleHandlers", "false");
+
       // First process the command line to pickup custom props/settings
       processCommandLine(args);
 

Modified: trunk/server/src/etc/conf/all/bootstrap/deployers.xml
===================================================================
--- trunk/server/src/etc/conf/all/bootstrap/deployers.xml	2010-03-15 16:28:25 UTC (rev 102414)
+++ trunk/server/src/etc/conf/all/bootstrap/deployers.xml	2010-03-15 16:35:04 UTC (rev 102415)
@@ -260,5 +260,5 @@
       <property name="system"><inject bean="ClassLoaderSystem"/></property>
    </bean>
    
-   <bean name="InMemoryClassesDeployer" class="org.jboss.system.deployers.TempInMemoryClassesDeployer"/>
+   <bean name="InMemoryClassesDeployer" class="org.jboss.deployers.vfs.plugins.classloader.InMemoryClassesDeployer"/>
 </deployment>

Deleted: trunk/system/src/main/java/org/jboss/system/deployers/TempInMemoryClassesDeployer.java
===================================================================
--- trunk/system/src/main/java/org/jboss/system/deployers/TempInMemoryClassesDeployer.java	2010-03-15 16:28:25 UTC (rev 102414)
+++ trunk/system/src/main/java/org/jboss/system/deployers/TempInMemoryClassesDeployer.java	2010-03-15 16:35:04 UTC (rev 102415)
@@ -1,142 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2008, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt 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.deployers;
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.net.URL;
-import java.util.concurrent.Executors;
-
-import org.jboss.classloading.spi.metadata.ClassLoadingMetaData;
-import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.DeploymentStages;
-import org.jboss.deployers.vfs.spi.deployer.AbstractVFSRealDeployer;
-import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-import org.jboss.util.id.GUID;
-import org.jboss.vfs.TempFileProvider;
-import org.jboss.vfs.VFS;
-import org.jboss.vfs.VirtualFile;
-
-/**
- * Temporary until deployers 2.2.0.Alpha4 is out..
- *
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @author <a href="ales.justin at jboss.com">Ales Justin</a>
- * @version $Revision: 1.1 $
- */
-public class TempInMemoryClassesDeployer extends AbstractVFSRealDeployer
-{
-   /** The name of the dynamic class root */
-   public static final String DYNAMIC_CLASS_URL_KEY = "DYNAMIC_CLASS_URL_KEY";
-
-   /** The name of the dynamic class root */
-   public static final String DYNAMIC_CLASS_KEY = "DYNAMIC_CLASS_KEY";
-
-   /** The name of the mount closeable handle */
-   private static final String MOUNT_HANDLE_KEY = "MOUNT_HANDLE_KEY";
-
-   /** The temp file provider */
-   private TempFileProvider tempFileProvider = TempFileProvider.create("vfsinmemory", Executors.newScheduledThreadPool(2));
-
-   public TempInMemoryClassesDeployer() throws IOException
-   {
-      // Make it run before the classloader describe deployer
-      setStage(DeploymentStages.DESCRIBE);
-      setOutput(ClassLoadingMetaData.class);
-      setTopLevelOnly(true);
-      
-      log.warn(this.getClass().getName() + " should be replaced in deployers.xml by org.jboss.deployers.vfs.plugins.classloader.InMemoryClassesDeployer once jboss-deployers 2.2.0.Alpha4 is released");
-   }
-
-   /**
-    * Create host name.
-    *
-    * @param unit the deployment unit
-    * @return the host name
-    */
-   protected String createHost(VFSDeploymentUnit unit)
-   {
-      return GUID.asString();
-   }
-
-   public void deploy(VFSDeploymentUnit unit) throws DeploymentException
-   {
-      try
-      {
-         VirtualFile classes = VFS.getChild(createHost(unit));
-         URL dynamicClassRoot = classes.toURL();
-         Closeable closeable = VFS.mountTemp(classes, tempFileProvider);
-         unit.addAttachment(MOUNT_HANDLE_KEY, closeable);
-         unit.addAttachment(DYNAMIC_CLASS_KEY, classes);
-         unit.addAttachment(DYNAMIC_CLASS_URL_KEY, dynamicClassRoot);
-         unit.prependClassPath(classes);
-         log.debug("Dynamic class root for " + unit.getName() + " is " + dynamicClassRoot);
-      }
-      catch (Exception e)
-      {
-         throw new DeploymentException("Error creating dynamic class root", e);
-      }
-   }
-
-   @Override
-   public void undeploy(VFSDeploymentUnit unit)
-   {
-      log.debug("Removing dynamic class root for " + unit.getName());
-      try
-      {
-         unit.removeAttachment(DYNAMIC_CLASS_URL_KEY, URL.class);
-
-         VirtualFile classes = unit.removeAttachment(DYNAMIC_CLASS_KEY, VirtualFile.class);
-         if (classes != null)
-         {
-            unit.removeClassPath(classes);
-         }
-      }
-      finally
-      {
-         try
-         {
-            Closeable closeable = unit.removeAttachment(MOUNT_HANDLE_KEY, Closeable.class);
-            if (closeable != null)
-            {
-               closeable.close();
-            }
-         }
-         catch (Exception e)
-         {
-            log.warn("Error deleting dynamic class root for " + unit.getName(), e);
-         }
-      }
-   }
-
-   /**
-    * The temp file provider.
-    *
-    * @param tempFileProvider temp file provider
-    */
-   public void setTempFileProvider(TempFileProvider tempFileProvider)
-   {
-      if (tempFileProvider == null)
-         throw new IllegalArgumentException("Null temp file provider.");
-      this.tempFileProvider = tempFileProvider;
-   }
-}

Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml	2010-03-15 16:28:25 UTC (rev 102414)
+++ trunk/testsuite/build.xml	2010-03-15 16:35:04 UTC (rev 102415)
@@ -182,6 +182,8 @@
       <fileset refid="org.jboss.aop:jboss-aop-aspects:jar"/>
       <fileset refid="org.jboss.aop:jboss-aop-deployers:jar"/>
       <fileset refid="org.jboss.aop:pluggable-instrumentor:jar"/>
+      <fileset refid="org.jboss.classpool:jboss-classpool:jar"/>
+      <fileset refid="org.jboss.classpool:jboss-classpool-scoped:jar"/>
     </path>
     <path id="org.springframework.classpath">
       <fileset refid="org.springframework:spring-aop:jar"/>




More information about the jboss-cvs-commits mailing list