Author: struberg
Date: Thu Feb 24 14:17:36 2011
New Revision: 1074160
URL: http://svn.apache.org/viewvc?rev=1074160&view=rev
Log:
OWB-393 get rid of more unused stuff + rewrite some extension mechanism
Removed:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansNameSpaceContainer.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/XMLSpecializesManager.java
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeManager.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/BeforeBeanDiscoveryImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/XMLAnnotationTypeManager.java
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java?rev=1074160&r1=1074159&r2=1074160&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
Thu Feb 24 14:17:36 2011
@@ -500,7 +500,7 @@ public class BeansDeployer
{
BeanManagerImpl beanManager = webBeansContext.getBeanManagerImpl();
- List<AnnotatedType<?>> annotatedTypes =
beanManager.getAnnotatedTypes();
+ List<AnnotatedType<?>> annotatedTypes =
beanManager.getAdditionalAnnotatedTypes();
for(AnnotatedType<?> type : annotatedTypes)
{
@@ -715,13 +715,10 @@ public class BeansDeployer
Class<? extends Annotation> stereoClass = (Class<? extends
Annotation>) beanClass;
if (annotationManager.isStereoTypeAnnotation(stereoClass))
{
- if
(!webBeansContext.getXMLAnnotationTypeManager().hasStereoType(stereoClass))
- {
-
webBeansContext.getAnnotationManager().checkStereoTypeClass(stereoClass,
stereoClass.getDeclaredAnnotations());
- StereoTypeModel model = new
StereoTypeModel(webBeansContext, stereoClass);
-
webBeansContext.getStereoTypeManager().addStereoTypeModel(model);
- }
- }
+
webBeansContext.getAnnotationManager().checkStereoTypeClass(stereoClass,
stereoClass.getDeclaredAnnotations());
+ StereoTypeModel model = new
StereoTypeModel(webBeansContext, stereoClass);
+
webBeansContext.getStereoTypeManager().addStereoTypeModel(model);
+ }
}
}
}
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java?rev=1074160&r1=1074159&r2=1074160&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
Thu Feb 24 14:17:36 2011
@@ -142,7 +142,7 @@ public class BeanManagerImpl implements
/**Additional interceptor class*/
private List<Class<?>> additionalInterceptorClasses = new
CopyOnWriteArrayList<Class<?>>();
-
+
/**
* This list contains additional qualifiers which got set via the {@link
javax.enterprise.inject.spi.BeforeBeanDiscovery#addQualifier(Class)}
* event function.
@@ -1125,16 +1125,19 @@ public class BeanManagerImpl implements
}
}
+
public List<ExternalScope> getAdditionalScopes()
{
return additionalScopes;
}
- public List<AnnotatedType<?>> getAnnotatedTypes()
+ public List<AnnotatedType<?>> getAdditionalAnnotatedTypes()
{
- return this.additionalAnnotatedTypes;
+ return additionalAnnotatedTypes;
}
-
+
+
+
public void clear()
{
this.additionalAnnotatedTypes.clear();
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeManager.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeManager.java?rev=1074160&r1=1074159&r2=1074160&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeManager.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeManager.java
Thu Feb 24 14:17:36 2011
@@ -83,4 +83,5 @@ public class StereoTypeManager
return null;
}
+
}
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/BeforeBeanDiscoveryImpl.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/BeforeBeanDiscoveryImpl.java?rev=1074160&r1=1074159&r2=1074160&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/BeforeBeanDiscoveryImpl.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/BeforeBeanDiscoveryImpl.java
Thu Feb 24 14:17:36 2011
@@ -90,13 +90,9 @@ public class BeforeBeanDiscoveryImpl imp
@Override
public void addStereotype(Class<? extends Annotation> stereotype,
Annotation... stereotypeDef)
{
- if
(!webBeansContext.getXMLAnnotationTypeManager().hasStereoType(stereotype))
- {
-
webBeansContext.getAnnotationManager().checkStereoTypeClass(stereotype,
stereotypeDef);
- StereoTypeModel model = new StereoTypeModel(webBeansContext,
stereotype, stereotypeDef);
- webBeansContext.getStereoTypeManager().addStereoTypeModel(model);
- }
-
+
webBeansContext.getAnnotationManager().checkStereoTypeClass(stereotype,
stereotypeDef);
+ StereoTypeModel model = new StereoTypeModel(webBeansContext,
stereotype, stereotypeDef);
+ webBeansContext.getStereoTypeManager().addStereoTypeModel(model);
}
}
\ No newline at end of file
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/XMLAnnotationTypeManager.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/XMLAnnotationTypeManager.java?rev=1074160&r1=1074159&r2=1074160&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/XMLAnnotationTypeManager.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/XMLAnnotationTypeManager.java
Thu Feb 24 14:17:36 2011
@@ -24,28 +24,16 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArraySet;
import org.apache.webbeans.config.WebBeansContext;
-import org.apache.webbeans.deployment.StereoTypeManager;
public class XMLAnnotationTypeManager
{
- private Set<Class<? extends Annotation>> xmlBindingTypes = new
CopyOnWriteArraySet<Class<? extends Annotation>>();
-
- private Set<Class<? extends Annotation>> xmlResources = new
CopyOnWriteArraySet<Class<? extends Annotation>>();
-
private Map<Class<? extends Annotation>, Set<Annotation>>
xmlInterceptorBindingTypes = new ConcurrentHashMap<Class<? extends Annotation>,
Set<Annotation>>();
- private Set<Class<? extends Annotation>> xmlStereoTypes = new
CopyOnWriteArraySet<Class<? extends Annotation>>();
- private final StereoTypeManager manager;
- private final WebBeansContext webBeansContext;
public XMLAnnotationTypeManager(WebBeansContext webBeansContext)
{
-
- this.webBeansContext = webBeansContext;
- manager = this.webBeansContext.getStereoTypeManager();
}
public static XMLAnnotationTypeManager getInstance()
@@ -53,58 +41,6 @@ public class XMLAnnotationTypeManager
return WebBeansContext.getInstance().getXMLAnnotationTypeManager();
}
- @Deprecated
- public void addBindingType(Class<? extends Annotation> bindingType)
- {
- xmlBindingTypes.add(bindingType);
- }
-
- public void addResource(Class<? extends Annotation> resource)
- {
- xmlResources.add(resource);
- }
-
- public boolean hasBindingType(Class<? extends Annotation> bindingType)
- {
- if (xmlBindingTypes.contains(bindingType))
- {
- return true;
- }
-
- return false;
- }
-
- public boolean hasResource(Class<? extends Annotation> resource)
- {
- if (xmlResources.contains(resource))
- {
- return true;
- }
-
- return false;
- }
-
- /*X TODO REMOVE
- public void addStereoType(Class<? extends Annotation> stereoType, Element
decleration, String name, String errorMessage)
- {
-
webBeansContext.getAnnotationManager().checkStereoTypeClass(stereoType,
stereoType.getDeclaredAnnotations());
-
- XMLStereoTypeModel model = new XMLStereoTypeModel(decleration, name,
errorMessage);
- manager.addStereoTypeModel(model);
-
- xmlStereoTypes.add(stereoType);
- }
- */
-
- public boolean hasStereoType(Class<? extends Annotation> stereoType)
- {
- if (xmlStereoTypes.contains(stereoType))
- {
- return true;
- }
-
- return false;
- }
public void addInterceotorBindingTypeInheritAnnotation(Class<? extends
Annotation> bindingType, Annotation inherit)
{
@@ -155,29 +91,10 @@ public class XMLAnnotationTypeManager
return false;
}
- public Set<Class<? extends Annotation>> getBindingTypes()
- {
- return Collections.unmodifiableSet(xmlBindingTypes);
- }
-
- public Set<Class<? extends Annotation>> getResources()
- {
- return Collections.unmodifiableSet(xmlResources);
- }
public Set<Annotation> getInterceptorBindingTypeInherites(Class<? extends
Annotation> interceptorBindingType)
{
return
Collections.unmodifiableSet(xmlInterceptorBindingTypes.get(interceptorBindingType));
}
- public Set<Class<? extends Annotation>> getInterceptorBindingTypes()
- {
- return
Collections.unmodifiableSet(xmlInterceptorBindingTypes.keySet());
- }
-
- public Set<Class<? extends Annotation>> getStereotypes()
- {
- return Collections.unmodifiableSet(xmlStereoTypes);
- }
-
}
