[weld-commits] Weld SVN: r5425 - in core/trunk: impl/src/main/java/org/jboss/weld/bean and 16 other directories.
weld-commits at lists.jboss.org
weld-commits at lists.jboss.org
Mon Jan 11 17:19:28 EST 2010
Author: pete.muir at jboss.org
Date: 2010-01-11 17:19:26 -0500 (Mon, 11 Jan 2010)
New Revision: 5425
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/Container.java
core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java
core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractProducerBean.java
core/trunk/impl/src/main/java/org/jboss/weld/bean/ManagedBean.java
core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/ee/DefaultValidatorBean.java
core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/ee/EEResourceProducerField.java
core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/ClientProxyMethodHandler.java
core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/ClientProxyProvider.java
core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployer.java
core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/ExtensionBeanDeployer.java
core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java
core/trunk/impl/src/main/java/org/jboss/weld/context/AbstractMapContext.java
core/trunk/impl/src/main/java/org/jboss/weld/context/SerializableContextualImpl.java
core/trunk/impl/src/main/java/org/jboss/weld/conversation/AbstractConversationManager.java
core/trunk/impl/src/main/java/org/jboss/weld/ejb/SessionBeanInterceptor.java
core/trunk/impl/src/main/java/org/jboss/weld/event/DeferredEventNotification.java
core/trunk/impl/src/main/java/org/jboss/weld/injection/WeldInjectionPoint.java
core/trunk/impl/src/main/java/org/jboss/weld/jsf/JsfHelper.java
core/trunk/impl/src/main/java/org/jboss/weld/jsf/WeldPhaseListener.java
core/trunk/impl/src/main/java/org/jboss/weld/manager/BeanManagerImpl.java
core/trunk/impl/src/main/java/org/jboss/weld/servlet/WeldListener.java
core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java
core/trunk/impl/src/main/java/org/jboss/weld/util/CleanableMethodHandler.java
core/trunk/porting-package/src/main/java/org/jboss/weld/tck/ContextsImpl.java
core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
core/trunk/tests/src/test/java/org/jboss/weld/tests/scope/ScopeTest.java
core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/ContainerStatusTest.java
Log:
rename
Modified: core/trunk/impl/src/main/java/org/jboss/weld/Container.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/Container.java 2010-01-11 21:56:52 UTC (rev 5424)
+++ core/trunk/impl/src/main/java/org/jboss/weld/Container.java 2010-01-11 22:19:26 UTC (rev 5425)
@@ -60,7 +60,7 @@
public static boolean available()
{
- return instance.isSet() && instance() != null && instance().getStatus().isAvailable();
+ return instance.isSet() && instance() != null && instance().getState().isAvailable();
}
/**
@@ -86,7 +86,7 @@
private final ServiceRegistry deploymentServices;
- private ContainerState status = ContainerState.STOPPED;
+ private ContainerState state = ContainerState.STOPPED;
public Container(BeanManagerImpl deploymentManager, ServiceRegistry deploymentServices)
{
@@ -165,7 +165,7 @@
*
* @return the deploymentServices
*/
- public ServiceRegistry deploymentServices()
+ public ServiceRegistry services()
{
return deploymentServices;
}
@@ -184,14 +184,14 @@
}
}
- public ContainerState getStatus()
+ public ContainerState getState()
{
- return status;
+ return state;
}
- public void setStatus(ContainerState status)
+ public void setState(ContainerState state)
{
- this.status = status;
+ this.state = state;
}
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java 2010-01-11 21:56:52 UTC (rev 5424)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java 2010-01-11 22:19:26 UTC (rev 5425)
@@ -477,7 +477,7 @@
public boolean isNormalScoped()
{
- return Container.instance().deploymentServices().get(MetaAnnotationStore.class).getScopeModel(getScope()).isNormal();
+ return Container.instance().services().get(MetaAnnotationStore.class).getScopeModel(getScope()).isNormal();
}
public boolean isAlternative()
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractProducerBean.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractProducerBean.java 2010-01-11 21:56:52 UTC (rev 5424)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractProducerBean.java 2010-01-11 22:19:26 UTC (rev 5425)
@@ -191,7 +191,7 @@
{
this.passivationCapableBean = true;
}
- if (Container.instance().deploymentServices().get(MetaAnnotationStore.class).getScopeModel(getScope()).isNormal())
+ if (Container.instance().services().get(MetaAnnotationStore.class).getScopeModel(getScope()).isNormal())
{
this.passivationCapableDependency = true;
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/ManagedBean.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/ManagedBean.java 2010-01-11 21:56:52 UTC (rev 5424)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/ManagedBean.java 2010-01-11 22:19:26 UTC (rev 5425)
@@ -311,7 +311,7 @@
private void initPassivationCapable()
{
this.passivationCapableBean = getAnnotatedItem().isSerializable();
- if (Container.instance().deploymentServices().get(MetaAnnotationStore.class).getScopeModel(getScope()).isNormal())
+ if (Container.instance().services().get(MetaAnnotationStore.class).getScopeModel(getScope()).isNormal())
{
this.passivationCapableDependency = true;
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/ee/DefaultValidatorBean.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/ee/DefaultValidatorBean.java 2010-01-11 21:56:52 UTC (rev 5424)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/ee/DefaultValidatorBean.java 2010-01-11 22:19:26 UTC (rev 5425)
@@ -46,7 +46,7 @@
{
if (getBeanManager().getServices().contains(ValidationServices.class))
{
- return Container.instance().deploymentServices().get(ValidationServices.class).getDefaultValidatorFactory().getValidator();
+ return Container.instance().services().get(ValidationServices.class).getDefaultValidatorFactory().getValidator();
}
else
{
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/ee/EEResourceProducerField.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/ee/EEResourceProducerField.java 2010-01-11 21:56:52 UTC (rev 5424)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/ee/EEResourceProducerField.java 2010-01-11 22:19:26 UTC (rev 5425)
@@ -71,7 +71,7 @@
{
if (instance == null)
{
- Contextual<T> contextual = Container.instance().deploymentServices().get(ContextualStore.class).<Contextual<T>, T>getContextual(beanId);
+ Contextual<T> contextual = Container.instance().services().get(ContextualStore.class).<Contextual<T>, T>getContextual(beanId);
if (contextual instanceof EEResourceProducerField<?, ?>)
{
@SuppressWarnings("unchecked")
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/ClientProxyMethodHandler.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/ClientProxyMethodHandler.java 2010-01-11 21:56:52 UTC (rev 5424)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/ClientProxyMethodHandler.java 2010-01-11 22:19:26 UTC (rev 5425)
@@ -97,7 +97,7 @@
{
if (bean == null)
{
- bean = Container.instance().deploymentServices().get(ContextualStore.class).<Bean<Object>, Object>getContextual(id);
+ bean = Container.instance().services().get(ContextualStore.class).<Bean<Object>, Object>getContextual(id);
}
Object proxiedInstance = getProxiedInstance(bean);
if (proxiedInstance == null)
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/ClientProxyProvider.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/ClientProxyProvider.java 2010-01-11 21:56:52 UTC (rev 5424)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/ClientProxyProvider.java 2010-01-11 22:19:26 UTC (rev 5425)
@@ -106,7 +106,7 @@
public T call() throws Exception
{
- String id = Container.instance().deploymentServices().get(ContextualStore.class).putIfAbsent(bean);
+ String id = Container.instance().services().get(ContextualStore.class).putIfAbsent(bean);
if (id == null)
{
throw new DefinitionException(BEAN_ID_CREATION_FAILED, bean);
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployer.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployer.java 2010-01-11 21:56:52 UTC (rev 5424)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployer.java 2010-01-11 22:19:26 UTC (rev 5425)
@@ -55,7 +55,7 @@
public BeanDeployer addClass(Class<?> clazz)
{
- ClassTransformer classTransformer = Container.instance().deploymentServices().get(ClassTransformer.class);
+ ClassTransformer classTransformer = Container.instance().services().get(ClassTransformer.class);
if (!clazz.isAnnotation() && !clazz.isEnum())
{
ProcessAnnotatedTypeImpl<?> event = ProcessAnnotatedTypeImpl.fire(getManager(), classTransformer.loadClass(clazz));
@@ -76,7 +76,7 @@
public BeanDeployer addClass(AnnotatedType<?> clazz)
{
- ClassTransformer classTransformer = Container.instance().deploymentServices().get(ClassTransformer.class);
+ ClassTransformer classTransformer = Container.instance().services().get(ClassTransformer.class);
classes.add(classTransformer.loadClass(clazz));
return this;
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/ExtensionBeanDeployer.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/ExtensionBeanDeployer.java 2010-01-11 21:56:52 UTC (rev 5424)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/ExtensionBeanDeployer.java 2010-01-11 22:19:26 UTC (rev 5425)
@@ -58,7 +58,7 @@
public ExtensionBeanDeployer deployBeans()
{
- ClassTransformer classTransformer = Container.instance().deploymentServices().get(ClassTransformer.class);
+ ClassTransformer classTransformer = Container.instance().services().get(ClassTransformer.class);
for (Extension extension : extensions)
{
@SuppressWarnings("unchecked")
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java 2010-01-11 21:56:52 UTC (rev 5424)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java 2010-01-11 22:19:26 UTC (rev 5425)
@@ -286,12 +286,12 @@
this.deploymentManager = BeanManagerImpl.newRootManager("deployment", deploymentServices);
Container.initialize(deploymentManager, ServiceRegistries.unmodifiableServiceRegistry(deployment.getServices()));
- Container.instance().setStatus(ContainerState.STARTING);
+ Container.instance().setState(ContainerState.STARTING);
createContexts();
initializeContexts();
// Start the application context
- Container.instance().deploymentServices().get(ContextLifecycle.class).beginApplication(applicationBeanStore);
+ Container.instance().services().get(ContextLifecycle.class).beginApplication(applicationBeanStore);
this.extensionDeployerEnvironment = new ExtensionBeanDeployerEnvironment(EjbDescriptors.EMPTY, deploymentManager);
this.deploymentVisitor = new DeploymentVisitor(deploymentManager, environment, deployment);
@@ -379,7 +379,7 @@
// Re-read the deployment structure, this will be the physical structure, extensions, classes, and any beans added using addBean outside the physical structure
beanDeployments = deploymentVisitor.visit();
Container.instance().putBeanDeployments(beanDeployments);
- Container.instance().setStatus(ContainerState.INITIALIZED);
+ Container.instance().setState(ContainerState.INITIALIZED);
}
return this;
}
@@ -404,7 +404,7 @@
synchronized (this)
{
// Register the managers so external requests can handle them
- Container.instance().setStatus(ContainerState.VALIDATED);
+ Container.instance().setState(ContainerState.VALIDATED);
}
return this;
}
@@ -440,8 +440,8 @@
}
finally
{
- Container.instance().setStatus(ContainerState.SHUTDOWN);
- Container.instance().deploymentServices().get(ContextLifecycle.class).endApplication();
+ Container.instance().setState(ContainerState.SHUTDOWN);
+ Container.instance().services().get(ContextLifecycle.class).endApplication();
}
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/context/AbstractMapContext.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/context/AbstractMapContext.java 2010-01-11 21:56:52 UTC (rev 5424)
+++ core/trunk/impl/src/main/java/org/jboss/weld/context/AbstractMapContext.java 2010-01-11 22:19:26 UTC (rev 5425)
@@ -191,12 +191,12 @@
protected static <T> Contextual<T> getContextual(String id)
{
- return Container.instance().deploymentServices().get(ContextualStore.class).<Contextual<T>, T>getContextual(id);
+ return Container.instance().services().get(ContextualStore.class).<Contextual<T>, T>getContextual(id);
}
protected static String getId(Contextual<?> contextual)
{
- return Container.instance().deploymentServices().get(ContextualStore.class).putIfAbsent(contextual);
+ return Container.instance().services().get(ContextualStore.class).putIfAbsent(contextual);
}
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/context/SerializableContextualImpl.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/context/SerializableContextualImpl.java 2010-01-11 21:56:52 UTC (rev 5424)
+++ core/trunk/impl/src/main/java/org/jboss/weld/context/SerializableContextualImpl.java 2010-01-11 22:19:26 UTC (rev 5425)
@@ -45,7 +45,7 @@
else
{
// otherwise, generate an id (may not be portable between container instances)
- this.id = Container.instance().deploymentServices().get(ContextualStore.class).putIfAbsent(contextual);
+ this.id = Container.instance().services().get(ContextualStore.class).putIfAbsent(contextual);
}
// cache the contextual
this.cached = contextual;
@@ -68,7 +68,7 @@
}
else if (id != null)
{
- this.cached = Container.instance().deploymentServices().get(ContextualStore.class).<C, I>getContextual(id);
+ this.cached = Container.instance().services().get(ContextualStore.class).<C, I>getContextual(id);
}
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/conversation/AbstractConversationManager.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/conversation/AbstractConversationManager.java 2010-01-11 21:56:52 UTC (rev 5424)
+++ core/trunk/impl/src/main/java/org/jboss/weld/conversation/AbstractConversationManager.java 2010-01-11 22:19:26 UTC (rev 5425)
@@ -175,7 +175,7 @@
longRunningConversation.cancelTermination();
longRunningConversation.unlock();
}
- ConversationContext conversationContext = Container.instance().deploymentServices().get(ContextLifecycle.class).getConversationContext();
+ ConversationContext conversationContext = Container.instance().services().get(ContextLifecycle.class).getConversationContext();
conversationContext.destroy();
}
// If the conversation has been switched from one long
@@ -201,7 +201,7 @@
private Future<?> scheduleForTermination(String cid, long timeout)
{
Runnable terminationTask = new TerminationTask(cid);
- return Container.instance().deploymentServices().get(ScheduledExecutorServiceFactory.class).get().schedule(terminationTask, timeout, TimeUnit.MILLISECONDS);
+ return Container.instance().services().get(ScheduledExecutorServiceFactory.class).get().schedule(terminationTask, timeout, TimeUnit.MILLISECONDS);
}
/**
Modified: core/trunk/impl/src/main/java/org/jboss/weld/ejb/SessionBeanInterceptor.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/ejb/SessionBeanInterceptor.java 2010-01-11 21:56:52 UTC (rev 5424)
+++ core/trunk/impl/src/main/java/org/jboss/weld/ejb/SessionBeanInterceptor.java 2010-01-11 22:19:26 UTC (rev 5425)
@@ -44,13 +44,13 @@
@AroundInvoke
public Object aroundInvoke(InvocationContext invocation) throws Exception
{
- if (Container.instance().deploymentServices().get(ContextLifecycle.class).isRequestActive())
+ if (Container.instance().services().get(ContextLifecycle.class).isRequestActive())
{
return invocation.proceed();
}
else
{
- Lifecycle lifecycle = Container.instance().deploymentServices().get(ContextLifecycle.class);
+ Lifecycle lifecycle = Container.instance().services().get(ContextLifecycle.class);
BeanStore beanStore = new HashMapBeanStore();
String id = invocation.getTarget().getClass().getName() + "." + invocation.getMethod().getName() + "()";
lifecycle.beginRequest(id, beanStore);
Modified: core/trunk/impl/src/main/java/org/jboss/weld/event/DeferredEventNotification.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/event/DeferredEventNotification.java 2010-01-11 21:56:52 UTC (rev 5424)
+++ core/trunk/impl/src/main/java/org/jboss/weld/event/DeferredEventNotification.java 2010-01-11 22:19:26 UTC (rev 5425)
@@ -94,7 +94,7 @@
public void run()
{
- Lifecycle lifecycle = Container.instance().deploymentServices().get(ContextLifecycle.class);
+ Lifecycle lifecycle = Container.instance().services().get(ContextLifecycle.class);
boolean requestActive = lifecycle.isRequestActive();
BeanStore requestBeanStore = new ConcurrentHashMapBeanStore();
try
Modified: core/trunk/impl/src/main/java/org/jboss/weld/injection/WeldInjectionPoint.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/injection/WeldInjectionPoint.java 2010-01-11 21:56:52 UTC (rev 5424)
+++ core/trunk/impl/src/main/java/org/jboss/weld/injection/WeldInjectionPoint.java 2010-01-11 22:19:26 UTC (rev 5425)
@@ -40,18 +40,18 @@
public WeldInjectionPointSerializationProxy(WeldInjectionPoint<T, S> injectionPoint)
{
- this.declaringBeanId = Container.instance().deploymentServices().get(ContextualStore.class).putIfAbsent(injectionPoint.getBean());
+ this.declaringBeanId = Container.instance().services().get(ContextualStore.class).putIfAbsent(injectionPoint.getBean());
this.declaringClass = injectionPoint.getBean().getBeanClass();
}
protected Bean<T> getDeclaringBean()
{
- return Container.instance().deploymentServices().get(ContextualStore.class).<Bean<T>, T>getContextual(declaringBeanId);
+ return Container.instance().services().get(ContextualStore.class).<Bean<T>, T>getContextual(declaringBeanId);
}
protected WeldClass<?> getWeldClass()
{
- return Container.instance().deploymentServices().get(ClassTransformer.class).loadClass(declaringClass);
+ return Container.instance().services().get(ClassTransformer.class).loadClass(declaringClass);
}
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/jsf/JsfHelper.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/jsf/JsfHelper.java 2010-01-11 21:56:52 UTC (rev 5424)
+++ core/trunk/impl/src/main/java/org/jboss/weld/jsf/JsfHelper.java 2010-01-11 22:19:26 UTC (rev 5425)
@@ -56,7 +56,7 @@
*/
public static boolean isPostback(FacesContext facesContext)
{
- if (Container.instance().deploymentServices().get(JsfApiAbstraction.class).isApiVersionCompatibleWith(2.0))
+ if (Container.instance().services().get(JsfApiAbstraction.class).isApiVersionCompatibleWith(2.0))
{
try
{
Modified: core/trunk/impl/src/main/java/org/jboss/weld/jsf/WeldPhaseListener.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/jsf/WeldPhaseListener.java 2010-01-11 21:56:52 UTC (rev 5424)
+++ core/trunk/impl/src/main/java/org/jboss/weld/jsf/WeldPhaseListener.java 2010-01-11 22:19:26 UTC (rev 5425)
@@ -124,8 +124,8 @@
private void afterRenderResponse(FacesContext facesContext)
{
BeanManagerImpl moduleBeanManager = getModuleBeanManager(facesContext);
- SessionContext sessionContext = Container.instance().deploymentServices().get(ContextLifecycle.class).getSessionContext();
- ConversationContext conversationContext = Container.instance().deploymentServices().get(ContextLifecycle.class).getConversationContext();
+ SessionContext sessionContext = Container.instance().services().get(ContextLifecycle.class).getSessionContext();
+ ConversationContext conversationContext = Container.instance().services().get(ContextLifecycle.class).getConversationContext();
if (sessionContext.isActive())
{
log.trace(CLEANING_UP_CONVERSATION, "Render Response", "response complete");
@@ -144,7 +144,7 @@
private void afterResponseComplete(FacesContext facesContext, PhaseId phaseId)
{
BeanManagerImpl moduleBeanManager = getModuleBeanManager(facesContext);
- SessionContext sessionContext = Container.instance().deploymentServices().get(ContextLifecycle.class).getSessionContext();
+ SessionContext sessionContext = Container.instance().services().get(ContextLifecycle.class).getSessionContext();
if (sessionContext.isActive())
{
log.trace(CLEANING_UP_CONVERSATION, phaseId, "the response has been marked complete");
@@ -170,7 +170,7 @@
moduleBeanManager.getInstanceByType(ConversationManager.class).beginOrRestoreConversation(getConversationId(facesContext));
String cid = moduleBeanManager.getInstanceByType(ConversationImpl.class).getUnderlyingId();
- ConversationContext conversationContext = Container.instance().deploymentServices().get(ContextLifecycle.class).getConversationContext();
+ ConversationContext conversationContext = Container.instance().services().get(ContextLifecycle.class).getConversationContext();
conversationContext.setBeanStore(new ConversationBeanStore(session, cid));
conversationContext.setActive(true);
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/manager/BeanManagerImpl.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/manager/BeanManagerImpl.java 2010-01-11 21:56:52 UTC (rev 5424)
+++ core/trunk/impl/src/main/java/org/jboss/weld/manager/BeanManagerImpl.java 2010-01-11 22:19:26 UTC (rev 5425)
@@ -462,7 +462,7 @@
}
if (bean instanceof PassivationCapable)
{
- Container.instance().deploymentServices().get(ContextualStore.class).putIfAbsent(bean);
+ Container.instance().services().get(ContextualStore.class).putIfAbsent(bean);
}
registerBeanNamespace(bean);
for (BeanManagerImpl childActivity : childActivities)
Modified: core/trunk/impl/src/main/java/org/jboss/weld/servlet/WeldListener.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/servlet/WeldListener.java 2010-01-11 21:56:52 UTC (rev 5424)
+++ core/trunk/impl/src/main/java/org/jboss/weld/servlet/WeldListener.java 2010-01-11 22:19:26 UTC (rev 5425)
@@ -69,14 +69,14 @@
{
if (lifecycle == null)
{
- this.lifecycle = new ServletLifecycle(Container.instance().deploymentServices().get(ContextLifecycle.class));
+ this.lifecycle = new ServletLifecycle(Container.instance().services().get(ContextLifecycle.class));
}
return lifecycle;
}
private static BeanManagerImpl getBeanManager(ServletContext ctx)
{
- BeanDeploymentArchive war = Container.instance().deploymentServices().get(ServletServices.class).getBeanDeploymentArchive(ctx);
+ BeanDeploymentArchive war = Container.instance().services().get(ServletServices.class).getBeanDeploymentArchive(ctx);
if (war == null)
{
throw new ForbiddenStateException(BEAN_DEPLOYMENT_ARCHIVE_MISSING, ctx);
@@ -98,7 +98,7 @@
log.warn(NOT_STARTING);
return;
}
- if (!Container.instance().deploymentServices().contains(ServletServices.class))
+ if (!Container.instance().services().contains(ServletServices.class))
{
throw new ForbiddenStateException(ILLEGAL_USE_OF_WELD_LISTENER);
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java 2010-01-11 21:56:52 UTC (rev 5424)
+++ core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java 2010-01-11 22:19:26 UTC (rev 5425)
@@ -167,7 +167,7 @@
}
else
{
- if (Container.instance().deploymentServices().get(MetaAnnotationStore.class).getScopeModel(bean.getScope()).isNormal())
+ if (Container.instance().services().get(MetaAnnotationStore.class).getScopeModel(bean.getScope()).isNormal())
{
return true;
}
@@ -815,7 +815,7 @@
Set<Annotation> checkedNewQualifiers = new HashSet<Annotation>();
for (Annotation qualifier : newQualifiers)
{
- if (!Container.instance().deploymentServices().get(MetaAnnotationStore.class).getBindingTypeModel(qualifier.annotationType()).isValid())
+ if (!Container.instance().services().get(MetaAnnotationStore.class).getBindingTypeModel(qualifier.annotationType()).isValid())
{
throw new ForbiddenArgumentException(ANNOTATION_NOT_QUALIFIER, qualifier);
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/util/CleanableMethodHandler.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/util/CleanableMethodHandler.java 2010-01-11 21:56:52 UTC (rev 5424)
+++ core/trunk/impl/src/main/java/org/jboss/weld/util/CleanableMethodHandler.java 2010-01-11 22:19:26 UTC (rev 5425)
@@ -19,7 +19,7 @@
public CleanableMethodHandler(MethodHandler delegate)
{
this.delegate = delegate;
- Container.instance().deploymentServices().get(JavassistCleaner.class).add(this);
+ Container.instance().services().get(JavassistCleaner.class).add(this);
}
public Object invoke(Object self, Method thisMethod, Method proceed, Object[] args) throws Throwable
@@ -35,7 +35,7 @@
private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException
{
in.defaultReadObject();
- Container.instance().deploymentServices().get(JavassistCleaner.class).add(this);
+ Container.instance().services().get(JavassistCleaner.class).add(this);
}
}
Modified: core/trunk/porting-package/src/main/java/org/jboss/weld/tck/ContextsImpl.java
===================================================================
--- core/trunk/porting-package/src/main/java/org/jboss/weld/tck/ContextsImpl.java 2010-01-11 21:56:52 UTC (rev 5424)
+++ core/trunk/porting-package/src/main/java/org/jboss/weld/tck/ContextsImpl.java 2010-01-11 22:19:26 UTC (rev 5425)
@@ -12,7 +12,7 @@
public RequestContext getRequestContext()
{
- return Container.instance().deploymentServices().get(ContextLifecycle.class).getRequestContext();
+ return Container.instance().services().get(ContextLifecycle.class).getRequestContext();
}
public void setActive(AbstractContext context)
@@ -27,7 +27,7 @@
public AbstractContext getDependentContext()
{
- return Container.instance().deploymentServices().get(ContextLifecycle.class).getDependentContext();
+ return Container.instance().services().get(ContextLifecycle.class).getDependentContext();
}
public void destroyContext(AbstractContext context)
Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2010-01-11 21:56:52 UTC (rev 5424)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2010-01-11 22:19:26 UTC (rev 5425)
@@ -77,7 +77,7 @@
GrossStadt frankfurt = getCurrentManager().getInstanceByType(GrossStadt.class);
Bean<KleinStadt> stadtBean = getBean(KleinStadt.class);
assert stadtBean != null : "Expected a bean for stateful session bean Kassel";
- RequestContext requestContext = Container.instance().deploymentServices().get(ContextLifecycle.class).getRequestContext();
+ RequestContext requestContext = Container.instance().services().get(ContextLifecycle.class).getRequestContext();
CreationalContext<KleinStadt> creationalContext = new MockCreationalContext<KleinStadt>();
KleinStadt kassel = requestContext.get(stadtBean, creationalContext);
stadtBean.destroy(kassel, creationalContext);
Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/scope/ScopeTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/scope/ScopeTest.java 2010-01-11 21:56:52 UTC (rev 5424)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/scope/ScopeTest.java 2010-01-11 22:19:26 UTC (rev 5425)
@@ -55,7 +55,7 @@
private void newRequest()
{
- ContextLifecycle lifecycle = Container.instance().deploymentServices().get(ContextLifecycle.class);
+ ContextLifecycle lifecycle = Container.instance().services().get(ContextLifecycle.class);
lifecycle.endRequest("test", lifecycle.getRequestContext().getBeanStore());
lifecycle.beginRequest("test", new HashMapBeanStore());
}
Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/ContainerStatusTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/ContainerStatusTest.java 2010-01-11 21:56:52 UTC (rev 5424)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/ContainerStatusTest.java 2010-01-11 22:19:26 UTC (rev 5425)
@@ -16,16 +16,16 @@
assert !Container.available();
container.getLifecycle().initialize();
assert !Container.available();
- assert Container.instance().getStatus().equals(ContainerState.STARTING);
+ assert Container.instance().getState().equals(ContainerState.STARTING);
container.getLifecycle().getBootstrap().startInitialization();
assert !Container.available();
- assert Container.instance().getStatus().equals(ContainerState.STARTING);
+ assert Container.instance().getState().equals(ContainerState.STARTING);
container.getLifecycle().getBootstrap().deployBeans();
assert Container.available();
- assert Container.instance().getStatus().equals(ContainerState.INITIALIZED);
+ assert Container.instance().getState().equals(ContainerState.INITIALIZED);
container.getLifecycle().getBootstrap().validateBeans().endInitialization();
assert Container.available();
- assert Container.instance().getStatus().equals(ContainerState.VALIDATED);
+ assert Container.instance().getState().equals(ContainerState.VALIDATED);
container.stopContainer();
assert !Container.available();
}
More information about the weld-commits
mailing list