Weld SVN: r4341 - api/trunk/cdi/src/main/java/javax/enterprise/inject/spi.
by weld-commits＠lists.jboss.org
Author: dallen6
Date: 2009-10-26 16:03:04 -0400 (Mon, 26 Oct 2009)
New Revision: 4341
Modified:
api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/Annotated.java
api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/InjectionTarget.java
api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/Producer.java
Log:
A few fixes to JavaDocs
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/Annotated.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/Annotated.java 2009-10-26 19:27:32 UTC (rev 4340)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/Annotated.java 2009-10-26 20:03:04 UTC (rev 4341)
@@ -51,7 +51,7 @@
public Set<Type> getTypeClosure();
/**
- * Get the annotation instance on the annoated element for a given annotation
+ * Get the annotation instance on the annotated element for a given annotation
* type.
*
* @param <T> the type of the annotation
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/InjectionTarget.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/InjectionTarget.java 2009-10-26 19:27:32 UTC (rev 4340)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/InjectionTarget.java 2009-10-26 20:03:04 UTC (rev 4341)
@@ -47,22 +47,23 @@
/**
* <p>
- * Calls the {@link javax.annotation.PostConstruct} callback, if it exists,
+ * Calls the {@code PostConstruct} callback, if it exists,
* according to the semantics required by the Java EE platform specification.
* </p>
- *
- * @param instance
+ * @see javax.annotation.PostConstruct
+ * @param instance The instance on which to invoke the
+ * {@code PostConstruct} method
*/
public void postConstruct(T instance);
/**
* <p>
- * Calls the {@link javax.annotation.PreDestroy} callback, if it exists,
+ * Calls the {@code PreDestroy} callback, if it exists,
* according to the semantics required by the Java EE platform specification.
* </p>
- *
+ * @see javax.annotation.PreDestroy
* @param instance The instance on which to invoke the
- * {@link javax.annotation.PreDestroy} method
+ * {@code PreDestroy} method
*/
public void preDestroy(T instance);
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/Producer.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/Producer.java 2009-10-26 19:27:32 UTC (rev 4340)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/Producer.java 2009-10-26 20:03:04 UTC (rev 4341)
@@ -65,6 +65,7 @@
* contextual instance of the bean that declares the disposer method or
* performs any additional required cleanup, if any, to destroy state
* associated with a resource.
+ * </p>
*
* @param instance The instance to dispose
*/
14 years, 7 months
Weld SVN: r4340 - api/trunk/cdi/src/main/java/javax/enterprise/inject/spi.
by weld-commits＠lists.jboss.org
Author: dallen6
Date: 2009-10-26 15:27:32 -0400 (Mon, 26 Oct 2009)
New Revision: 4340
Modified:
api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/InjectionTarget.java
Log:
Added JavaDoc for InjectionTarget
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/InjectionTarget.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/InjectionTarget.java 2009-10-26 19:23:31 UTC (rev 4339)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/InjectionTarget.java 2009-10-26 19:27:32 UTC (rev 4340)
@@ -40,7 +40,8 @@
* </p>
*
* @param instance The instance upon which to perform injections
- * @param ctx The CreationalContext to use for creating new instances
+ * @param ctx The {@link javax.enterprise.context.spi.CreationalContext} to
+ * use for creating new instances
*/
public void inject(T instance, CreationalContext<T> ctx);
14 years, 7 months
Weld SVN: r4339 - api/trunk/cdi/src/main/java/javax/enterprise/inject/spi.
by weld-commits＠lists.jboss.org
Author: dallen6
Date: 2009-10-26 15:23:31 -0400 (Mon, 26 Oct 2009)
New Revision: 4339
Modified:
api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/InjectionTarget.java
Log:
Added JavaDoc for Producer
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/InjectionTarget.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/InjectionTarget.java 2009-10-26 18:14:09 UTC (rev 4338)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/InjectionTarget.java 2009-10-26 19:23:31 UTC (rev 4339)
@@ -19,19 +19,50 @@
import javax.enterprise.context.spi.CreationalContext;
/**
+ * <p>
+ * This interface provides operations for performing dependency injection and
+ * lifecycle callbacks on an instance of a type.
+ * </p>
*
- *
* @author Pete Muir
- *
- * @param <T>
+ * @author David Allen
+ * @param <T> The class of the instance
*/
public interface InjectionTarget<T> extends Producer<T>
{
+ /**
+ * <p>
+ * Performs dependency injection upon the given object. First, the container
+ * performs Java EE component environment injection according to the
+ * semantics required by the Java EE platform specification. Next, it sets
+ * the value of all injected fields, and then calls all initializer methods.
+ * </p>
+ *
+ * @param instance The instance upon which to perform injections
+ * @param ctx The CreationalContext to use for creating new instances
+ */
public void inject(T instance, CreationalContext<T> ctx);
+ /**
+ * <p>
+ * Calls the {@link javax.annotation.PostConstruct} callback, if it exists,
+ * according to the semantics required by the Java EE platform specification.
+ * </p>
+ *
+ * @param instance
+ */
public void postConstruct(T instance);
+ /**
+ * <p>
+ * Calls the {@link javax.annotation.PreDestroy} callback, if it exists,
+ * according to the semantics required by the Java EE platform specification.
+ * </p>
+ *
+ * @param instance The instance on which to invoke the
+ * {@link javax.annotation.PreDestroy} method
+ */
public void preDestroy(T instance);
}
14 years, 7 months
Weld SVN: r4338 - api/trunk/cdi/src/main/java/javax/enterprise/inject/spi.
by weld-commits＠lists.jboss.org
Author: dallen6
Date: 2009-10-26 14:14:09 -0400 (Mon, 26 Oct 2009)
New Revision: 4338
Modified:
api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/Producer.java
Log:
Added JavaDoc for Producer
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/Producer.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/Producer.java 2009-10-26 17:34:51 UTC (rev 4337)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/Producer.java 2009-10-26 18:14:09 UTC (rev 4338)
@@ -21,18 +21,68 @@
import javax.enterprise.context.spi.CreationalContext;
/**
+ * <p>
* The interface {@link javax.enterprise.inject.spi.Producer} provides a generic
* operation for producing an instance of a type.
+ * </p>
*
* @author Pete Muir
- *
+ * @author David Allen
* @param <T> The class of object produced by the producer
*/
public interface Producer<T>
{
+ /**
+ * <p>
+ * Causes an instance to be produced via the {@code Producer}.
+ * </p>
+ * <p>
+ * If the {@code Producer} represents a class, this will invoke the
+ * constructor annotated {@link javax.inject.Inject} if it exists, or the
+ * constructor with no parameters. If the class has interceptors, produce()
+ * is responsible for building the interceptor and decorator stacks for the
+ * instance.
+ * </p>
+ * <p>
+ * If the {@code Producer} represents a producer field or method, this will
+ * invoke the producer method on, or access the producer field of, a
+ * contextual instance of the bean that declares the producer.
+ * </p>
+ *
+ * @param ctx The {@link javax.enterprise.context.spi.CreationalContext} to
+ * use for the produced object
+ * @return an instance of the produced object
+ */
public T produce(CreationalContext<T> ctx);
+ /**
+ * <p>
+ * Destroys the instance.
+ * </p>
+ * <p>
+ * If the {@code Producer} represents a class, then this operation does
+ * nothing. Otherwise, this calls the disposer method, if any, on a
+ * contextual instance of the bean that declares the disposer method or
+ * performs any additional required cleanup, if any, to destroy state
+ * associated with a resource.
+ *
+ * @param instance The instance to dispose
+ */
public void dispose(T instance);
+ /**
+ * <p>
+ * Returns the set of all {@code InjectionPoints} for the producer. If the
+ * {@code Producer} represents a class, then this returns returns the set of
+ * {@code InjectionPoint} objects representing all injected fields, bean
+ * constructor parameters and initializer method parameters. For a producer
+ * method, this returns the set of {@code InjectionPoint} objects
+ * representing all parameters of the producer method.
+ * </p>
+ *
+ * @return the set of all
+ * {@linkplain javax.enterprise.inject.spi.InjectionPoint injection
+ * points} for the producer
+ */
public Set<InjectionPoint> getInjectionPoints();
}
\ No newline at end of file
14 years, 7 months
Weld SVN: r4337 - api/trunk/cdi/src/main/java/javax/enterprise/inject.
by weld-commits＠lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2009-10-26 13:34:51 -0400 (Mon, 26 Oct 2009)
New Revision: 4337
Modified:
api/trunk/cdi/src/main/java/javax/enterprise/inject/Specializes.java
Log:
improve
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/Specializes.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/Specializes.java 2009-10-26 17:27:40 UTC (rev 4336)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/Specializes.java 2009-10-26 17:34:51 UTC (rev 4337)
@@ -30,9 +30,15 @@
* May be applied to a bean class or producer method.</p>
*
* <p>If a bean directly specializes a second bean, it
- * inherits all qualifiers of the second bean, and has the
- * same name as the second bean. If the second bean has
- * a name, the bean may not declare a name using
+ * inherits:</p>
+ *
+ * <ul>
+ * <li>all qualifiers of the second bean, and</li>
+ * <li>the name, if any, of the second bean.</li>
+ * </ul>
+ *
+ * <p>If the second bean has a name, the bean may not
+ * declare a name using
* {@link javax.inject.Named @Named}. Furthermore,
* the bean must have all the bean types of the second
* bean.</p>
@@ -57,6 +63,9 @@
* producer method.</li>
* </ul>
*
+ * <p>If a bean is specialized by any enabled bean, the
+ * first bean is disabled.</p>
+ *
* @author Gavin King
* @author Pete Muir
*/
14 years, 7 months
Weld SVN: r4336 - in cdi-tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/decorators/definition and 5 other directories.
by weld-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2009-10-26 13:27:40 -0400 (Mon, 26 Oct 2009)
New Revision: 4336
Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/interceptor/
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/interceptor/CallOrder.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/interceptor/DecoratorAndInterceptorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/interceptor/Foo.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/interceptor/FooBinding.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/interceptor/FooDecorator.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/interceptor/FooInterceptor.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/interceptor/FooStuff.java
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/interceptor/
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/interceptor/beans.xml
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FooDecorator.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/DecoratorInvocationTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java
Log:
test updates
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FooDecorator.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FooDecorator.java 2009-10-26 17:21:58 UTC (rev 4335)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FooDecorator.java 2009-10-26 17:27:40 UTC (rev 4336)
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.jboss.jsr299.tck.tests.decorators.definition;
import javax.decorator.Decorates;
Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/interceptor/CallOrder.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/interceptor/CallOrder.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/interceptor/CallOrder.java 2009-10-26 17:27:40 UTC (rev 4336)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.jsr299.tck.tests.decorators.interceptor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CallOrder {
+ private static List<String> callers = new ArrayList<String>();
+
+ public static void resetCallers() {
+ callers = new ArrayList<String>();
+ }
+
+ public static void addCaller(String caller) {
+ callers.add(caller);
+ }
+
+ public static List<String> callers() {
+ return callers;
+ }
+
+}
Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/interceptor/DecoratorAndInterceptorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/interceptor/DecoratorAndInterceptorTest.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/interceptor/DecoratorAndInterceptorTest.java 2009-10-26 17:27:40 UTC (rev 4336)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.jsr299.tck.tests.decorators.interceptor;
+
+import java.util.List;
+
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecAssertions;
+import org.jboss.test.audit.annotations.SpecVersion;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.testng.annotations.Test;
+
+@Artifact
+@BeansXml("beans.xml")
+@SpecVersion(spec="cdi", version="20091018")
+public class DecoratorAndInterceptorTest extends AbstractJSR299Test
+{
+ @Test
+ @SpecAssertions
+ ({
+ @SpecAssertion(section = "8.2", id = "f")
+ })
+ public void testInterceptorCalledBeforeDecorator()
+ {
+ CallOrder.resetCallers();
+ Foo foo = getInstanceByType(Foo.class);
+
+ foo.doSomething();
+
+ List<String> callers = CallOrder.callers();
+
+ assert callers.size() == 2;
+ assert callers.get(0).equals(FooInterceptor.NAME);
+ assert callers.get(1).equals(FooDecorator.NAME);
+ }
+
+}
Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/interceptor/Foo.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/interceptor/Foo.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/interceptor/Foo.java 2009-10-26 17:27:40 UTC (rev 4336)
@@ -0,0 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.jsr299.tck.tests.decorators.interceptor;
+
+public interface Foo {
+
+ public void doSomething();
+
+}
Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/interceptor/FooBinding.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/interceptor/FooBinding.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/interceptor/FooBinding.java 2009-10-26 17:27:40 UTC (rev 4336)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.jsr299.tck.tests.decorators.interceptor;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import javax.interceptor.InterceptorBinding;
+
+@Inherited
+@InterceptorBinding
+(a)Target(ElementType.TYPE)
+(a)Retention(RetentionPolicy.RUNTIME)
+public @interface FooBinding {
+
+}
Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/interceptor/FooDecorator.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/interceptor/FooDecorator.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/interceptor/FooDecorator.java 2009-10-26 17:27:40 UTC (rev 4336)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.jsr299.tck.tests.decorators.interceptor;
+
+import javax.decorator.Decorates;
+import javax.decorator.Decorator;
+
+@Decorator
+public class FooDecorator implements Foo {
+ public static String NAME = "FooDecorator";
+
+ @Decorates Foo foo;
+
+ public void doSomething() {
+ CallOrder.addCaller(NAME);
+ }
+}
Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/interceptor/FooInterceptor.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/interceptor/FooInterceptor.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/interceptor/FooInterceptor.java 2009-10-26 17:27:40 UTC (rev 4336)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.jsr299.tck.tests.decorators.interceptor;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+
+@Interceptor
+@FooBinding
+public class FooInterceptor {
+ public static String NAME = "FooInterceptor";
+
+ @AroundInvoke
+ public Object interceptMe(InvocationContext ctx) throws Exception
+ {
+ CallOrder.addCaller(NAME);
+ return ctx.proceed();
+ }
+}
Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/interceptor/FooStuff.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/interceptor/FooStuff.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/interceptor/FooStuff.java 2009-10-26 17:27:40 UTC (rev 4336)
@@ -0,0 +1,26 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.jsr299.tck.tests.decorators.interceptor;
+
+@FooBinding
+public class FooStuff implements Foo {
+
+ public void doSomething() {
+
+ }
+
+}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/DecoratorInvocationTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/DecoratorInvocationTest.java 2009-10-26 17:21:58 UTC (rev 4335)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/DecoratorInvocationTest.java 2009-10-26 17:27:40 UTC (rev 4336)
@@ -56,6 +56,7 @@
@Test
@SpecAssertions({
+ @SpecAssertion(section="8.2", id="b"),
@SpecAssertion(section="8.5", id="d"),
@SpecAssertion(section="8.5", id="e"),
@SpecAssertion(section="8.5", id="f"),
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java 2009-10-26 17:21:58 UTC (rev 4335)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java 2009-10-26 17:27:40 UTC (rev 4336)
@@ -251,7 +251,10 @@
})
public void testInterceptorBindingAnnotation()
{
- Interceptor<?> interceptorBean = getLoggedInterceptors().iterator().next();
+ List<Interceptor<?>> interceptors = getLoggedInterceptors();
+ assert interceptors.size() > 1;
+
+ Interceptor<?> interceptorBean = interceptors.iterator().next();
assert interceptorBean.getInterceptorBindingTypes().size() == 1;
assert interceptorBean.getInterceptorBindingTypes().contains(new AnnotationLiteral<Logged>(){});
Added: cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/interceptor/beans.xml
===================================================================
--- cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/interceptor/beans.xml (rev 0)
+++ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/interceptor/beans.xml 2009-10-26 17:27:40 UTC (rev 4336)
@@ -0,0 +1,9 @@
+<beans>
+ <interceptors>
+ <class>org.jboss.jsr299.tck.tests.decorators.interceptor.FooInterceptor</class>
+ </interceptors>
+
+ <decorators>
+ <class>org.jboss.jsr299.tck.tests.decorators.interceptor.FooDecorator</class>
+ </decorators>
+</beans>
14 years, 7 months
Weld SVN: r4335 - api/trunk/cdi/src/main/java/javax/enterprise/event.
by weld-commits＠lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2009-10-26 13:21:58 -0400 (Mon, 26 Oct 2009)
New Revision: 4335
Modified:
api/trunk/cdi/src/main/java/javax/enterprise/event/Reception.java
api/trunk/cdi/src/main/java/javax/enterprise/event/TransactionPhase.java
Log:
links
Modified: api/trunk/cdi/src/main/java/javax/enterprise/event/Reception.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/event/Reception.java 2009-10-26 17:16:11 UTC (rev 4334)
+++ api/trunk/cdi/src/main/java/javax/enterprise/event/Reception.java 2009-10-26 17:21:58 UTC (rev 4335)
@@ -17,8 +17,9 @@
package javax.enterprise.event;
/**
- * <p>Distinguishes conditional observer methods from observer methods
- * which are always notified.</p>
+ * <p>Distinguishes conditional
+ * {@linkplain javax.enterprise.event.Observes observer methods} from observer
+ * methods which are always notified.</p>
*
* <p>A conditional observer method is an observer method which is notified
* of an event only if an instance of the bean that defines the observer
Modified: api/trunk/cdi/src/main/java/javax/enterprise/event/TransactionPhase.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/event/TransactionPhase.java 2009-10-26 17:16:11 UTC (rev 4334)
+++ api/trunk/cdi/src/main/java/javax/enterprise/event/TransactionPhase.java 2009-10-26 17:21:58 UTC (rev 4335)
@@ -17,7 +17,8 @@
package javax.enterprise.event;
/**
- * <p>Distinguishes the various kinds of transactional observer methods
+ * <p>Distinguishes the various kinds of transactional
+ * {@linkplain javax.enterprise.event.Observes observer methods}
* from regular observer methods which are notified immediately.</p>
*
* <p>Transactional observer methods are observer methods which receive
14 years, 7 months
Weld SVN: r4334 - api/trunk/cdi/src/main/java/javax/enterprise/context.
by weld-commits＠lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2009-10-26 13:16:11 -0400 (Mon, 26 Oct 2009)
New Revision: 4334
Modified:
api/trunk/cdi/src/main/java/javax/enterprise/context/Conversation.java
Log:
link
Modified: api/trunk/cdi/src/main/java/javax/enterprise/context/Conversation.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/context/Conversation.java 2009-10-26 17:14:51 UTC (rev 4333)
+++ api/trunk/cdi/src/main/java/javax/enterprise/context/Conversation.java 2009-10-26 17:16:11 UTC (rev 4334)
@@ -17,7 +17,8 @@
package javax.enterprise.context;
/**
- * <p>Allows the application to manage the conversation context
+ * <p>Allows the application to manage the
+ * {@linkplain javax.enterprise.context.ConversationScoped conversation context}
* by marking the current conversation as transient or long-running,
* specifying a conversation identifier, or setting the conversation
* timeout.</p>
14 years, 7 months
Weld SVN: r4333 - api/trunk/cdi/src/main/java/javax/enterprise/context.
by weld-commits＠lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2009-10-26 13:14:51 -0400 (Mon, 26 Oct 2009)
New Revision: 4333
Modified:
api/trunk/cdi/src/main/java/javax/enterprise/context/Conversation.java
Log:
link
Modified: api/trunk/cdi/src/main/java/javax/enterprise/context/Conversation.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/context/Conversation.java 2009-10-26 17:10:41 UTC (rev 4332)
+++ api/trunk/cdi/src/main/java/javax/enterprise/context/Conversation.java 2009-10-26 17:14:51 UTC (rev 4333)
@@ -32,6 +32,8 @@
* that a conversation should not be destroyed if it has been
* active within the last given interval in milliseconds.</p>
*
+ * @see javax.enterprise.context.ConversationScoped @ConversationScoped
+ *
* @author Pete Muir
* @author Gavin King
*
14 years, 7 months
Weld SVN: r4332 - in api/trunk/cdi/src/main/java/javax: enterprise/context and 2 other directories.
by weld-commits＠lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2009-10-26 13:10:41 -0400 (Mon, 26 Oct 2009)
New Revision: 4332
Modified:
api/trunk/cdi/src/main/java/javax/decorator/package-info.java
api/trunk/cdi/src/main/java/javax/enterprise/context/package-info.java
api/trunk/cdi/src/main/java/javax/enterprise/event/package-info.java
api/trunk/cdi/src/main/java/javax/enterprise/inject/package-info.java
Log:
links
Modified: api/trunk/cdi/src/main/java/javax/decorator/package-info.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/decorator/package-info.java 2009-10-26 17:06:29 UTC (rev 4331)
+++ api/trunk/cdi/src/main/java/javax/decorator/package-info.java 2009-10-26 17:10:41 UTC (rev 4332)
@@ -64,6 +64,8 @@
* the bean.</li>
* </ul>
*
+ * @see javax.enterprise.inject
+ *
* @see javax.decorator.Decorator
* @see javax.decorator.Decorates
*
Modified: api/trunk/cdi/src/main/java/javax/enterprise/context/package-info.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/context/package-info.java 2009-10-26 17:06:29 UTC (rev 4331)
+++ api/trunk/cdi/src/main/java/javax/enterprise/context/package-info.java 2009-10-26 17:10:41 UTC (rev 4332)
@@ -116,5 +116,7 @@
* method is only valid until the invocation of the method completes.</li>
* </ul>
*
+ * @see javax.enterprise.inject
+ *
*/
package javax.enterprise.context;
\ No newline at end of file
Modified: api/trunk/cdi/src/main/java/javax/enterprise/event/package-info.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/event/package-info.java 2009-10-26 17:06:29 UTC (rev 4331)
+++ api/trunk/cdi/src/main/java/javax/enterprise/event/package-info.java 2009-10-26 17:10:41 UTC (rev 4332)
@@ -72,6 +72,8 @@
* {@link javax.enterprise.event.ObserverException}.</li>
* </ul>
*
+ * @see javax.enterprise.inject
+ *
* @see javax.enterprise.event.Observes
* @see javax.enterprise.event.Event
* @see javax.inject.Qualifier
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/package-info.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/package-info.java 2009-10-26 17:06:29 UTC (rev 4331)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/package-info.java 2009-10-26 17:10:41 UTC (rev 4332)
@@ -393,6 +393,7 @@
* @see javax.inject
* @see javax.interceptor
* @see javax.decorator
+ * @see javax.enterprise.event
*
* @see javax.enterprise.inject.Produces
* @see javax.enterprise.inject.Alternative
14 years, 7 months