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 2008/12/28 23:21:51 UTC
svn commit: r729791 - in
/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans:
config/DefinitionUtil.java event/EventImpl.java
inject/AbstractInjectable.java util/ClassUtil.java util/WebBeansUtil.java
Author: gerdogdu
Date: Sun Dec 28 14:21:50 2008
New Revision: 729791
URL: http://svn.apache.org/viewvc?rev=729791&view=rev
Log:
Arranging and testing for M1 Release.
Modified:
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java?rev=729791&r1=729790&r2=729791&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java Sun Dec 28 14:21:50 2008
@@ -31,7 +31,7 @@
import javax.webbeans.Initializer;
import javax.webbeans.Named;
import javax.webbeans.NonBinding;
-import javax.webbeans.Observable;
+import javax.webbeans.Fires;
import javax.webbeans.Observes;
import javax.webbeans.Produces;
import javax.webbeans.ScopeType;
@@ -355,7 +355,7 @@
}
}
- Type[] observableTypes = AnnotationUtil.getMethodParameterGenericTypesWithGivenAnnotation(declaredMethod, Observable.class);
+ Type[] observableTypes = AnnotationUtil.getMethodParameterGenericTypesWithGivenAnnotation(declaredMethod, Fires.class);
EventUtil.checkObservableMethodParameterConditions(observableTypes, "method parameter","method : " + declaredMethod.getName() + "in class : " + clazz.getName());
ProducerComponentImpl<?> newComponent = createProducerComponent(declaredMethod.getReturnType(), declaredMethod ,component);
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java?rev=729791&r1=729790&r2=729791&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java Sun Dec 28 14:21:50 2008
@@ -21,7 +21,7 @@
import java.util.List;
import javax.webbeans.Event;
-import javax.webbeans.Observable;
+import javax.webbeans.Fires;
import javax.webbeans.Observer;
import org.apache.webbeans.container.ManagerImpl;
@@ -61,7 +61,7 @@
for(Annotation binding : injectedBindings)
{
- if(!binding.annotationType().equals(Observable.class))
+ if(!binding.annotationType().equals(Fires.class))
{
eventBindings.add(binding);
}
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java?rev=729791&r1=729790&r2=729791&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java Sun Dec 28 14:21:50 2008
@@ -23,7 +23,7 @@
import javax.webbeans.Dependent;
import javax.webbeans.New;
-import javax.webbeans.Observable;
+import javax.webbeans.Fires;
import javax.webbeans.manager.Bean;
import org.apache.webbeans.component.AbstractComponent;
@@ -125,7 +125,7 @@
{
for(Annotation ann : annotations)
{
- if(ann.annotationType().equals(Observable.class))
+ if(ann.annotationType().equals(Fires.class))
{
return true;
}
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java?rev=729791&r1=729790&r2=729791&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java Sun Dec 28 14:21:50 2008
@@ -533,10 +533,7 @@
Method[] methods = clazz.getMethods();
for (Method method : methods)
{
- if(!method.getName().equals("toString"))
- {
- list.add(method.getName());
- }
+ list.add(method.getName());
}
return list;
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=729791&r1=729790&r2=729791&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 Sun Dec 28 14:21:50 2008
@@ -57,7 +57,7 @@
import javax.webbeans.Initializer;
import javax.webbeans.Named;
import javax.webbeans.New;
-import javax.webbeans.Observable;
+import javax.webbeans.Fires;
import javax.webbeans.Observes;
import javax.webbeans.Produces;
import javax.webbeans.RequestScoped;
@@ -226,7 +226,7 @@
if (result != null)
{
- Type[] observableTypes = AnnotationUtil.getConstructorParameterGenericTypesWithGivenAnnotation(result, Observable.class);
+ Type[] observableTypes = AnnotationUtil.getConstructorParameterGenericTypesWithGivenAnnotation(result, Fires.class);
EventUtil.checkObservableMethodParameterConditions(observableTypes, "constructor parameter", "constructor : " + result.getName() + "in class : " + clazz.getName());
Annotation[][] parameterAnns = result.getParameterAnnotations();
@@ -340,7 +340,7 @@
public static void checkProducerMethodDisposal(Method disposalMethod, String parentImplClazzName)
{
- Type[] observableTypes = AnnotationUtil.getMethodParameterGenericTypesWithGivenAnnotation(disposalMethod, Observable.class);
+ Type[] observableTypes = AnnotationUtil.getMethodParameterGenericTypesWithGivenAnnotation(disposalMethod, Fires.class);
EventUtil.checkObservableMethodParameterConditions(observableTypes, "method parameter", "method : " + disposalMethod.getName() + "in class : " + parentImplClazzName);
@@ -1146,7 +1146,7 @@
Asserts.assertNotNull(method, "method parameter can not be null");
Asserts.nullCheckForClass(clazz);
- Type[] observableTypes = AnnotationUtil.getMethodParameterGenericTypesWithGivenAnnotation(method, Observable.class);
+ Type[] observableTypes = AnnotationUtil.getMethodParameterGenericTypesWithGivenAnnotation(method, Fires.class);
EventUtil.checkObservableMethodParameterConditions(observableTypes, "method parameter", "method : " + method.getName() + "in class : " + clazz.getName());
if(AnnotationUtil.isMethodParameterAnnotationExist(method, Disposes.class) ||
@@ -1226,7 +1226,7 @@
{
Asserts.nullCheckForClass(clazz);
- Field[] candidateFields = AnnotationUtil.getClazzFieldsWithGivenAnnotation(clazz, Observable.class);
+ Field[] candidateFields = AnnotationUtil.getClazzFieldsWithGivenAnnotation(clazz, Fires.class);
for(Field candidateField : candidateFields)
{