Weld SVN: r6949 - cdi-api/trunk/trunk/src/main/java/javax/enterprise/event.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-08-10 16:23:30 -0400 (Tue, 10 Aug 2010)
New Revision: 6949
Modified:
cdi-api/trunk/trunk/src/main/java/javax/enterprise/event/Observes.java
Log:
WELD-455
Modified: cdi-api/trunk/trunk/src/main/java/javax/enterprise/event/Observes.java
===================================================================
--- cdi-api/trunk/trunk/src/main/java/javax/enterprise/event/Observes.java 2010-08-10 20:15:42 UTC (rev 6948)
+++ cdi-api/trunk/trunk/src/main/java/javax/enterprise/event/Observes.java 2010-08-10 20:23:30 UTC (rev 6949)
@@ -84,7 +84,7 @@
* the bean that defines the observer method already exists in the current
* context.</p>
*/
- public Reception notifyObserver() default Reception.ALWAYS;
+ public Reception receive() default Reception.ALWAYS;
/**
* <p>Specifies
15 years, 8 months
Weld SVN: r6948 - cdi-api/trunk/trunk/src/main/java/javax/enterprise/inject/spi.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-08-10 16:15:42 -0400 (Tue, 10 Aug 2010)
New Revision: 6948
Modified:
cdi-api/trunk/trunk/src/main/java/javax/enterprise/inject/spi/ProcessProducerField.java
cdi-api/trunk/trunk/src/main/java/javax/enterprise/inject/spi/ProcessProducerMethod.java
Log:
WELD-586
Modified: cdi-api/trunk/trunk/src/main/java/javax/enterprise/inject/spi/ProcessProducerField.java
===================================================================
--- cdi-api/trunk/trunk/src/main/java/javax/enterprise/inject/spi/ProcessProducerField.java 2010-08-10 12:24:39 UTC (rev 6947)
+++ cdi-api/trunk/trunk/src/main/java/javax/enterprise/inject/spi/ProcessProducerField.java 2010-08-10 20:15:42 UTC (rev 6948)
@@ -28,8 +28,8 @@
* </p>
*
* @author David Allen
- * @param <T> The class of the producer field
- * @param <X> The class of the bean representing the producer field
+ * @param <T> The class of the bean declaring the producer field
+ * @param <X> The type of the producer field
*/
public interface ProcessProducerField<T, X> extends ProcessBean<X>
{
Modified: cdi-api/trunk/trunk/src/main/java/javax/enterprise/inject/spi/ProcessProducerMethod.java
===================================================================
--- cdi-api/trunk/trunk/src/main/java/javax/enterprise/inject/spi/ProcessProducerMethod.java 2010-08-10 12:24:39 UTC (rev 6947)
+++ cdi-api/trunk/trunk/src/main/java/javax/enterprise/inject/spi/ProcessProducerMethod.java 2010-08-10 20:15:42 UTC (rev 6948)
@@ -27,8 +27,8 @@
* </p>
*
* @author David Allen
- * @param <T> The class of the return type of the producer method
- * @param <X> The class of the bean representing the producer method
+ * @param <T> The class of the bean declaring the producer method
+ * @param <X> The return type of the producer method
*/
public interface ProcessProducerMethod<T, X> extends ProcessBean<X>
{
15 years, 8 months
Weld SVN: r6947 - in cdi-tck/trunk: impl/src/main/java/org/jboss/jsr299/tck and 1 other directory.
by weld-commits@lists.jboss.org
Author: dallen6
Date: 2010-08-10 08:24:39 -0400 (Tue, 10 Aug 2010)
New Revision: 6947
Modified:
cdi-tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Beans.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java
Log:
CDITCK-94 Added serialization/deserialization support to SPI
Modified: cdi-tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Beans.java
===================================================================
--- cdi-tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Beans.java 2010-08-09 20:17:43 UTC (rev 6946)
+++ cdi-tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Beans.java 2010-08-10 12:24:39 UTC (rev 6947)
@@ -16,6 +16,8 @@
*/
package org.jboss.jsr299.tck.spi;
+import java.io.IOException;
+
/**
* Provides Bean related operations.
*
@@ -33,7 +35,7 @@
{
public static final String PROPERTY_NAME = Beans.class.getName();
-
+
/**
* Determines if the object instance is actually a proxy object.
*
@@ -41,5 +43,21 @@
* @return true if the object is a proxy
*/
public boolean isProxy(Object instance);
-
+
+ /**
+ * Serializes the object tree starting with the bean instance provided.
+ *
+ * @param instance The bean instance to serialize
+ * @return the serialized byte array of the bean instance
+ */
+ public byte[] serialize(Object instance) throws IOException;
+
+ /**
+ * Deserializes a bean instance from the given serialized bytes.
+ *
+ * @param bytes The serialized byte stream of a bean instance
+ * @return the serialized byte array of the bean instance
+ */
+ public Object deserialize(byte[] bytes) throws IOException, ClassNotFoundException;
+
}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java 2010-08-09 20:17:43 UTC (rev 6946)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java 2010-08-10 12:24:39 UTC (rev 6947)
@@ -51,16 +51,12 @@
protected byte[] serialize(Object instance) throws IOException
{
- ByteArrayOutputStream bytes = new ByteArrayOutputStream();
- ObjectOutputStream out = new ObjectOutputStream(bytes);
- out.writeObject(instance);
- return bytes.toByteArray();
+ return getCurrentConfiguration().getBeans().serialize(instance);
}
protected Object deserialize(byte[] bytes) throws IOException, ClassNotFoundException
{
- ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(bytes));
- return in.readObject();
+ return getCurrentConfiguration().getBeans().deserialize(bytes);
}
protected void setContextActive(Context context)
15 years, 8 months
Weld SVN: r6946 - cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-08-09 16:17:43 -0400 (Mon, 09 Aug 2010)
New Revision: 6946
Modified:
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessBeanObserver.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessBeanTest.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessSessionBeanTest.java
Log:
CDITCK-168
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessBeanObserver.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessBeanObserver.java 2010-08-09 20:07:23 UTC (rev 6945)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessBeanObserver.java 2010-08-09 20:17:43 UTC (rev 6946)
@@ -60,7 +60,6 @@
public void observeElephantSessionBean(@Observes ProcessSessionBean<Elephant> event)
{
ProcessBeanObserver.elephantProcessSessionBean = event;
- ProcessBeanObserver.elephantProcessBeanCount++;
}
public void observeElephantBean(@Observes ProcessBean<Elephant> event)
@@ -73,7 +72,7 @@
ProcessBeanObserver.cowProcessProducerMethod = event;
}
- public void observeCowProccesBean(@Observes ProcessBean<Cowshed> event)
+ public void observeCowShedProccesBean(@Observes ProcessBean<Cowshed> event)
{
ProcessBeanObserver.cowShedProcessBeanCount++;
}
@@ -83,7 +82,7 @@
ProcessBeanObserver.chickenProcessProducerField = event;
}
- public void observeChickenProccesBean(@Observes ProcessBean<ChickenHutch> event)
+ public void observeChickenHutchProccesBean(@Observes ProcessBean<ChickenHutch> event)
{
ProcessBeanObserver.chickenHutchProcessBeanCount++;
}
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessBeanTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessBeanTest.java 2010-08-09 20:07:23 UTC (rev 6945)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessBeanTest.java 2010-08-09 20:17:43 UTC (rev 6946)
@@ -76,7 +76,7 @@
assert ProcessBeanObserver.getCowProcessProducerMethod().getBean().getBeanClass().equals(Cowshed.class);
assert ProcessBeanObserver.getCowProcessProducerMethod().getAnnotatedProducerMethod().getBaseType().equals(Cow.class);
assert ProcessBeanObserver.getCowProcessProducerMethod().getAnnotatedProducerMethod().getDeclaringType().getBaseType().equals(Cowshed.class);
- assert ProcessBeanObserver.getCowShedProcessBeanCount() == 2;
+ assert ProcessBeanObserver.getCowShedProcessBeanCount() == 1;
assert ProcessBeanObserver.getCowProcessProducerMethod().getAnnotated() instanceof AnnotatedMethod<?>;
assert ProcessBeanObserver.getCowProcessProducerMethod().getAnnotatedProducerMethod().getJavaMember().getName().equals("getDaisy");
assert ProcessBeanObserver.getCowProcessProducerMethod().getAnnotatedProducerMethod().getJavaMember().getDeclaringClass().equals(Cowshed.class);
@@ -99,7 +99,7 @@
assert ProcessBeanObserver.getChickenProcessProducerField().getBean().getBeanClass().equals(ChickenHutch.class);
assert ProcessBeanObserver.getChickenProcessProducerField().getAnnotatedProducerField().getBaseType().equals(Chicken.class);
assert ProcessBeanObserver.getChickenProcessProducerField().getAnnotatedProducerField().getDeclaringType().getBaseType().equals(ChickenHutch.class);
- assert ProcessBeanObserver.getChickenHutchProcessBeanCount() == 2;
+ assert ProcessBeanObserver.getChickenHutchProcessBeanCount() == 1;
assert ProcessBeanObserver.getChickenProcessProducerField().getAnnotated() instanceof AnnotatedField<?>;
assert ProcessBeanObserver.getChickenProcessProducerField().getAnnotatedProducerField().getJavaMember().getName().equals("chicken");
assert ProcessBeanObserver.getChickenProcessProducerField().getAnnotatedProducerField().getJavaMember().getDeclaringClass().equals(ChickenHutch.class);
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessSessionBeanTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessSessionBeanTest.java 2010-08-09 20:07:23 UTC (rev 6945)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessSessionBeanTest.java 2010-08-09 20:17:43 UTC (rev 6946)
@@ -60,7 +60,7 @@
public void testProcessSessionBeanEvent()
{
assert ProcessBeanObserver.getElephantProcessSessionBean().getBean().getBeanClass().equals(Elephant.class);
- assert ProcessBeanObserver.getElephantProcessBeanCount() == 2;
+ assert ProcessBeanObserver.getElephantProcessBeanCount() == 0;
assert ProcessBeanObserver.getElephantProcessSessionBean().getEjbName().equals("Rosie");
assert ProcessBeanObserver.getElephantProcessSessionBean().getSessionBeanType().equals(SessionBeanType.STATELESS);
assert ProcessBeanObserver.getElephantProcessSessionBean().getAnnotated() instanceof AnnotatedType<?>;
15 years, 8 months