[jboss-cvs] JBossAS SVN: r101810 - in projects/jboss-deployers/trunk: deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading and 2 other directories.

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

Author: alesj
Date: 2010-03-04 05:26:57 -0500 (Thu, 04 Mar 2010)
New Revision: 101810

Modified:
   projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/DeploymentMetaData.java
   projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloading/test/DeploymentMetaDataUnitTestCase.java
   projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/classloading/smoke/META-INF/jboss-deployment.xml
   projects/jboss-deployers/trunk/pom.xml
Log:
Update VFS to VFS3.0.0.CR3, use latest XB snapshot.

Modified: projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/DeploymentMetaData.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/DeploymentMetaData.java	2010-03-04 09:13:41 UTC (rev 101809)
+++ projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/DeploymentMetaData.java	2010-03-04 10:26:57 UTC (rev 101810)
@@ -30,8 +30,6 @@
 import org.jboss.deployers.spi.deployer.DeploymentStage;
 import org.jboss.deployers.spi.deployer.DeploymentStageXmlAdapter;
 import org.jboss.deployers.spi.deployer.DeploymentStages;
-import org.jboss.xb.annotations.JBossXmlAdaptedType;
-import org.jboss.xb.annotations.JBossXmlAttribute;
 import org.jboss.xb.annotations.JBossXmlSchema;
 
 /**
@@ -51,22 +49,21 @@
    private boolean lazyStart;
    private Set<FilterMetaData> filters;
 
-   @XmlTransient // TODO -- fix this once XB support it
    public DeploymentStage getRequiredStage()
    {
       return requiredStage;
    }
 
-//   @XmlAttribute(name = "required-stage")
-//   @XmlJavaTypeAdapter(DeploymentStageXmlAdapter.class)
-//   public void setRequiredStage(DeploymentStage requiredStage)
-//   {
-//      if (requiredStage == null)
-//         requiredStage = DeploymentStages.DESCRIBE;
-//
-//      this.requiredStage = requiredStage;
-//   }
+   @XmlAttribute(name = "required-stage")
+   @XmlJavaTypeAdapter(DeploymentStageXmlAdapter.class)
+   public void setRequiredStage(DeploymentStage requiredStage)
+   {
+      if (requiredStage == null)
+         requiredStage = DeploymentStages.DESCRIBE;
 
+      this.requiredStage = requiredStage;
+   }
+
    public boolean isLazyResolve()
    {
       return lazyResolve;

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloading/test/DeploymentMetaDataUnitTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloading/test/DeploymentMetaDataUnitTestCase.java	2010-03-04 09:13:41 UTC (rev 101809)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloading/test/DeploymentMetaDataUnitTestCase.java	2010-03-04 10:26:57 UTC (rev 101810)
@@ -55,7 +55,7 @@
       {
          DeploymentMetaData dmd = du.getAttachment(DeploymentMetaData.class);
          assertNotNull(dmd);
-         assertEquals(DeploymentStages.DESCRIBE, dmd.getRequiredStage()); // TODO - fix this to PRE_
+         assertEquals(DeploymentStages.PRE_DESCRIBE, dmd.getRequiredStage());
          assertTrue(dmd.isLazyResolve());
          assertTrue(dmd.isLazyStart());
          Set<FilterMetaData> filters = dmd.getFilters();

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/classloading/smoke/META-INF/jboss-deployment.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/classloading/smoke/META-INF/jboss-deployment.xml	2010-03-04 09:13:41 UTC (rev 101809)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/classloading/smoke/META-INF/jboss-deployment.xml	2010-03-04 10:26:57 UTC (rev 101810)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:deployment:1.0" required-stage="PRE_DESCRIBE" lazy-resolve="true">
+<deployment xmlns="urn:jboss:deployment:1.0" required-stage="PreDescribe" lazy-resolve="true">
 
     <lazy-start-filter recurse="false">org.foo.bar</lazy-start-filter>
     <lazy-start-filter recurse="true">com.acme.somepackage</lazy-start-filter>

Modified: projects/jboss-deployers/trunk/pom.xml
===================================================================
--- projects/jboss-deployers/trunk/pom.xml	2010-03-04 09:13:41 UTC (rev 101809)
+++ projects/jboss-deployers/trunk/pom.xml	2010-03-04 10:26:57 UTC (rev 101810)
@@ -21,7 +21,7 @@
   </scm>
 
   <properties>
-    <version.jboss.vfs>3.0.0.CR2</version.jboss.vfs>
+    <version.jboss.vfs>3.0.0.CR3</version.jboss.vfs>
     <version.jboss.reflect>2.2.0.Alpha2</version.jboss.reflect>
     <version.jboss.classpool>1.0.0.Alpha2</version.jboss.classpool>
     <version.jboss.man>2.1.1.SP1</version.jboss.man>
@@ -32,7 +32,7 @@
     <version.jboss.common.core>2.2.17.GA</version.jboss.common.core>
     <version.jboss.logging.spi>2.2.0.CR1</version.jboss.logging.spi>
     <version.jboss.logging.log4j>2.2.0.CR1</version.jboss.logging.log4j>
-    <version.jbossxb>2.0.2.Beta4</version.jbossxb>
+    <version.jbossxb>2.0.2-SNAPSHOT</version.jbossxb>
     <version.jboss.aop>2.1.0.CR3</version.jboss.aop>
     <version.org.jboss.test>1.1.1.GA</version.org.jboss.test>
     <version.junit>4.4</version.junit>