[webbeans-commits] Webbeans SVN: r1399 - in tck/trunk/impl/src: main/java/org/jboss/webbeans/tck/impl and 49 other directories.

Author: pete.muir(a)jboss.org Date: 2009-02-03 18:32:36 -0500 (Tue, 03 Feb 2009) New Revision: 1399 Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/SpecAssertion.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/SpecAssertions.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/literals/ Removed: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/SpecAssertion.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/SpecAssertions.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/literals/ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/ArtifactTest.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/Cow.java Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/TCKArtifact.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/standard/war/WarArtifact.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/ContextTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/application/ApplicationContextTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/conversation/ConversationContextTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/dependent/DependentContextTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/PassivatingContextTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/request/RequestContextTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/session/SessionContextTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/EventTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/implementation/enterprise/EnterpriseBeanLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/lookup/byname/ResolutionByNameTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/lookup/manager/ManagerTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/lookup/non/contextual/NonContextualInjectionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/literals/CurrentBinding.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/literals/NewLiteral.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/ContextTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/NormalContextTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/DependentContextTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/PassivatingContextTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/BeanDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/BindingDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/BrokenDeploymentTypeTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/CustomDeploymentTypeTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DefaultDeploymentTypeTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/NameDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/ScopeDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/type/ApiTypeDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/EventTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/commonAnnotations/ResourceInjectionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/decorator/DecoratorDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/deployment/BeanDeploymentTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/EnterpriseBeanDeclarationTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/EnterpriseBeanRemoveMethodTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/NewEnterpriseBeanTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/InitializerMethodTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/interceptor/InterceptorDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/jms/JmsDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/DisposalMethodDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/ProducerMethodDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/NewSimpleBeanTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/RealizationTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/SimpleBeanSpecializationTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/InstantiationByNameTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/ResolutionByNameTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/ClientProxyTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/InjectionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/InjectionPointTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/manager/ManagerTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/InstantiationByTypeTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/ResolutionByTypeTest.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/all/ArtifactTest.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/ArtifactTest.java Log: alter packages, default includes for a TCK test (no test) Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/SpecAssertion.java (from rev 1398, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/SpecAssertion.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/SpecAssertion.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/SpecAssertion.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -0,0 +1,14 @@ +package org.jboss.webbeans.tck; + +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; + +(a)Target(ElementType.METHOD) +@Documented +public @interface SpecAssertion +{ + public String section(); + public String id(); + public String note() default ""; +} Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/SpecAssertions.java (from rev 1398, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/SpecAssertions.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/SpecAssertions.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/SpecAssertions.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -0,0 +1,12 @@ +package org.jboss.webbeans.tck; + +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; + +(a)Target(ElementType.METHOD) +@Documented +public @interface SpecAssertions +{ + public SpecAssertion[] value(); +} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/SpecAssertion.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/SpecAssertion.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/SpecAssertion.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -1,14 +0,0 @@ -package org.jboss.webbeans.tck.impl; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Target; - -(a)Target(ElementType.METHOD) -@Documented -public @interface SpecAssertion -{ - public String section(); - public String id(); - public String note() default ""; -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/SpecAssertions.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/SpecAssertions.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/SpecAssertions.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -1,12 +0,0 @@ -package org.jboss.webbeans.tck.impl; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Target; - -(a)Target(ElementType.METHOD) -@Documented -public @interface SpecAssertions -{ - public SpecAssertion[] value(); -} Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/TCKArtifact.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/TCKArtifact.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/TCKArtifact.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -1,7 +1,8 @@ package org.jboss.webbeans.tck.impl.packaging; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.WebBeansTCKImpl; +import org.jboss.webbeans.tck.impl.util.Reflections; +import org.jboss.webbeans.tck.literals.NewLiteral; public class TCKArtifact extends Artifact { @@ -9,8 +10,9 @@ public TCKArtifact() { super(); - getClasses().add(AbstractTest.class); - getClasses().add(WebBeansTCKImpl.class); + getPackages().add(AbstractTest.class.getPackage()); + getPackages().add(NewLiteral.class.getPackage()); + getPackages().add(Reflections.class.getPackage()); } Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/standard/war/WarArtifact.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/standard/war/WarArtifact.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/standard/war/WarArtifact.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -7,10 +7,10 @@ import java.util.HashSet; import java.util.Set; -import org.jboss.webbeans.tck.impl.packaging.Artifact; import org.jboss.webbeans.tck.impl.packaging.ResourceDescriptor; +import org.jboss.webbeans.tck.impl.packaging.TCKArtifact; -public class WarArtifact extends Artifact +public class WarArtifact extends TCKArtifact { public static final String WEB_XML_DESTINATION = "WEB-INF/web.xml"; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/ContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/ContextTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/ContextTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -17,7 +17,7 @@ package org.jboss.webbeans.tck.integration.context; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/application/ApplicationContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/application/ApplicationContextTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/application/ApplicationContextTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.integration.context.application; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/conversation/ConversationContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/conversation/ConversationContextTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/conversation/ConversationContextTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.integration.context.conversation; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/dependent/DependentContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/dependent/DependentContextTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/dependent/DependentContextTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -17,7 +17,7 @@ package org.jboss.webbeans.tck.integration.context.dependent; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/PassivatingContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/PassivatingContextTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/passivating/PassivatingContextTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -3,7 +3,7 @@ import javax.inject.IllegalProductException; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/request/RequestContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/request/RequestContextTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/request/RequestContextTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.integration.context.request; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/session/SessionContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/session/SessionContextTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/session/SessionContextTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.integration.context.session; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/EventTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/EventTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/EventTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -23,7 +23,7 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/implementation/enterprise/EnterpriseBeanLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/implementation/enterprise/EnterpriseBeanLifecycleTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/implementation/enterprise/EnterpriseBeanLifecycleTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.integration.implementation.enterprise; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/lookup/byname/ResolutionByNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/lookup/byname/ResolutionByNameTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/lookup/byname/ResolutionByNameTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.integration.lookup.byname; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/lookup/manager/ManagerTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/lookup/manager/ManagerTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/lookup/manager/ManagerTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.integration.lookup.manager; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; public class ManagerTest extends AbstractTest Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/lookup/non/contextual/NonContextualInjectionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/lookup/non/contextual/NonContextualInjectionTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/lookup/non/contextual/NonContextualInjectionTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.integration.lookup.non.contextual; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/literals (from rev 1398, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/literals) Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/literals/CurrentBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/literals/CurrentBinding.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/literals/CurrentBinding.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.tck.impl.literals; +package org.jboss.webbeans.tck.literals; import javax.inject.AnnotationLiteral; import javax.inject.Current; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/literals/NewLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/literals/NewLiteral.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/literals/NewLiteral.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.tck.impl.literals; +package org.jboss.webbeans.tck.literals; import javax.inject.AnnotationLiteral; import javax.inject.New; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/ContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/ContextTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/ContextTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -11,7 +11,7 @@ import javax.context.RequestScoped; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/NormalContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/NormalContextTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/NormalContextTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -9,7 +9,7 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/DependentContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/DependentContextTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/DependentContextTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -10,7 +10,7 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/PassivatingContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/PassivatingContextTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/passivating/PassivatingContextTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -9,7 +9,7 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/BeanDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/BeanDefinitionTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/BeanDefinitionTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -7,8 +7,8 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecAssertions; +import org.jboss.webbeans.tck.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertions; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/BindingDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/BindingDefinitionTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/BindingDefinitionTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -9,9 +9,9 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecAssertions; -import org.jboss.webbeans.tck.impl.literals.CurrentBinding; +import org.jboss.webbeans.tck.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertions; +import org.jboss.webbeans.tck.literals.CurrentBinding; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/BrokenDeploymentTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/BrokenDeploymentTypeTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/BrokenDeploymentTypeTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -3,7 +3,7 @@ import javax.inject.DeploymentException; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/CustomDeploymentTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/CustomDeploymentTypeTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/CustomDeploymentTypeTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -9,8 +9,8 @@ import javax.inject.Standard; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecAssertions; +import org.jboss.webbeans.tck.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertions; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DefaultDeploymentTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DefaultDeploymentTypeTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DefaultDeploymentTypeTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -6,8 +6,8 @@ import javax.inject.Standard; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecAssertions; +import org.jboss.webbeans.tck.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertions; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -10,8 +10,8 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecAssertions; +import org.jboss.webbeans.tck.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertions; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/NameDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/NameDefinitionTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/name/NameDefinitionTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -7,8 +7,8 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecAssertions; +import org.jboss.webbeans.tck.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertions; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/ScopeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/ScopeDefinitionTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/ScopeDefinitionTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -7,8 +7,8 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecAssertions; +import org.jboss.webbeans.tck.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertions; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeDefinitionTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeDefinitionTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -11,8 +11,8 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecAssertions; +import org.jboss.webbeans.tck.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertions; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/type/ApiTypeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/type/ApiTypeDefinitionTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/type/ApiTypeDefinitionTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -3,7 +3,7 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/EventTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/EventTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/EventTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -16,8 +16,8 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecAssertions; +import org.jboss.webbeans.tck.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertions; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/commonAnnotations/ResourceInjectionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/commonAnnotations/ResourceInjectionTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/commonAnnotations/ResourceInjectionTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.implementation.commonAnnotations; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/decorator/DecoratorDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/decorator/DecoratorDefinitionTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/decorator/DecoratorDefinitionTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.implementation.decorator; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; public class DecoratorDefinitionTest Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/deployment/BeanDeploymentTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/deployment/BeanDeploymentTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/deployment/BeanDeploymentTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.implementation.deployment; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/EnterpriseBeanDeclarationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/EnterpriseBeanDeclarationTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/EnterpriseBeanDeclarationTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -3,7 +3,7 @@ import javax.inject.DefinitionException; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/EnterpriseBeanRemoveMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/EnterpriseBeanRemoveMethodTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/EnterpriseBeanRemoveMethodTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.implementation.enterprise; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/NewEnterpriseBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/NewEnterpriseBeanTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/NewEnterpriseBeanTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -12,8 +12,8 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.literals.NewLiteral; +import org.jboss.webbeans.tck.SpecAssertion; +import org.jboss.webbeans.tck.literals.NewLiteral; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/InitializerMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/InitializerMethodTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/InitializerMethodTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -4,8 +4,8 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecAssertions; +import org.jboss.webbeans.tck.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertions; import org.jboss.webbeans.tck.impl.util.MockCreationalContext; import org.testng.annotations.Test; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/interceptor/InterceptorDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/interceptor/InterceptorDefinitionTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/interceptor/InterceptorDefinitionTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.implementation.interceptor; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/jms/JmsDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/jms/JmsDefinitionTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/jms/JmsDefinitionTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -3,7 +3,7 @@ import javax.inject.DefinitionException; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -13,9 +13,9 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecAssertions; -import org.jboss.webbeans.tck.impl.literals.CurrentBinding; +import org.jboss.webbeans.tck.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertions; +import org.jboss.webbeans.tck.literals.CurrentBinding; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -10,8 +10,8 @@ import javax.inject.Standard; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecAssertions; +import org.jboss.webbeans.tck.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertions; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/DisposalMethodDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/DisposalMethodDefinitionTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/DisposalMethodDefinitionTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.unit.implementation.producer.method; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/ProducerMethodDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/ProducerMethodDefinitionTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/ProducerMethodDefinitionTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -9,8 +9,8 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecAssertions; +import org.jboss.webbeans.tck.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertions; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -7,8 +7,8 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecAssertions; +import org.jboss.webbeans.tck.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertions; import org.jboss.webbeans.tck.impl.util.MockCreationalContext; import org.testng.annotations.Test; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/NewSimpleBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/NewSimpleBeanTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/NewSimpleBeanTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -12,8 +12,8 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.literals.NewLiteral; +import org.jboss.webbeans.tck.SpecAssertion; +import org.jboss.webbeans.tck.literals.NewLiteral; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -7,7 +7,7 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.jboss.webbeans.tck.impl.util.MockCreationalContext; import org.jboss.webbeans.tck.unit.implementation.simple.OuterBean_Broken.InnerBean_Broken; import org.jboss.webbeans.tck.unit.implementation.simple.OuterBean_Broken.StaticInnerBean_Broken; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanLifecycleTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/simple/SimpleBeanLifecycleTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -7,7 +7,7 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.jboss.webbeans.tck.impl.util.MockCreationalContext; import org.testng.annotations.Test; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/RealizationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/RealizationTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/RealizationTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -10,7 +10,7 @@ import javax.inject.AnnotationLiteral; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -11,8 +11,8 @@ import javax.inject.InconsistentSpecializationException; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecAssertions; +import org.jboss.webbeans.tck.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertions; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -11,8 +11,8 @@ import javax.inject.InconsistentSpecializationException; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecAssertions; +import org.jboss.webbeans.tck.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertions; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/SimpleBeanSpecializationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/SimpleBeanSpecializationTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/SimpleBeanSpecializationTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -11,8 +11,8 @@ import javax.inject.InconsistentSpecializationException; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecAssertions; +import org.jboss.webbeans.tck.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertions; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/InstantiationByNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/InstantiationByNameTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/InstantiationByNameTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -4,7 +4,7 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/ResolutionByNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/ResolutionByNameTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/ResolutionByNameTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -7,7 +7,7 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/ClientProxyTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/ClientProxyTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/ClientProxyTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -11,7 +11,7 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/InjectionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/InjectionTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/InjectionTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -11,7 +11,7 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.jboss.webbeans.tck.impl.util.MockCreationalContext; import org.testng.annotations.Test; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/InjectionPointTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/InjectionPointTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/InjectionPointTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -31,8 +31,8 @@ import javax.inject.manager.InjectionPoint; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.literals.CurrentBinding; +import org.jboss.webbeans.tck.SpecAssertion; +import org.jboss.webbeans.tck.literals.CurrentBinding; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/manager/ManagerTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/manager/ManagerTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/manager/ManagerTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -1,7 +1,7 @@ package org.jboss.webbeans.tck.unit.lookup.manager; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertion; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/InstantiationByTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/InstantiationByTypeTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/InstantiationByTypeTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -12,8 +12,8 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.literals.CurrentBinding; +import org.jboss.webbeans.tck.SpecAssertion; +import org.jboss.webbeans.tck.literals.CurrentBinding; import org.testng.annotations.Test; /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/ResolutionByTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/ResolutionByTypeTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/ResolutionByTypeTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -12,9 +12,9 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecAssertions; -import org.jboss.webbeans.tck.impl.literals.CurrentBinding; +import org.jboss.webbeans.tck.SpecAssertion; +import org.jboss.webbeans.tck.SpecAssertions; +import org.jboss.webbeans.tck.literals.CurrentBinding; import org.testng.annotations.Test; /** Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/ArtifactTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/ArtifactTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/ArtifactTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -1,107 +0,0 @@ -package org.jboss.webbeans.tck.impl.test; - -import java.io.File; -import java.io.FilenameFilter; - -import org.jboss.webbeans.tck.impl.packaging.standard.war.WarArtifact; -import org.testng.annotations.Test; - -public class ArtifactTest -{ - - protected static final FilenameFilter WEB_INF_FILTER = new FilenameFilter() - { - public boolean accept(File dir, String name) - { - return name.equals("WEB-INF"); - } - }; - - protected static final FilenameFilter BEANS_XML_FILTER = new FilenameFilter() - { - - public boolean accept(File dir, String name) - { - return name.equals("beans.xml"); - } - - }; - - - - protected static final FilenameFilter WEB_XML_FILTER = new FilenameFilter() - { - - public boolean accept(File dir, String name) - { - return name.equals("web.xml"); - } - - }; - - - @Test - public void testDefaultWar() throws Exception - { - WarArtifact war = new WarArtifact(); - war.getClasses().add(Cow.class); - File root = war.create(); - assert root.listFiles().length == 2; - assert root.isDirectory(); - assert root.listFiles(WEB_INF_FILTER).length == 1; - File webInf = root.listFiles(WEB_INF_FILTER)[0]; - assert webInf.getName().equals("WEB-INF"); - assert webInf.isDirectory(); - assert webInf.listFiles().length == 2; - assert webInf.listFiles(BEANS_XML_FILTER).length == 1; - File beansXml = webInf.listFiles(BEANS_XML_FILTER)[0]; - assert beansXml.isFile(); - assert beansXml.getName().equals("beans.xml"); - assert beansXml.length() == 0; - assert webInf.listFiles(WEB_XML_FILTER).length == 1; - File webXml = webInf.listFiles(WEB_XML_FILTER)[0]; - assert webXml.isFile(); - assert webXml.getName().equals("web.xml"); - assert webXml.length() != 0; - File currentPackage = getCurrentPackageAsFile(root); - File[] cowClasses = currentPackage.listFiles(new FilenameFilter() - { - - public boolean accept(File dir, String name) - { - return name.equals("Cow.class"); - } - - }); - assert cowClasses.length == 1; - assert cowClasses[0].getName().equals("Cow.class"); - assert cowClasses[0].isFile(); - } - - private File getCurrentPackageAsFile(File root) - { - String[] packageHierarchy = getClass().getPackage().getName().split("\\."); - for (final String packageName : packageHierarchy) - { - File[] files = root.listFiles(new FilenameFilter() - { - - public boolean accept(File dir, String name) - { - return name.equals(packageName); - } - - }); - if (files.length == 1) - { - root = files[0]; - } - else - { - throw new IllegalStateException("Unable to traverse package hierarchy " + packageHierarchy); - } - } - return root; - } - -} Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/Cow.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/Cow.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/Cow.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.tck.impl.test; - -class Cow -{ - -} Modified: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/all/ArtifactTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/all/ArtifactTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/all/ArtifactTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -4,7 +4,7 @@ import java.io.FilenameFilter; import java.util.Arrays; -import org.jboss.webbeans.tck.impl.packaging.standard.war.WarArtifact; +import org.jboss.webbeans.tck.impl.packaging.Artifact; import org.jboss.webbeans.tck.impl.test.packaging.AbstractArtifactTest; import org.testng.annotations.Test; @@ -14,9 +14,9 @@ @Test public void testAllClassesInPackage() throws Exception { - WarArtifact war = new WarArtifact(); - war.getPackages().add(ArtifactTest.class.getPackage()); - File root = war.create(); + Artifact artifact = new Artifact(); + artifact.getPackages().add(ArtifactTest.class.getPackage()); + File root = artifact.create(); File currentPackage = getCurrentPackageAsFile(root); System.out.println(Arrays.asList(currentPackage.listFiles())); assert currentPackage.listFiles().length == 6; Modified: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/ArtifactTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/ArtifactTest.java 2009-02-03 23:23:24 UTC (rev 1398) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/ArtifactTest.java 2009-02-03 23:32:36 UTC (rev 1399) @@ -3,7 +3,7 @@ import java.io.File; import java.io.FilenameFilter; -import org.jboss.webbeans.tck.impl.packaging.standard.war.WarArtifact; +import org.jboss.webbeans.tck.impl.packaging.Artifact; import org.jboss.webbeans.tck.impl.test.packaging.AbstractArtifactTest; import org.testng.annotations.Test; @@ -13,9 +13,9 @@ @Test public void testAllClassesInPackageAndNotSubPackages() throws Exception { - WarArtifact war = new WarArtifact(); - war.getPackages().add(ArtifactTest.class.getPackage()); - File root = war.create(); + Artifact artifact = new Artifact(); + artifact.getPackages().add(ArtifactTest.class.getPackage()); + File root = artifact.create(); File currentPackage = getCurrentPackageAsFile(root); assert currentPackage.listFiles().length == 4; File[] cowClasses = currentPackage.listFiles(new FilenameFilter()