[weld-commits] Weld SVN: r4808 - cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck and 1 other directories.

[weld-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2009-11-08 19:02:53 -0500 (Sun, 08 Nov 2009)
New Revision: 4808

Modified:
   cdi-tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Managers.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DeploymentError.java
   core/trunk/porting-package/src/main/java/org/jboss/weld/tck/ManagersImpl.java
Log:
CDITCK-47

Modified: cdi-tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Managers.java
===================================================================
--- cdi-tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Managers.java	2009-11-09 00:02:21 UTC (rev 4807)
+++ cdi-tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Managers.java	2009-11-09 00:02:53 UTC (rev 4808)
@@ -40,7 +40,7 @@
    public boolean isDefinitionError(DeploymentException deploymentException);
 
    /**
-    * Checks whether there is a deployment error, as described in Section 2.8,
+    * Checks whether there is a deployment problem, as described in Section 2.8,
     * "Problems detected automatically by the container".
     * 
     * @param deploymentException the deployment exception context provided by
@@ -49,6 +49,6 @@
     *           error
     * @return true if there is a deployment error
     */
-   public boolean isDeploymentError(DeploymentException deploymentException);
+   public boolean isDeploymentProblem(DeploymentException deploymentException);
 
 }

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java	2009-11-09 00:02:21 UTC (rev 4807)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java	2009-11-09 00:02:53 UTC (rev 4808)
@@ -173,7 +173,7 @@
       {
          return new DeploymentException(deploymentException, new DefinitionError(deploymentException.getCause()));
       }
-      else if (getCurrentConfiguration().getManagers().isDeploymentError(deploymentException))
+      else if (getCurrentConfiguration().getManagers().isDeploymentProblem(deploymentException))
       {
          return new DeploymentException(deploymentException, new DeploymentError(deploymentException.getCause()));
       }

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DeploymentError.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DeploymentError.java	2009-11-09 00:02:21 UTC (rev 4807)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/DeploymentError.java	2009-11-09 00:02:53 UTC (rev 4808)
@@ -5,7 +5,7 @@
  * annotation of an @Artifact to detect a deployment error as described in
  * Section 12.4, "Problems detected automatically by the container".
  * 
- * @see org.jboss.jsr299.tck.spi.Managers#isDeploymentError(Throwable)
+ * @see org.jboss.jsr299.tck.spi.Managers#isDeploymentProblem(Throwable)
  */
 public class DeploymentError extends RuntimeException 
 {

Modified: core/trunk/porting-package/src/main/java/org/jboss/weld/tck/ManagersImpl.java
===================================================================
--- core/trunk/porting-package/src/main/java/org/jboss/weld/tck/ManagersImpl.java	2009-11-09 00:02:21 UTC (rev 4807)
+++ core/trunk/porting-package/src/main/java/org/jboss/weld/tck/ManagersImpl.java	2009-11-09 00:02:53 UTC (rev 4808)
@@ -37,7 +37,7 @@
       }
    }
 
-   public boolean isDeploymentError(org.jboss.testharness.api.DeploymentException deploymentException)
+   public boolean isDeploymentProblem(org.jboss.testharness.api.DeploymentException deploymentException)
    {
       return isDeploymentException(deploymentException.getCause());
    }