You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by gp...@apache.org on 2015/05/08 20:58:13 UTC
[2/2] deltaspike git commit: DELTASPIKE-852 unified naming of
base-config interfaces
DELTASPIKE-852 unified naming of base-config interfaces
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/67ac8c94
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/67ac8c94
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/67ac8c94
Branch: refs/heads/master
Commit: 67ac8c940ca5e6866ccd5cfe7daf4700ae7fc1ab
Parents: f0fde69
Author: gpetracek <gp...@apache.org>
Authored: Fri May 8 20:46:12 2015 +0200
Committer: gpetracek <gp...@apache.org>
Committed: Fri May 8 20:46:12 2015 +0200
----------------------------------------------------------------------
.../deltaspike/core/api/config/base/CoreBaseConfig.java | 9 ++++-----
.../deltaspike/core/api/provider/BeanManagerProvider.java | 2 +-
.../core/impl/exclude/extension/ExcludeExtension.java | 2 +-
.../core/impl/interceptor/GlobalInterceptorExtension.java | 2 +-
.../org/apache/deltaspike/core/impl/jmx/MBeanExtension.java | 2 +-
.../impl/scope/window/DefaultWindowContextQuotaHandler.java | 2 +-
.../deltaspike/jsf/api/config/base/JsfBaseConfig.java | 7 ++++---
.../org/apache/deltaspike/jsf/api/config/view/Folder.java | 2 +-
.../org/apache/deltaspike/jsf/api/config/view/View.java | 6 +++---
.../apache/deltaspike/jsf/api/literal/FolderLiteral.java | 2 +-
.../org/apache/deltaspike/jsf/api/literal/ViewLiteral.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/QuartzScheduler.java | 6 +++---
.../deltaspike/scheduler/impl/SchedulerBaseConfig.java | 2 +-
.../scheduler/custom/CustomDeactivatedConfigSource.java | 2 +-
17 files changed, 30 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/67ac8c94/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 1074679..113ca21 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
@@ -22,7 +22,7 @@ import org.apache.deltaspike.core.api.config.ConfigResolver;
public interface CoreBaseConfig extends DeltaSpikeBaseConfig
{
- interface BeanManagerDelegation
+ interface BeanManagerIntegration
{
Boolean DELEGATE_LOOKUP =
ConfigResolver.resolve("deltaspike.bean-manager.delegate_lookup")
@@ -32,7 +32,7 @@ public interface CoreBaseConfig extends DeltaSpikeBaseConfig
.getValue();
}
- interface Interceptor
+ interface InterceptorCustomization
{
Integer PRIORITY =
ConfigResolver.resolve("deltaspike.interceptor.priority")
@@ -42,7 +42,7 @@ public interface CoreBaseConfig extends DeltaSpikeBaseConfig
.getValue();
}
- interface MBean
+ interface MBeanIntegration
{
Boolean AUTO_UNREGISTER =
ConfigResolver.resolve("deltaspike.mbean.auto-unregister")
@@ -52,7 +52,7 @@ public interface CoreBaseConfig extends DeltaSpikeBaseConfig
.getValue();
}
- interface Scope
+ interface ScopeCustomization
{
interface WindowRestriction
{
@@ -64,7 +64,6 @@ public interface CoreBaseConfig extends DeltaSpikeBaseConfig
.withCurrentProjectStage(true)
.withDefault(1024)
.getValue();
-
}
}
}
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/67ac8c94/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 992a42b..56986da 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.BeanManagerDelegation.DELEGATE_LOOKUP)
+ if (cdiClass != null && !CoreBaseConfig.BeanManagerIntegration.DELEGATE_LOOKUP)
{
try
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/67ac8c94/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
index 7287e74..ea3eb29 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
@@ -118,7 +118,7 @@ public class ExcludeExtension implements Extension, Deactivatable
if (isGlobalAlternativeActivated)
{
- int priorityValue = CoreBaseConfig.Interceptor.PRIORITY;
+ int priorityValue = CoreBaseConfig.InterceptorCustomization.PRIORITY;
priorityAnnotationInstance = AnnotationInstanceUtils.getPriorityAnnotationInstance(priorityValue);
}
}
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/67ac8c94/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/interceptor/GlobalInterceptorExtension.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/interceptor/GlobalInterceptorExtension.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/interceptor/GlobalInterceptorExtension.java
index 03e53c9..05796d5 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/interceptor/GlobalInterceptorExtension.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/interceptor/GlobalInterceptorExtension.java
@@ -47,7 +47,7 @@ public class GlobalInterceptorExtension implements Deactivatable, Extension
return;
}
- int priorityValue = CoreBaseConfig.Interceptor.PRIORITY;
+ int priorityValue = CoreBaseConfig.InterceptorCustomization.PRIORITY;
priorityAnnotationInstance = AnnotationInstanceUtils.getPriorityAnnotationInstance(priorityValue);
}
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/67ac8c94/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/MBeanExtension.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/MBeanExtension.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/MBeanExtension.java
index 6f2fc4d..d07cbce 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/MBeanExtension.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/MBeanExtension.java
@@ -122,7 +122,7 @@ public class MBeanExtension implements Extension, Deactivatable
final Annotation[] qualifiers = qualifiers(bean.getAnnotatedBeanClass(), bm);
final DynamicMBeanWrapper mbean = new DynamicMBeanWrapper(clazz, normalScoped, qualifiers);
final MBeanServer server = mBeanServer();
- if (server.isRegistered(objectName) && CoreBaseConfig.MBean.AUTO_UNREGISTER)
+ if (server.isRegistered(objectName) && CoreBaseConfig.MBeanIntegration.AUTO_UNREGISTER)
{
server.unregisterMBean(objectName);
}
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/67ac8c94/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 d91006d..928333e 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.WindowRestriction.MAX_COUNT;
+ this.maxWindowContextCount = CoreBaseConfig.ScopeCustomization.WindowRestriction.MAX_COUNT;
}
public synchronized /*no issue due to session-scoped instance*/ void checkWindowContextQuota(String windowId)
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/67ac8c94/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 deb23c3..c41dcaf 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
@@ -26,7 +26,7 @@ import org.apache.deltaspike.jsf.api.config.view.View;
public interface JsfBaseConfig extends DeltaSpikeBaseConfig
{
- interface ViewConfig
+ interface ViewConfigCustomization
{
String CUSTOM_DEFAULT_BASE_PATH_BUILDER = ConfigResolver.resolve(View.DefaultBasePathBuilder.class.getName())
.withCurrentProjectStage(true)
@@ -46,13 +46,14 @@ public interface JsfBaseConfig extends DeltaSpikeBaseConfig
.getValue();
}
- interface Scope
+ interface ScopeCustomization
{
interface WindowRestriction
{
int ID_MAX_LENGTH_DEFAULT = 10;
- Integer MAX_COUNT = ConfigResolver.resolve(CoreBaseConfig.Scope.WindowRestriction.MAX_COUNT_KEY)
+ Integer MAX_COUNT =
+ ConfigResolver.resolve(CoreBaseConfig.ScopeCustomization.WindowRestriction.MAX_COUNT_KEY)
.as(Integer.class)
.withCurrentProjectStage(true)
.withDefault(64)
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/67ac8c94/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/view/Folder.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/view/Folder.java b/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/view/Folder.java
index 93cc5cd..a2c3327 100644
--- a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/view/Folder.java
+++ b/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/view/Folder.java
@@ -114,7 +114,7 @@ public @interface Folder
if (DefaultFolderNameBuilder.class.equals(folder.folderNameBuilder()))
{
String customDefaultFolderNameBuilderClassName =
- JsfBaseConfig.ViewConfig.CUSTOM_DEFAULT_FOLDER_NAME_BUILDER;
+ JsfBaseConfig.ViewConfigCustomization.CUSTOM_DEFAULT_FOLDER_NAME_BUILDER;
if (customDefaultFolderNameBuilderClassName != null)
{
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/67ac8c94/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/view/View.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/view/View.java b/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/view/View.java
index 3e6bbe7..795010e 100644
--- a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/view/View.java
+++ b/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/view/View.java
@@ -242,7 +242,7 @@ public @interface View
if (DefaultBasePathBuilder.class.equals(view.basePathBuilder()))
{
String customDefaultBasePathBuilderClassName =
- JsfBaseConfig.ViewConfig.CUSTOM_DEFAULT_BASE_PATH_BUILDER;
+ JsfBaseConfig.ViewConfigCustomization.CUSTOM_DEFAULT_BASE_PATH_BUILDER;
if (customDefaultBasePathBuilderClassName != null)
{
@@ -267,7 +267,7 @@ public @interface View
if (DefaultFileNameBuilder.class.equals(view.fileNameBuilder()))
{
String customDefaultFileNameBuilderClassName =
- JsfBaseConfig.ViewConfig.CUSTOM_DEFAULT_FILE_NAME_BUILDER;
+ JsfBaseConfig.ViewConfigCustomization.CUSTOM_DEFAULT_FILE_NAME_BUILDER;
if (customDefaultFileNameBuilderClassName != null)
{
@@ -292,7 +292,7 @@ public @interface View
if (DefaultExtensionBuilder.class.equals(view.extensionBuilder()))
{
String customDefaultExtensionBuilderClassName =
- JsfBaseConfig.ViewConfig.CUSTOM_DEFAULT_EXTENSION_BUILDER;
+ JsfBaseConfig.ViewConfigCustomization.CUSTOM_DEFAULT_EXTENSION_BUILDER;
if (customDefaultExtensionBuilderClassName != null)
{
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/67ac8c94/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/literal/FolderLiteral.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/literal/FolderLiteral.java b/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/literal/FolderLiteral.java
index f120ed5..1d47569 100644
--- a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/literal/FolderLiteral.java
+++ b/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/literal/FolderLiteral.java
@@ -48,7 +48,7 @@ public class FolderLiteral extends AnnotationLiteral<Folder> implements Folder
}
final String customDefaultFolderNameBuilderClassName =
- JsfBaseConfig.ViewConfig.CUSTOM_DEFAULT_FOLDER_NAME_BUILDER;
+ JsfBaseConfig.ViewConfigCustomization.CUSTOM_DEFAULT_FOLDER_NAME_BUILDER;
if (customDefaultFolderNameBuilderClassName != null)
{
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/67ac8c94/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/literal/ViewLiteral.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/literal/ViewLiteral.java b/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/literal/ViewLiteral.java
index 1565c67..a87196d 100644
--- a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/literal/ViewLiteral.java
+++ b/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/literal/ViewLiteral.java
@@ -63,7 +63,7 @@ public class ViewLiteral extends AnnotationLiteral<View> implements View
}
final String customDefaultBasePathBuilderClassName =
- JsfBaseConfig.ViewConfig.CUSTOM_DEFAULT_BASE_PATH_BUILDER;
+ JsfBaseConfig.ViewConfigCustomization.CUSTOM_DEFAULT_BASE_PATH_BUILDER;
if (customDefaultBasePathBuilderClassName != null)
{
@@ -76,7 +76,7 @@ public class ViewLiteral extends AnnotationLiteral<View> implements View
final String customDefaultFileNameBuilderClassName =
- JsfBaseConfig.ViewConfig.CUSTOM_DEFAULT_FILE_NAME_BUILDER;
+ JsfBaseConfig.ViewConfigCustomization.CUSTOM_DEFAULT_FILE_NAME_BUILDER;
if (customDefaultFileNameBuilderClassName != null)
{
@@ -89,7 +89,7 @@ public class ViewLiteral extends AnnotationLiteral<View> implements View
final String customDefaultExtensionBuilderClassName =
- JsfBaseConfig.ViewConfig.CUSTOM_DEFAULT_EXTENSION_BUILDER;
+ JsfBaseConfig.ViewConfigCustomization.CUSTOM_DEFAULT_EXTENSION_BUILDER;
if (customDefaultExtensionBuilderClassName != null)
{
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/67ac8c94/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 d3e02b8..3b95fff 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.WindowRestriction.MAX_COUNT;
+ this.maxWindowContextCount = JsfBaseConfig.ScopeCustomization.WindowRestriction.MAX_COUNT;
}
@Override
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/67ac8c94/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 68e6fa6..30cf6f0 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.WindowRestriction.ID_MAX_LENGTH;
+ int result = JsfBaseConfig.ScopeCustomization.WindowRestriction.ID_MAX_LENGTH;
- if (result > JsfBaseConfig.Scope.WindowRestriction.ID_MAX_LENGTH_DEFAULT)
+ if (result > JsfBaseConfig.ScopeCustomization.WindowRestriction.ID_MAX_LENGTH_DEFAULT)
{
if (LOG.isLoggable(Level.WARNING))
{
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/67ac8c94/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 2edb47b..8abad99 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.ViewDelegation.DELEGATE_TO_JSF;
+ JsfBaseConfig.ScopeCustomization.ViewDelegation.DELEGATE_TO_JSF;
}
public static void logWrongModuleUsage(String name)
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/67ac8c94/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/QuartzScheduler.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/QuartzScheduler.java b/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/QuartzScheduler.java
index 74782e1..587acf6 100644
--- a/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/QuartzScheduler.java
+++ b/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/QuartzScheduler.java
@@ -125,13 +125,13 @@ public class QuartzScheduler implements Scheduler<Job>
try
{
this.scheduler = schedulerFactory.getScheduler();
- if (SchedulerBaseConfig.Lifecycle.START_SCOPES_PER_JOB)
+ if (SchedulerBaseConfig.LifecycleIntegration.START_SCOPES_PER_JOB)
{
this.scheduler.getListenerManager().addJobListener(new InjectionAwareJobListener());
}
if (!this.scheduler.isStarted())
{
- this.scheduler.startDelayed(SchedulerBaseConfig.Lifecycle.DELAYED_START_IN_SECONDS);
+ this.scheduler.startDelayed(SchedulerBaseConfig.LifecycleIntegration.DELAYED_START_IN_SECONDS);
}
}
catch (SchedulerException e)
@@ -154,7 +154,7 @@ public class QuartzScheduler implements Scheduler<Job>
{
if (this.scheduler != null && this.scheduler.isStarted())
{
- this.scheduler.shutdown(SchedulerBaseConfig.Lifecycle.FORCE_STOP);
+ this.scheduler.shutdown(SchedulerBaseConfig.LifecycleIntegration.FORCE_STOP);
this.scheduler = null;
}
}
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/67ac8c94/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 0dbc7a0..4a2d16f 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
@@ -46,7 +46,7 @@ public interface SchedulerBaseConfig extends DeltaSpikeBaseConfig
.withDefault("quartz")
.getValue();
- interface Lifecycle
+ interface LifecycleIntegration
{
String START_SCOPES_PER_JOB_KEY = "deltaspike.scheduler.start_scopes_for_jobs";
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/67ac8c94/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 cec57a1..ba1a191 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
@@ -30,7 +30,7 @@ public class CustomDeactivatedConfigSource implements ConfigSource
private Map<String, String> config = new HashMap<String, String>()
{{
put(SchedulerBaseConfig.JobCustomization.JOB_CLASS_NAME_KEY, CustomJob.class.getName());
- put(SchedulerBaseConfig.Lifecycle.START_SCOPES_PER_JOB_KEY, Boolean.FALSE.toString());
+ put(SchedulerBaseConfig.LifecycleIntegration.START_SCOPES_PER_JOB_KEY, Boolean.FALSE.toString());
put(ClassDeactivator.class.getName(), QuartzDeactivator.class.getName());
}};