deltaspike-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gpetra...@apache.org
Subject deltaspike git commit: DELTASPIKE-852 improved naming
Date Sun, 22 Mar 2015 21:52:24 GMT
Repository: deltaspike
Updated Branches:
  refs/heads/master abacdec10 -> 5af230eb2


DELTASPIKE-852 improved naming


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/5af230eb
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/5af230eb
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/5af230eb

Branch: refs/heads/master
Commit: 5af230eb2ae66ea20f7d89d4d6dba43c66ef41a8
Parents: abacdec
Author: gpetracek <gpetracek@apache.org>
Authored: Sun Mar 22 22:39:30 2015 +0100
Committer: gpetracek <gpetracek@apache.org>
Committed: Sun Mar 22 22:39:30 2015 +0100

----------------------------------------------------------------------
 .../deltaspike/core/api/config/base/CoreBaseConfig.java      | 4 ++--
 .../deltaspike/core/api/provider/BeanManagerProvider.java    | 2 +-
 .../impl/scope/window/DefaultWindowContextQuotaHandler.java  | 2 +-
 .../apache/deltaspike/jsf/api/config/base/JsfBaseConfig.java | 6 +++---
 .../jsf/spi/scope/window/DefaultClientWindowConfig.java      | 2 +-
 .../apache/deltaspike/jsf/impl/util/ClientWindowHelper.java  | 4 ++--
 .../java/org/apache/deltaspike/jsf/impl/util/JsfUtils.java   | 2 +-
 .../apache/deltaspike/scheduler/impl/CdiAwareJobFactory.java | 2 +-
 .../deltaspike/scheduler/impl/SchedulerBaseConfig.java       | 2 +-
 .../apache/deltaspike/scheduler/impl/SchedulerExtension.java | 2 +-
 .../deltaspike/test/scheduler/custom/CustomConfigSource.java | 2 +-
 .../test/scheduler/custom/CustomDeactivatedConfigSource.java | 2 +-
 .../deltaspike/testcontrol/api/junit/CdiTestRunner.java      | 2 +-
 .../deltaspike/testcontrol/api/junit/CdiTestSuiteRunner.java | 2 +-
 .../deltaspike/testcontrol/api/junit/TestBaseConfig.java     | 4 ++--
 .../testcontrol/impl/mock/AbstractMockManager.java           | 8 ++++----
 .../deltaspike/testcontrol/impl/mock/DefaultMockFilter.java  | 4 ++--
 17 files changed, 26 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/5af230eb/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/base/CoreBaseConfig.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/base/CoreBaseConfig.java
b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/base/CoreBaseConfig.java
index 30a6846..b7b69e9 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/base/CoreBaseConfig.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/base/CoreBaseConfig.java
@@ -20,7 +20,7 @@ package org.apache.deltaspike.core.api.config.base;
 
 public interface CoreBaseConfig
 {
-    interface BeanManager
+    interface BeanManagerDelegation
     {
         TypedConfig<Boolean> DELEGATE_LOOKUP =
             new TypedConfig<Boolean>("deltaspike.bean-manager.delegate_lookup", Boolean.TRUE);
@@ -40,7 +40,7 @@ public interface CoreBaseConfig
 
     interface Scope
     {
-        interface Window
+        interface WindowRestriction
         {
             TypedConfig<Integer> MAX_COUNT =
                 new TypedConfig<Integer>("deltaspike.scope.window.max-count", 1024);

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/5af230eb/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/BeanManagerProvider.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/BeanManagerProvider.java
b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/BeanManagerProvider.java
index 1ac383e..5aae787 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/BeanManagerProvider.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/BeanManagerProvider.java
@@ -76,7 +76,7 @@ public class BeanManagerProvider implements Extension
         Method resolvedCdiBeanManagerMethod = null;
         //only init methods if a cdi 1.1+ container is available and the delegation-mode
isn't deactivated.
         //deactivation is e.g. useful if owb is used in "parallel mode" in a weld-based server.
-        if (cdiClass != null && !CoreBaseConfig.BeanManager.DELEGATE_LOOKUP.getValue())
+        if (cdiClass != null && !CoreBaseConfig.BeanManagerDelegation.DELEGATE_LOOKUP.getValue())
         {
 
             try

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/5af230eb/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/DefaultWindowContextQuotaHandler.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/DefaultWindowContextQuotaHandler.java
b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/DefaultWindowContextQuotaHandler.java
index 0ffaba6..8e8eed4 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/DefaultWindowContextQuotaHandler.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/DefaultWindowContextQuotaHandler.java
@@ -41,7 +41,7 @@ public class DefaultWindowContextQuotaHandler implements WindowContextQuotaHandl
     @PostConstruct
     protected void init()
     {
-        this.maxWindowContextCount = CoreBaseConfig.Scope.Window.MAX_COUNT.getValue();
+        this.maxWindowContextCount = CoreBaseConfig.Scope.WindowRestriction.MAX_COUNT.getValue();
     }
 
     public synchronized /*no issue due to session-scoped instance*/ void checkWindowContextQuota(String
windowId)

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/5af230eb/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/base/JsfBaseConfig.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/base/JsfBaseConfig.java
b/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/base/JsfBaseConfig.java
index 1b68900..734f395 100644
--- a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/base/JsfBaseConfig.java
+++ b/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/base/JsfBaseConfig.java
@@ -42,17 +42,17 @@ public interface JsfBaseConfig
 
     interface Scope
     {
-        interface Window
+        interface WindowRestriction
         {
             TypedConfig<Integer> MAX_COUNT =
-                new TypedConfig<Integer>(CoreBaseConfig.Scope.Window.MAX_COUNT.getKey(),
64);
+                new TypedConfig<Integer>(CoreBaseConfig.Scope.WindowRestriction.MAX_COUNT.getKey(),
64);
 
             //10 is enough for the integer generated by DefaultClientWindow#generateNewWindowId
- see DELTASPIKE-752
             TypedConfig<Integer> ID_MAX_LENGTH =
                 new TypedConfig<Integer>("deltaspike.window-id.max_length", 10);
         }
 
-        interface View
+        interface ViewDelegation
         {
             TypedConfig<Boolean> DELEGATE_TO_JSF =
                 new TypedConfig<Boolean>("deltaspike.scope.view.delegate", Boolean.TRUE);

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/5af230eb/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/spi/scope/window/DefaultClientWindowConfig.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/spi/scope/window/DefaultClientWindowConfig.java
b/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/spi/scope/window/DefaultClientWindowConfig.java
index 325bd06..c4cfaa0 100644
--- a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/spi/scope/window/DefaultClientWindowConfig.java
+++ b/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/spi/scope/window/DefaultClientWindowConfig.java
@@ -81,7 +81,7 @@ public class DefaultClientWindowConfig implements ClientWindowConfig
     protected void init()
     {
         this.defaultClientWindowRenderMode = this.jsfModuleConfig.getDefaultWindowMode();
-        this.maxWindowContextCount = JsfBaseConfig.Scope.Window.MAX_COUNT.getValue();
+        this.maxWindowContextCount = JsfBaseConfig.Scope.WindowRestriction.MAX_COUNT.getValue();
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/5af230eb/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/ClientWindowHelper.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/ClientWindowHelper.java
b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/ClientWindowHelper.java
index 7025e0c..b1ef2d8 100644
--- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/ClientWindowHelper.java
+++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/ClientWindowHelper.java
@@ -163,9 +163,9 @@ public abstract class ClientWindowHelper
 
     public static int getMaxWindowIdLength()
     {
-        int result = JsfBaseConfig.Scope.Window.ID_MAX_LENGTH.getValue();
+        int result = JsfBaseConfig.Scope.WindowRestriction.ID_MAX_LENGTH.getValue();
 
-        if (result > JsfBaseConfig.Scope.Window.ID_MAX_LENGTH.getDefaultValue())
+        if (result > JsfBaseConfig.Scope.WindowRestriction.ID_MAX_LENGTH.getDefaultValue())
         {
             if (LOG.isLoggable(Level.WARNING))
             {

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/5af230eb/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/JsfUtils.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/JsfUtils.java
b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/JsfUtils.java
index 0cfb85e..803fbd2 100644
--- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/JsfUtils.java
+++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/JsfUtils.java
@@ -362,7 +362,7 @@ public abstract class JsfUtils
     public static boolean isViewScopeDelegationEnabled()
     {
         return ClassUtils.tryToLoadClassForName("javax.faces.view.ViewScoped") != null &&
-            JsfBaseConfig.Scope.View.DELEGATE_TO_JSF.getValue();
+            JsfBaseConfig.Scope.ViewDelegation.DELEGATE_TO_JSF.getValue();
     }
 
     public static void logWrongModuleUsage(String name)

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/5af230eb/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/CdiAwareJobFactory.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/CdiAwareJobFactory.java
b/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/CdiAwareJobFactory.java
index 5aaa8ee..05909aa 100644
--- a/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/CdiAwareJobFactory.java
+++ b/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/CdiAwareJobFactory.java
@@ -32,7 +32,7 @@ public class CdiAwareJobFactory implements JobFactory
 
     public CdiAwareJobFactory()
     {
-        String defaultJobFactoryName = SchedulerBaseConfig.Job.DEFAULT_JOB_FACTORY_CLASS_NAME.getValue();
+        String defaultJobFactoryName = SchedulerBaseConfig.JobCustomization.DEFAULT_JOB_FACTORY_CLASS_NAME.getValue();
 
         defaultFactory = ClassUtils.tryToInstantiateClassForName(defaultJobFactoryName, JobFactory.class);
     }

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/5af230eb/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/SchedulerBaseConfig.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/SchedulerBaseConfig.java
b/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/SchedulerBaseConfig.java
index 9df4575..63f33e1 100644
--- a/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/SchedulerBaseConfig.java
+++ b/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/SchedulerBaseConfig.java
@@ -23,7 +23,7 @@ import org.apache.deltaspike.core.api.config.base.TypedConfig;
 //keep it in the impl. module for now, because it's mainly quartz specific config
 public interface SchedulerBaseConfig
 {
-    interface Job
+    interface JobCustomization
     {
         //don't type it to class to keep quartz optional
         TypedConfig<String> DEFAULT_JOB_FACTORY_CLASS_NAME =

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/5af230eb/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/SchedulerExtension.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/SchedulerExtension.java
b/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/SchedulerExtension.java
index a296473..05ea9c2 100644
--- a/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/SchedulerExtension.java
+++ b/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/SchedulerExtension.java
@@ -59,7 +59,7 @@ public class SchedulerExtension implements Extension, Deactivatable
 
         if (this.isActivated)
         {
-            String jobClassName = SchedulerBaseConfig.Job.JOB_CLASS_NAME.getValue();
+            String jobClassName = SchedulerBaseConfig.JobCustomization.JOB_CLASS_NAME.getValue();
 
             this.jobClass = ClassUtils.tryToLoadClassForName(jobClassName);
 

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/5af230eb/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/CustomConfigSource.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/CustomConfigSource.java
b/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/CustomConfigSource.java
index b8dada0..aa6947c 100644
--- a/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/CustomConfigSource.java
+++ b/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/CustomConfigSource.java
@@ -29,7 +29,7 @@ public class CustomConfigSource implements ConfigSource
 {
     private Map<String, String> config = new HashMap<String, String>()
     {{
-        put(SchedulerBaseConfig.Job.JOB_CLASS_NAME.getKey(), CustomJob.class.getName());
+        put(SchedulerBaseConfig.JobCustomization.JOB_CLASS_NAME.getKey(), CustomJob.class.getName());
         put(ClassDeactivator.class.getName(), QuartzDeactivator.class.getName());
     }};
 

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/5af230eb/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/CustomDeactivatedConfigSource.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/CustomDeactivatedConfigSource.java
b/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/CustomDeactivatedConfigSource.java
index 3b336b0..4129b6b 100644
--- a/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/CustomDeactivatedConfigSource.java
+++ b/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/CustomDeactivatedConfigSource.java
@@ -29,7 +29,7 @@ public class CustomDeactivatedConfigSource implements ConfigSource
 {
     private Map<String, String> config = new HashMap<String, String>()
     {{
-            put(SchedulerBaseConfig.Job.JOB_CLASS_NAME.getKey(), CustomJob.class.getName());
+            put(SchedulerBaseConfig.JobCustomization.JOB_CLASS_NAME.getKey(), CustomJob.class.getName());
             put(SchedulerBaseConfig.Lifecycle.START_SCOPES_PER_JOB.getKey(), Boolean.FALSE.toString());
             put(ClassDeactivator.class.getName(), QuartzDeactivator.class.getName());
     }};

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/5af230eb/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java
b/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java
index 48525e3..09114b7 100644
--- a/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java
+++ b/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java
@@ -82,7 +82,7 @@ public class CdiTestRunner extends BlockJUnit4ClassRunner
 
     static
     {
-        USE_TEST_CLASS_AS_CDI_BEAN = TestBaseConfig.Container.USE_TEST_CLASS_AS_CDI_BEAN.getValue();
+        USE_TEST_CLASS_AS_CDI_BEAN = TestBaseConfig.ContainerIntegration.USE_TEST_CLASS_AS_CDI_BEAN.getValue();
     }
 
     private static ThreadLocal<Boolean> automaticScopeHandlingActive = new ThreadLocal<Boolean>();

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/5af230eb/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestSuiteRunner.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestSuiteRunner.java
b/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestSuiteRunner.java
index c7e7d8e..1c849e0 100644
--- a/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestSuiteRunner.java
+++ b/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestSuiteRunner.java
@@ -63,7 +63,7 @@ public class CdiTestSuiteRunner extends Suite
 
     static
     {
-        STOP_CONTAINER = TestBaseConfig.Container.STOP_CONTAINER.getValue();
+        STOP_CONTAINER = TestBaseConfig.ContainerIntegration.STOP_CONTAINER.getValue();
     }
 
     public CdiTestSuiteRunner(Class<?> klass, RunnerBuilder builder) throws InitializationError

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/5af230eb/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/TestBaseConfig.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/TestBaseConfig.java
b/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/TestBaseConfig.java
index 482f7b5..416f940 100644
--- a/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/TestBaseConfig.java
+++ b/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/TestBaseConfig.java
@@ -22,7 +22,7 @@ import org.apache.deltaspike.core.api.config.base.TypedConfig;
 
 public interface TestBaseConfig
 {
-    interface Container
+    interface ContainerIntegration
     {
         //default is false to improve the compatibility with @Before and @After
         TypedConfig<Boolean> USE_TEST_CLASS_AS_CDI_BEAN =
@@ -32,7 +32,7 @@ public interface TestBaseConfig
             new TypedConfig<Boolean>("deltaspike.testcontrol.stop_container", Boolean.TRUE);
     }
 
-    interface Mock
+    interface MockIntegration
     {
         TypedConfig<Boolean> ALLOW_MOCKED_BEANS =
                 new TypedConfig<Boolean>("deltaspike.testcontrol.mock-support.allow_mocked_beans",
Boolean.FALSE);

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/5af230eb/deltaspike/modules/test-control/impl/src/main/java/org/apache/deltaspike/testcontrol/impl/mock/AbstractMockManager.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/test-control/impl/src/main/java/org/apache/deltaspike/testcontrol/impl/mock/AbstractMockManager.java
b/deltaspike/modules/test-control/impl/src/main/java/org/apache/deltaspike/testcontrol/impl/mock/AbstractMockManager.java
index 898177c..f252e9c 100644
--- a/deltaspike/modules/test-control/impl/src/main/java/org/apache/deltaspike/testcontrol/impl/mock/AbstractMockManager.java
+++ b/deltaspike/modules/test-control/impl/src/main/java/org/apache/deltaspike/testcontrol/impl/mock/AbstractMockManager.java
@@ -35,13 +35,13 @@ public abstract class AbstractMockManager implements DynamicMockManager
     public void addMock(Object mockInstance, Annotation... qualifiers)
     {
         //check if this method gets used without changing the default-config
-        if (!TestBaseConfig.Mock.ALLOW_MOCKED_BEANS.getValue() &&
-            !TestBaseConfig.Mock.ALLOW_MOCKED_PRODUCERS.getValue())
+        if (!TestBaseConfig.MockIntegration.ALLOW_MOCKED_BEANS.getValue() &&
+            !TestBaseConfig.MockIntegration.ALLOW_MOCKED_PRODUCERS.getValue())
         {
             throw new IllegalStateException("The support for mocked CDI-Beans is disabled
" +
                 "due to a reduced portability across different CDI-implementations. " +
-                "Please set '" + TestBaseConfig.Mock.ALLOW_MOCKED_BEANS.getKey() + "' and/or
'" +
-                TestBaseConfig.Mock.ALLOW_MOCKED_PRODUCERS.getKey() + "' to 'true' " +
+                "Please set '" + TestBaseConfig.MockIntegration.ALLOW_MOCKED_BEANS.getKey()
+ "' and/or '" +
+                TestBaseConfig.MockIntegration.ALLOW_MOCKED_PRODUCERS.getKey() + "' to 'true'
" +
                 "(in 'META-INF/apache-deltaspike.properties') on your test-classpath.");
         }
 

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/5af230eb/deltaspike/modules/test-control/impl/src/main/java/org/apache/deltaspike/testcontrol/impl/mock/DefaultMockFilter.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/test-control/impl/src/main/java/org/apache/deltaspike/testcontrol/impl/mock/DefaultMockFilter.java
b/deltaspike/modules/test-control/impl/src/main/java/org/apache/deltaspike/testcontrol/impl/mock/DefaultMockFilter.java
index 92ff3da..3276cf2 100644
--- a/deltaspike/modules/test-control/impl/src/main/java/org/apache/deltaspike/testcontrol/impl/mock/DefaultMockFilter.java
+++ b/deltaspike/modules/test-control/impl/src/main/java/org/apache/deltaspike/testcontrol/impl/mock/DefaultMockFilter.java
@@ -97,11 +97,11 @@ public class DefaultMockFilter implements MockFilter
         if ((annotated instanceof AnnotatedMethod || annotated instanceof AnnotatedField)
&&
                 annotated.getAnnotation(Produces.class) != null)
         {
-            return TestBaseConfig.Mock.ALLOW_MOCKED_PRODUCERS.getValue();
+            return TestBaseConfig.MockIntegration.ALLOW_MOCKED_PRODUCERS.getValue();
         }
         else
         {
-            return TestBaseConfig.Mock.ALLOW_MOCKED_BEANS.getValue();
+            return TestBaseConfig.MockIntegration.ALLOW_MOCKED_BEANS.getValue();
         }
     }
 


Mime
View raw message