Author: pete.muir(a)jboss.org Date: 2010-02-20 18:11:37 -0500 (Sat, 20 Feb 2010) New Revision: 5908 Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/CargoShip.java cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/Interceptor3.java cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/Interceptor4.java cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/LakeCargoShip.java Log: port changes from r5659 and r5661 to the branch Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/CargoShip.java =================================================================== --- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/CargoShip.java 2010-02-20 22:45:14 UTC (rev 5907) +++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/CargoShip.java 2010-02-20 23:11:37 UTC (rev 5908) @@ -17,9 +17,7 @@ package org.jboss.jsr299.tck.interceptors.tests.lifecycleCallback.order; import javax.annotation.PostConstruct; -import javax.interceptor.Interceptors; -@Interceptors( { Interceptor3.class, Interceptor4.class }) class CargoShip extends Ship { @PostConstruct Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/Interceptor3.java =================================================================== --- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/Interceptor3.java 2010-02-20 22:45:14 UTC (rev 5907) +++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/Interceptor3.java 2010-02-20 23:11:37 UTC (rev 5908) @@ -19,7 +19,7 @@ import javax.annotation.PostConstruct; import javax.interceptor.InvocationContext; -class Interceptor3 +class Interceptor3 extends Interceptor2 { @PostConstruct void postConstruct3(InvocationContext ctx) Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/Interceptor4.java =================================================================== --- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/Interceptor4.java 2010-02-20 22:45:14 UTC (rev 5907) +++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/Interceptor4.java 2010-02-20 23:11:37 UTC (rev 5908) @@ -19,7 +19,7 @@ import javax.annotation.PostConstruct; import javax.interceptor.InvocationContext; -class Interceptor4 +class Interceptor4 extends Interceptor3 { @PostConstruct void postConstruct(InvocationContext ctx) Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/LakeCargoShip.java =================================================================== --- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/LakeCargoShip.java 2010-02-20 22:45:14 UTC (rev 5907) +++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/LakeCargoShip.java 2010-02-20 23:11:37 UTC (rev 5908) @@ -17,7 +17,9 @@ package org.jboss.jsr299.tck.interceptors.tests.lifecycleCallback.order; import javax.annotation.PostConstruct; +import javax.interceptor.Interceptors; +@Interceptors( { Interceptor1.class, Interceptor4.class }) class LakeCargoShip extends CargoShip { // Every interceptor sets this property to a certain value.