You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by ge...@apache.org on 2009/10/24 00:08:49 UTC
svn commit: r829257 - in /incubator/openwebbeans/trunk/webbeans-impl/src:
main/java/org/apache/webbeans/config/
main/java/org/apache/webbeans/config/inheritance/
main/java/org/apache/webbeans/container/
main/java/org/apache/webbeans/event/ main/java/or...
Author: gerdogdu
Date: Fri Oct 23 22:08:48 2009
New Revision: 829257
URL: http://svn.apache.org/viewvc?rev=829257&view=rev
Log:
Update packages of Stereotype and Model.
Modified:
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/BeanInheritedMetaData.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inheritance/types/InhStereo1.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inheritance/types/InhStereo2.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/sterotype/StereoWithNonScope.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/sterotype/StereoWithRequestScope.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/sterotype/StereoWithSessionScope.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/sterotype/StereoWithSessionScope2.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/xml/strict/AlternativeStereotype.java
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java?rev=829257&r1=829256&r2=829257&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java Fri Oct 23 22:08:48 2009
@@ -24,6 +24,7 @@
import java.util.Set;
import javax.enterprise.context.NormalScope;
+import javax.enterprise.inject.Model;
import javax.enterprise.inject.Specializes;
import javax.enterprise.inject.spi.AnnotatedField;
import javax.enterprise.inject.spi.AnnotatedMethod;
@@ -33,7 +34,6 @@
import javax.enterprise.inject.spi.Decorator;
import javax.enterprise.inject.spi.InjectionPoint;
import javax.enterprise.inject.spi.Producer;
-import javax.enterprise.inject.stereotype.Model;
import javax.interceptor.Interceptor;
import org.apache.webbeans.WebBeansConstants;
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/BeanInheritedMetaData.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/BeanInheritedMetaData.java?rev=829257&r1=829256&r2=829257&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/BeanInheritedMetaData.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/BeanInheritedMetaData.java Fri Oct 23 22:08:48 2009
@@ -21,7 +21,7 @@
import java.util.Set;
import javax.enterprise.context.NormalScope;
-import javax.enterprise.inject.stereotype.Stereotype;
+import javax.enterprise.inject.Stereotype;
import javax.inject.Qualifier;
import javax.inject.Scope;
import javax.interceptor.InterceptorBinding;
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java?rev=829257&r1=829256&r2=829257&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java Fri Oct 23 22:08:48 2009
@@ -39,6 +39,7 @@
import javax.enterprise.event.Event;
import javax.enterprise.inject.AmbiguousResolutionException;
import javax.enterprise.inject.Default;
+import javax.enterprise.inject.Stereotype;
import javax.enterprise.inject.TypeLiteral;
import javax.enterprise.inject.spi.Annotated;
import javax.enterprise.inject.spi.AnnotatedType;
@@ -50,7 +51,6 @@
import javax.enterprise.inject.spi.InterceptionType;
import javax.enterprise.inject.spi.Interceptor;
import javax.enterprise.inject.spi.ObserverMethod;
-import javax.enterprise.inject.stereotype.Stereotype;
import javax.inject.Scope;
import javax.naming.NamingException;
import javax.naming.Reference;
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java?rev=829257&r1=829256&r2=829257&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java Fri Oct 23 22:08:48 2009
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.webbeans.event;
import java.lang.annotation.Annotation;
@@ -32,7 +33,6 @@
import javax.enterprise.event.Reception;
import javax.enterprise.event.TransactionPhase;
import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Default;
import javax.enterprise.inject.TypeLiteral;
import javax.enterprise.inject.spi.ObserverMethod;
import javax.transaction.Status;
@@ -68,8 +68,8 @@
public static NotificationManager getInstance()
{
- BeanManagerImpl manager = ActivityManager.getInstance().getCurrentActivity();
-
+ BeanManagerImpl manager = ActivityManager.getInstance().getCurrentActivity();
+
return manager.getNotificationManager();
}
@@ -128,7 +128,7 @@
Set<Annotation> qualifiers = toQualiferSet(eventQualifiers);
Class<T> eventType = (Class<T>) event.getClass();
- //EventUtil.checkEventType(eventType);
+ // EventUtil.checkEventType(eventType);
Set<ObserverMethod<T>> observers = filterByType(eventType);
@@ -166,7 +166,8 @@
}
/**
- * filter out all {@code ObserverMethod}s which do not fit the given qualifiers.
+ * filter out all {@code ObserverMethod}s which do not fit the given
+ * qualifiers.
*/
private <T> Set<ObserverMethod<T>> filterByQualifiers(Set<ObserverMethod<T>> observers, Set<Annotation> eventQualifiers)
{
@@ -174,11 +175,10 @@
{
return observers;
}
-
+
Set<ObserverMethod<T>> matching = new HashSet<ObserverMethod<T>>();
-
- search:
- for (ObserverMethod<T> ob : observers)
+
+ search: for (ObserverMethod<T> ob : observers)
{
Set<Annotation> qualifiers = ob.getObservedQualifiers();
@@ -197,17 +197,17 @@
matching.add(ob);
}
-
+
return matching;
}
-
+
public void fireEvent(Object event, Annotation... qualifiers)
{
Transaction transaction = transactionService.getTransaction();
Set<ObserverMethod<Object>> observers = resolveObservers(event, qualifiers);
- for (ObserverMethod<Object> observer: observers)
+ for (ObserverMethod<Object> observer : observers)
{
try
{
@@ -230,7 +230,7 @@
{
transaction.registerSynchronization(new BeforeCompletion(observer, event));
}
- else
+ else
{
throw new IllegalStateException("TransactionPhase not supported: " + phase);
}
@@ -248,16 +248,16 @@
}
else
{
- RuntimeException rte = (RuntimeException)e.getCause();
+ RuntimeException rte = (RuntimeException) e.getCause();
throw rte;
}
}
- catch(RuntimeException e)
+ catch (RuntimeException e)
{
throw e;
}
-
- catch(Exception e)
+
+ catch (Exception e)
{
throw new WebBeansException(e);
}
@@ -290,8 +290,8 @@
}
/**
- * Converts the given qualifiers array to a Set.
- * This function additionally fixes @Default and @Any conditions.
+ * Converts the given qualifiers array to a Set. This function additionally
+ * fixes @Default and @Any conditions.
*/
private static Set<Annotation> toQualiferSet(Annotation... qualifiers)
{
@@ -301,11 +301,12 @@
{
set.add(new DefaultLiteral());
}
-
+
return set;
}
-
- private static class AbstractSynchronization<T> implements Synchronization {
+
+ private static class AbstractSynchronization<T> implements Synchronization
+ {
private final ObserverMethod<T> observer;
private final T event;
@@ -318,15 +319,16 @@
public void beforeCompletion()
{
- // TODO
+ // Do nothing
}
public void afterCompletion(int i)
{
- // TODO
+ //Do nothing
}
- public void notifyObserver() {
+ public void notifyObserver()
+ {
try
{
observer.notify(event);
@@ -338,7 +340,8 @@
}
}
- private static class BeforeCompletion extends AbstractSynchronization {
+ private static class BeforeCompletion extends AbstractSynchronization
+ {
private BeforeCompletion(ObserverMethod observer, Object event)
{
super(observer, event);
@@ -351,7 +354,8 @@
}
}
- private static class AfterCompletion extends AbstractSynchronization {
+ private static class AfterCompletion extends AbstractSynchronization
+ {
private AfterCompletion(ObserverMethod observer, Object event)
{
super(observer, event);
@@ -364,7 +368,8 @@
}
}
- private static class AfterCompletionSuccess extends AbstractSynchronization {
+ private static class AfterCompletionSuccess extends AbstractSynchronization
+ {
private AfterCompletionSuccess(ObserverMethod observer, Object event)
{
super(observer, event);
@@ -380,7 +385,8 @@
}
}
- private static class AfterCompletionFailure extends AbstractSynchronization {
+ private static class AfterCompletionFailure extends AbstractSynchronization
+ {
private AfterCompletionFailure(ObserverMethod observer, Object event)
{
super(observer, event);
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java?rev=829257&r1=829256&r2=829257&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java Fri Oct 23 22:08:48 2009
@@ -149,6 +149,8 @@
@SuppressWarnings("unchecked")
public void notify(T event)
{
+ logger.trace("Notifiying with event payload : " + event.toString());
+
AbstractBean<Object> baseComponent = (AbstractBean<Object>) bean;
AbstractBean<Object> specializedComponent = null;
Object object = null;
@@ -297,18 +299,21 @@
/**
* {@inheritDoc}
*/
- public Type getObservedType() {
+ public Type getObservedType()
+ {
return observedEventType;
}
/**
* {@inheritDoc}
*/
- public Reception getReception() {
+ public Reception getReception()
+ {
return ifExist ? Reception.IF_EXISTS : Reception.ALWAYS;
}
- public TransactionPhase getTransactionPhase() {
+ public TransactionPhase getTransactionPhase()
+ {
return phase;
}
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java?rev=829257&r1=829256&r2=829257&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java Fri Oct 23 22:08:48 2009
@@ -27,8 +27,8 @@
import javax.enterprise.inject.Any;
import javax.enterprise.inject.NonBinding;
+import javax.enterprise.inject.Stereotype;
import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.stereotype.Stereotype;
import javax.inject.Qualifier;
import javax.interceptor.InterceptorBinding;
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java?rev=829257&r1=829256&r2=829257&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java Fri Oct 23 22:08:48 2009
@@ -52,6 +52,7 @@
import javax.enterprise.inject.New;
import javax.enterprise.inject.Produces;
import javax.enterprise.inject.Specializes;
+import javax.enterprise.inject.Stereotype;
import javax.enterprise.inject.TypeLiteral;
import javax.enterprise.inject.UnproxyableResolutionException;
import javax.enterprise.inject.spi.AnnotatedField;
@@ -61,7 +62,6 @@
import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.inject.spi.InjectionPoint;
import javax.enterprise.inject.spi.Interceptor;
-import javax.enterprise.inject.stereotype.Stereotype;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Provider;
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inheritance/types/InhStereo1.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inheritance/types/InhStereo1.java?rev=829257&r1=829256&r2=829257&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inheritance/types/InhStereo1.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inheritance/types/InhStereo1.java Fri Oct 23 22:08:48 2009
@@ -22,7 +22,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.enterprise.inject.stereotype.Stereotype;
+import javax.enterprise.inject.Stereotype;
@Stereotype
@Inherited
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inheritance/types/InhStereo2.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inheritance/types/InhStereo2.java?rev=829257&r1=829256&r2=829257&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inheritance/types/InhStereo2.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/inheritance/types/InhStereo2.java Fri Oct 23 22:08:48 2009
@@ -22,7 +22,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.enterprise.inject.stereotype.Stereotype;
+import javax.enterprise.inject.Stereotype;
@Stereotype
@Inherited
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/sterotype/StereoWithNonScope.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/sterotype/StereoWithNonScope.java?rev=829257&r1=829256&r2=829257&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/sterotype/StereoWithNonScope.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/sterotype/StereoWithNonScope.java Fri Oct 23 22:08:48 2009
@@ -18,7 +18,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.enterprise.inject.stereotype.Stereotype;
+import javax.enterprise.inject.Stereotype;
@Stereotype
@Retention(RetentionPolicy.RUNTIME)
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/sterotype/StereoWithRequestScope.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/sterotype/StereoWithRequestScope.java?rev=829257&r1=829256&r2=829257&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/sterotype/StereoWithRequestScope.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/sterotype/StereoWithRequestScope.java Fri Oct 23 22:08:48 2009
@@ -19,7 +19,7 @@
import java.lang.annotation.Target;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.stereotype.Stereotype;
+import javax.enterprise.inject.Stereotype;
@Stereotype
@RequestScoped
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/sterotype/StereoWithSessionScope.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/sterotype/StereoWithSessionScope.java?rev=829257&r1=829256&r2=829257&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/sterotype/StereoWithSessionScope.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/sterotype/StereoWithSessionScope.java Fri Oct 23 22:08:48 2009
@@ -19,7 +19,7 @@
import java.lang.annotation.Target;
import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.stereotype.Stereotype;
+import javax.enterprise.inject.Stereotype;
@Stereotype
@SessionScoped
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/sterotype/StereoWithSessionScope2.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/sterotype/StereoWithSessionScope2.java?rev=829257&r1=829256&r2=829257&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/sterotype/StereoWithSessionScope2.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/sterotype/StereoWithSessionScope2.java Fri Oct 23 22:08:48 2009
@@ -19,7 +19,7 @@
import java.lang.annotation.Target;
import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.stereotype.Stereotype;
+import javax.enterprise.inject.Stereotype;
@Stereotype
@SessionScoped
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/xml/strict/AlternativeStereotype.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/xml/strict/AlternativeStereotype.java?rev=829257&r1=829256&r2=829257&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/xml/strict/AlternativeStereotype.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/xml/strict/AlternativeStereotype.java Fri Oct 23 22:08:48 2009
@@ -18,7 +18,7 @@
import java.lang.annotation.Retention;
import javax.enterprise.inject.Alternative;
-import javax.enterprise.inject.stereotype.Stereotype;
+import javax.enterprise.inject.Stereotype;
@Stereotype
@Alternative