[2/4] DELTASPIKE-85 cleanup

[gp...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/2e1f60ec/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/activation/TestClassDeactivation.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/activation/TestClassDeactivation.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/activation/TestClassDeactivation.java
index 8193e36..6a117fe 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/activation/TestClassDeactivation.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/activation/TestClassDeactivation.java
@@ -19,7 +19,7 @@
 package org.apache.deltaspike.test.core.impl.activation;
 
 import org.apache.deltaspike.core.api.provider.BeanManagerProvider;
-import org.apache.deltaspike.core.util.ClassDeactivation;
+import org.apache.deltaspike.core.util.ClassDeactivationUtils;
 import org.apache.deltaspike.test.util.ArchiveUtils;
 import org.apache.deltaspike.test.util.FileUtils;
 import org.jboss.arquillian.container.test.api.Deployment;
@@ -75,7 +75,7 @@ public class TestClassDeactivation
     @Test
     public void testActivatedClass()
     {
-        Assert.assertTrue(ClassDeactivation.isActivated(ActivatedClass.class));
+        Assert.assertTrue(ClassDeactivationUtils.isActivated(ActivatedClass.class));
     }
 
     /**
@@ -84,6 +84,6 @@ public class TestClassDeactivation
     @Test
     public void testDeactivatedClass()
     {
-        Assert.assertFalse(ClassDeactivation.isActivated(DeactivatedClass.class));
+        Assert.assertFalse(ClassDeactivationUtils.isActivated(DeactivatedClass.class));
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/2e1f60ec/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/activation/TestClassDeactivator.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/activation/TestClassDeactivator.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/activation/TestClassDeactivator.java
index e5549b7..1e4705d 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/activation/TestClassDeactivator.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/activation/TestClassDeactivator.java
@@ -24,7 +24,7 @@ import org.apache.deltaspike.core.spi.activation.Deactivatable;
 
 /**
  * Test {@link org.apache.deltaspike.core.spi.activation.ClassDeactivator}
- * which is needed to test {@link org.apache.deltaspike.core.util.ClassDeactivation}
+ * which is needed to test {@link org.apache.deltaspike.core.util.ClassDeactivationUtils}
  */
 public class TestClassDeactivator implements ClassDeactivator
 {

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/2e1f60ec/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/SecurityExtension.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/SecurityExtension.java b/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/SecurityExtension.java
index c2c11b6..15c4094 100644
--- a/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/SecurityExtension.java
+++ b/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/SecurityExtension.java
@@ -21,7 +21,7 @@ package org.apache.deltaspike.security.impl;
 
 import org.apache.deltaspike.core.api.metadata.builder.AnnotatedTypeBuilder;
 import org.apache.deltaspike.core.spi.activation.Deactivatable;
-import org.apache.deltaspike.core.util.ClassDeactivation;
+import org.apache.deltaspike.core.util.ClassDeactivationUtils;
 import org.apache.deltaspike.core.util.ClassUtils;
 import org.apache.deltaspike.security.api.SecurityDefinitionException;
 import org.apache.deltaspike.security.api.annotation.Secures;
@@ -268,7 +268,7 @@ public class SecurityExtension implements Extension, Deactivatable
     {
         if (isActivated == null)
         {
-            isActivated = ClassDeactivation.isActivated(getClass());
+            isActivated = ClassDeactivationUtils.isActivated(getClass());
         }
     }
 }
\ No newline at end of file