[jboss-cvs] JBossAS SVN: r87596 - in projects/jboss-deployers/trunk: deployers-impl/src/test/java/org/jboss/test/deployers/managed/support and 2 other directories.

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

Author: alesj
Date: 2009-04-20 17:14:46 -0400 (Mon, 20 Apr 2009)
New Revision: 87596

Modified:
   projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/managed/support/TestFields.java
   projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/managed/test/DeployerManagedDeploymentUnitTestCase.java
   projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/test/ManagedObjectClassLoadingParserUnitTestCase.java
   projects/jboss-deployers/trunk/pom.xml
Log:
Update to use Man 2.1.0.CR8

Modified: projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/managed/support/TestFields.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/managed/support/TestFields.java	2009-04-20 21:03:59 UTC (rev 87595)
+++ projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/managed/support/TestFields.java	2009-04-20 21:14:46 UTC (rev 87596)
@@ -60,6 +60,14 @@
          attachment.setProperty(property, value);
          return;
       }
-      throw new UnsupportedOperationException("setField: " + name);
+      else if (name != Fields.MODIFIED)
+      {
+         throw new UnsupportedOperationException("setField: " + name);
+      }
    }
+
+   public Fields copy()
+   {
+      return new TestFields(attachment.clone(), property);
+   }
 }

Modified: projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/managed/test/DeployerManagedDeploymentUnitTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/managed/test/DeployerManagedDeploymentUnitTestCase.java	2009-04-20 21:03:59 UTC (rev 87595)
+++ projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/managed/test/DeployerManagedDeploymentUnitTestCase.java	2009-04-20 21:14:46 UTC (rev 87596)
@@ -371,12 +371,12 @@
       assertEquals("constrainedIntx10", constrainedIntx10.getName());
       assertEquals("Takes an int and multiples by 10", constrainedIntx10.getDescription());
       assertEquals(ManagedOperation.Impact.ReadOnly, constrainedIntx10.getImpact());
-      assertEquals(SimpleMetaType.INTEGER, constrainedIntx10.getReturnType());
+      assertEquals(SimpleMetaType.INTEGER_PRIMITIVE, constrainedIntx10.getReturnType());
       ManagedParameter[] constrainedIntx10Params = constrainedIntx10.getParameters();
       assertEquals("one params", 1, constrainedIntx10Params.length);
       assertEquals("param name", "input", constrainedIntx10Params[0].getName());
       assertEquals("param description", "The int to multiple", constrainedIntx10Params[0].getDescription());
-      assertEquals("param type", SimpleMetaType.INTEGER, constrainedIntx10Params[0].getMetaType());
+      assertEquals("param type", SimpleMetaType.INTEGER_PRIMITIVE, constrainedIntx10Params[0].getMetaType());
       Object min = constrainedIntx10Params[0].getMinimumValue();
       assertEquals("param min is 0", 0, (MetaValue)min);
       assertEquals("param min is 100", 100, (MetaValue)constrainedIntx10Params[0].getMaximumValue());

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/test/ManagedObjectClassLoadingParserUnitTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/test/ManagedObjectClassLoadingParserUnitTestCase.java	2009-04-20 21:03:59 UTC (rev 87595)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/test/ManagedObjectClassLoadingParserUnitTestCase.java	2009-04-20 21:14:46 UTC (rev 87596)
@@ -114,8 +114,8 @@
          assertManagedProperty(mo, "included", String.class, null);
          assertManagedProperty(mo, "excluded", String.class, null);
          assertManagedProperty(mo, "excludedExport", String.class, null);
-         assertManagedProperty(mo, "importAll", Boolean.class, false);
-         assertManagedProperty(mo, "parentFirst", Boolean.class, true);
+         assertManagedProperty(mo, "importAll", boolean.class, false);
+         assertManagedProperty(mo, "parentFirst", boolean.class, true);
          assertManagedProperty(mo, "capabilities", CapabilitiesMetaData.class, new CapabilitiesMetaData());
          assertManagedProperty(mo, "requirements", RequirementsMetaData.class, new RequirementsMetaData());
          

Modified: projects/jboss-deployers/trunk/pom.xml
===================================================================
--- projects/jboss-deployers/trunk/pom.xml	2009-04-20 21:03:59 UTC (rev 87595)
+++ projects/jboss-deployers/trunk/pom.xml	2009-04-20 21:14:46 UTC (rev 87596)
@@ -22,7 +22,7 @@
 
   <properties>
     <version.jboss.vfs>2.2.0.M2</version.jboss.vfs>
-    <version.jboss.man>2.0.0.GA</version.jboss.man>
+    <version.jboss.man>2.1.0.CR8</version.jboss.man>
     <version.jboss.mdr>2.0.1.GA</version.jboss.mdr>
     <version.jboss.microcontainer>2.2.0.M1</version.jboss.microcontainer>
     <version.jboss.classloader>2.2.0.M4</version.jboss.classloader>
@@ -31,7 +31,7 @@
     <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.1.CR1</version.jbossxb>
-    <version.jboss.aop>2.1.0.GA</version.jboss.aop>
+    <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>
     <version.javassist>3.10.0.GA</version.javassist>