[jboss-cvs] JBossAS SVN: r81636 - in projects/jboss-deployers/branches/Branch_2_0: deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency and 1 other directory.

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

Author: alesj
Date: 2008-11-26 10:00:17 -0500 (Wed, 26 Nov 2008)
New Revision: 81636

Modified:
   projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentAliasesDeployer.java
   projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentDependencyDeployer.java
   projects/jboss-deployers/branches/Branch_2_0/pom.xml
Log:
Update libs.
Fix void + null check.

Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentAliasesDeployer.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentAliasesDeployer.java	2008-11-26 14:55:27 UTC (rev 81635)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentAliasesDeployer.java	2008-11-26 15:00:17 UTC (rev 81636)
@@ -52,7 +52,7 @@
    private class DeploymentAliasDeploymentVisitor extends AbstractDeploymentVisitor<Object, DeploymentAliases>
    {
       @Override
-      protected DeploymentUnit addComponent(DeploymentUnit unit, Object attachment)
+      protected void addComponent(DeploymentUnit unit, Object attachment)
       {
          ControllerContext context = unit.getAttachment(ControllerContext.class);
          if (context == null)
@@ -62,7 +62,6 @@
          try
          {
             controller.addAlias(attachment, contextName);
-            return null;
          }
          catch (Throwable t)
          {
@@ -78,7 +77,11 @@
 
       protected List<Object> getComponents(DeploymentAliases deployment)
       {
-         return new ArrayList<Object>(deployment.getAliases());
+         Set<Object> aliases = deployment.getAliases();
+         if (aliases != null && aliases.isEmpty() == false)
+            return new ArrayList<Object>(aliases);
+         else
+            return Collections.emptyList();
       }
 
       protected Class<Object> getComponentType()

Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentDependencyDeployer.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentDependencyDeployer.java	2008-11-26 14:55:27 UTC (rev 81635)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentDependencyDeployer.java	2008-11-26 15:00:17 UTC (rev 81636)
@@ -32,7 +32,7 @@
 
 /**
  * DeploymentDependencyDeployer.
- * 
+ *
  * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
  */
 public class DeploymentDependencyDeployer extends AbstractRealDeployerWithInput<DeploymentDependencies>
@@ -46,10 +46,9 @@
    private class DependencyItemComponentVisitor extends AbstractDeploymentVisitor<DependencyItem, DeploymentDependencies>
    {
       @Override
-      protected DeploymentUnit addComponent(DeploymentUnit unit, DependencyItem attachment)
+      protected void addComponent(DeploymentUnit unit, DependencyItem attachment)
       {
          unit.addIDependOn(attachment);
-         return null;
       }
 
       @Override
@@ -60,7 +59,11 @@
 
       protected List<? extends DependencyItem> getComponents(DeploymentDependencies deployment)
       {
-         return new ArrayList<DependencyItem>(deployment.getDependencies());
+         Set<DependencyItem> items = deployment.getDependencies();
+         if (items != null && items.isEmpty() == false)
+            return new ArrayList<DependencyItem>(items);
+         else
+            return Collections.emptyList();
       }
 
       protected Class<DependencyItem> getComponentType()

Modified: projects/jboss-deployers/branches/Branch_2_0/pom.xml
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/pom.xml	2008-11-26 14:55:27 UTC (rev 81635)
+++ projects/jboss-deployers/branches/Branch_2_0/pom.xml	2008-11-26 15:00:17 UTC (rev 81636)
@@ -21,17 +21,17 @@
   </scm>
 
   <properties>
-    <version.jboss.man>2.0.0.CR4</version.jboss.man>
+    <version.jboss.man>2.0.0.GA</version.jboss.man>
     <version.jboss.mdr>2.0.1.GA</version.jboss.mdr>
-    <version.jboss.microcontainer>2.0.0.CR4</version.jboss.microcontainer>
-    <version.jboss.classloader>2.0.0.CR5</version.jboss.classloader>
+    <version.jboss.microcontainer>2.0.0.GA</version.jboss.microcontainer>
+    <version.jboss.classloader>2.0.0.GA</version.jboss.classloader>
     <version.jboss.classloading.spi>5.0.0.CR2</version.jboss.classloading.spi>
     <version.jboss.common.core>2.2.9.GA</version.jboss.common.core>
     <version.jboss.logging.spi>2.0.5.GA</version.jboss.logging.spi>
     <version.jboss.logging.log4j>2.0.5.GA</version.jboss.logging.log4j>
     <version.jbossxb>2.0.0.GA</version.jbossxb>
-    <version.jboss.aop>2.0.0.GA</version.jboss.aop>
-    <version.jboss.vfs>2.0.0.CR5</version.jboss.vfs>
+    <version.jboss.aop>2.0.0.SP1</version.jboss.aop>
+    <version.jboss.vfs>2.0.0.GA</version.jboss.vfs>
     <version.org.jboss.test>1.1.1.GA</version.org.jboss.test>
     <version.junit>4.4</version.junit>
     <version.javassist>3.9.0.GA</version.javassist>