[webbeans-commits] Webbeans SVN: r848 - in tck/trunk: api/src/main/java/org/jboss/webbeans/tck/api and 5 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Fri Jan 9 07:17:03 EST 2009
Author: shane.bryzak at jboss.com
Date: 2009-01-09 07:17:03 -0500 (Fri, 09 Jan 2009)
New Revision: 848
Added:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/AbstractTest.java
Removed:
tck/trunk/api/src/main/java/org/jboss/webbeans/tck/test/
Modified:
tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Beans.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/TckUtils.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/BindingTypeTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/SpecAssertion.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/SpecVersion.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/AnimalStereotype.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/Chunky.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/HornedAnimalDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/Synchronous.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/Tame.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/Whitefish.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Animal.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Barn.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/BlackWidow.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Cat.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Cod.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DaddyLongLegs.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DeadlyAnimal.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DeadlySpider.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DefangedTarantula.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/FunnelWeaver.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/LadybirdSpider.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Order.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/ScottishFish.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Spider.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/SpiderProducer.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Tarantula.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/TrapdoorSpider.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Tuna.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/WolfSpider.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/DeploymentProperties.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/EnumerationIterable.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/EnumerationIterator.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/Reflections.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/ResourceLoadingException.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/SimpleResourceLoader.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/Strings.java
Log:
refactored
Modified: tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Beans.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Beans.java 2009-01-09 12:13:56 UTC (rev 847)
+++ tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Beans.java 2009-01-09 12:17:03 UTC (rev 848)
@@ -1,5 +1,6 @@
package org.jboss.webbeans.tck.api;
+import javax.webbeans.manager.Bean;
import javax.webbeans.manager.Manager;
/**
@@ -9,6 +10,6 @@
*/
public interface Beans
{
- <T> T createSimpleBean(Class<T> clazz, Manager manager);
+ <T> Bean<T> createSimpleBean(Class<T> clazz, Manager manager);
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/TckUtils.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/TckUtils.java 2009-01-09 12:13:56 UTC (rev 847)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/TckUtils.java 2009-01-09 12:17:03 UTC (rev 848)
@@ -1,10 +1,14 @@
-package org.jboss.webbeans.tck.api;
+package org.jboss.webbeans.tck.impl;
import java.lang.reflect.Constructor;
-import org.jboss.webbeans.tck.api.util.DeploymentProperties;
-import org.jboss.webbeans.tck.api.util.Reflections;
+import org.jboss.webbeans.tck.api.Beans;
+import org.jboss.webbeans.tck.api.Contexts;
+import org.jboss.webbeans.tck.api.Managers;
+import org.jboss.webbeans.tck.impl.util.DeploymentProperties;
+import org.jboss.webbeans.tck.impl.util.Reflections;
+
/**
*
* @author Shane Bryzak
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/AbstractTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/AbstractTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/AbstractTest.java 2009-01-09 12:17:03 UTC (rev 848)
@@ -0,0 +1,102 @@
+package org.jboss.webbeans.tck.impl.test;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.Arrays;
+
+import javax.webbeans.Production;
+import javax.webbeans.Standard;
+import javax.webbeans.manager.Bean;
+import javax.webbeans.manager.Manager;
+
+import org.jboss.webbeans.tck.impl.TckUtils;
+import org.testng.annotations.BeforeMethod;
+
+public class AbstractTest
+{
+ protected static final int BUILT_IN_BEANS = 3;
+
+ protected Manager manager;
+
+ public static boolean visited = false;
+
+ @BeforeMethod
+ public final void before()
+ {
+ manager = TckUtils.getManagers().createManager();
+ //addStandardDeploymentTypesForTests();
+ }
+
+ public <T> Bean<T> getSimpleBean(Class<T> beanClass)
+ {
+ return TckUtils.getBeans().createSimpleBean(beanClass, manager);
+ }
+
+ /*
+ protected <T> AbstractClassBean<T> registerBean(Class<T> clazz)
+ {
+ AbstractClassBean<T> bean = null;
+ if (CurrentManager.rootManager().getEjbDescriptorCache().containsKey(clazz))
+ {
+ bean = EnterpriseBean.of(clazz, manager);
+ }
+ else
+ {
+ bean = SimpleBean.of(clazz, manager);
+ }
+ CurrentManager.rootManager().addBean(bean);
+ return bean;
+ }
+ */
+
+/*
+ protected void registerBeans(Class<?>[] classes)
+ {
+ for (Class<?> clazz : classes)
+ {
+ registerBean(clazz);
+ }
+ }
+ */
+
+ /*
+ @SuppressWarnings("unchecked")
+ protected void addStandardDeploymentTypesForTests()
+ {
+ manager.setEnabledDeploymentTypes(Arrays.asList(Standard.class, Production.class, AnotherDeploymentType.class, HornedAnimalDeploymentType.class));
+ }
+
+ protected <T> void addToEjbCache(Class<T> clazz)
+ {
+ manager.getEjbDescriptorCache().add(new MockEjbDescriptor<T>(clazz));
+ }
+ */
+
+ protected byte[] serialize(Object instance) throws IOException
+ {
+ ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+ ObjectOutputStream out = new ObjectOutputStream(bytes);
+ out.writeObject(instance);
+ return bytes.toByteArray();
+ }
+
+ protected Object deserialize(byte[] bytes) throws IOException, ClassNotFoundException
+ {
+ ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(bytes));
+ return in.readObject();
+ }
+
+/* protected void activateDependentContext()
+ {
+ DependentContext.INSTANCE.setActive(true);
+ }
+
+ protected void deactivateDependentContext()
+ {
+ DependentContext.INSTANCE.setActive(false);
+ }
+ */
+}
\ No newline at end of file
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/BindingTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/BindingTypeTest.java 2009-01-09 12:13:56 UTC (rev 847)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/BindingTypeTest.java 2009-01-09 12:17:03 UTC (rev 848)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.tck.test;
+package org.jboss.webbeans.tck.impl.test;
import java.lang.reflect.Method;
@@ -7,18 +7,18 @@
import javax.webbeans.manager.Manager;
import org.jboss.webbeans.tck.api.Managers;
-import org.jboss.webbeans.tck.api.TckUtils;
-import org.jboss.webbeans.tck.api.util.Reflections;
-import org.jboss.webbeans.tck.test.annotations.Synchronous;
-import org.jboss.webbeans.tck.test.beans.Barn;
-import org.jboss.webbeans.tck.test.beans.Cat;
-import org.jboss.webbeans.tck.test.beans.Cod;
-import org.jboss.webbeans.tck.test.beans.DefangedTarantula;
-import org.jboss.webbeans.tck.test.beans.Order;
-import org.jboss.webbeans.tck.test.beans.Spider;
-import org.jboss.webbeans.tck.test.beans.SpiderProducer;
-import org.jboss.webbeans.tck.test.beans.Tarantula;
-import org.jboss.webbeans.tck.test.beans.Tuna;
+import org.jboss.webbeans.tck.impl.TckUtils;
+import org.jboss.webbeans.tck.impl.util.Reflections;
+import org.jboss.webbeans.tck.impl.test.annotations.Synchronous;
+import org.jboss.webbeans.tck.impl.test.beans.Barn;
+import org.jboss.webbeans.tck.impl.test.beans.Cat;
+import org.jboss.webbeans.tck.impl.test.beans.Cod;
+import org.jboss.webbeans.tck.impl.test.beans.DefangedTarantula;
+import org.jboss.webbeans.tck.impl.test.beans.Order;
+import org.jboss.webbeans.tck.impl.test.beans.Spider;
+import org.jboss.webbeans.tck.impl.test.beans.SpiderProducer;
+import org.jboss.webbeans.tck.impl.test.beans.Tarantula;
+import org.jboss.webbeans.tck.impl.test.beans.Tuna;
import org.jboss.webbeans.bean.ProducerMethodBean;
import org.jboss.webbeans.binding.CurrentBinding;
@@ -26,16 +26,14 @@
import org.testng.annotations.Test;
@SpecVersion("2001206")
-public class BindingTypeTest
+public class BindingTypeTest extends AbstractTest
{
@SuppressWarnings("unchecked")
@Test @SpecAssertion(section={"2.3.3", "2.3.1"})
public void testDefaultBindingTypeDeclaredInJava()
- {
- Manager manager = TckUtils.getManagers().createManager();
-
- Bean<Order> order = TckUtils.getBeans().createSimpleBean(Order.class, manager);
+ {
+ Bean<Order> order = getSimpleBean(Order.class);
assert order.getBindingTypes().size() == 1;
order.getBindingTypes().iterator().next().annotationType().equals(Current.class);
}
@@ -61,20 +59,16 @@
@SuppressWarnings("unchecked")
@Test @SpecAssertion(section="2.3.3")
public void testBindingTypesDeclaredInJava()
- {
- Manager manager = TckUtils.getManagers().createManager();
-
- SimpleBean<Cat> cat = SimpleBean.of(Cat.class, manager);
+ {
+ Bean<Cat> cat = getSimpleBean(Cat.class);
assert cat.getBindingTypes().size() == 1;
assert Reflections.annotationSetMatches(cat.getBindingTypes(), Synchronous.class);
}
@Test @SpecAssertion(section="2.3.3")
public void testMultipleBindingTypes()
- {
- Manager manager = TckUtils.getManagers().createManager();
-
- SimpleBean<?> model = SimpleBean.of(Cod.class, manager);
+ {
+ Bean<?> model = getSimpleBean(Cod.class);
assert model.getBindingTypes().size() == 2;
}
@@ -119,9 +113,7 @@
@Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section={"2.3.4", "2.3.1"})
public void testDefaultBindingTypeDeclaredInXml()
{
- Manager manager = TckUtils.getManagers().createManager();
-
- SimpleBean<?> model = SimpleBean.of(Tuna.class, manager);
+ Bean<?> model = getSimpleBean(Tuna.class);
assert model.getBindingTypes().size() == 1;
assert model.getBindingTypes().contains(new CurrentBinding());
assert false;
@@ -132,13 +124,11 @@
@Test(groups={"injection", "producerMethod"}) @SpecAssertion(section="2.3.5")
public void testFieldInjectedFromProducerMethod() throws Exception
{
- Manager manager = TckUtils.getManagers().createManager();
-
- SimpleBean<SpiderProducer> spiderProducer = SimpleBean.of(SpiderProducer.class, manager);
+ Bean<SpiderProducer> spiderProducer = getSimpleBean(SpiderProducer.class);
manager.addBean(spiderProducer);
Method method = SpiderProducer.class.getMethod("produceTameTarantula");
manager.addBean(ProducerMethodBean.of(method, spiderProducer, manager));
- Barn barn = SimpleBean.of(Barn.class, manager).create();
+ Barn barn = getSimpleBean(Barn.class).create();
assert barn.petSpider != null;
assert barn.petSpider instanceof DefangedTarantula;
}
@@ -158,8 +148,6 @@
@Test(groups={"injection", "producerMethod"})
public void testMethodWithBindingAnnotationsOnParametersAreInjected() throws Exception
{
- Manager manager = TckUtils.getManagers().createManager();
-
SimpleBean<SpiderProducer> spiderProducer = SimpleBean.of(SpiderProducer.class, manager);
manager.addBean(spiderProducer);
Method method = SpiderProducer.class.getMethod("produceTameTarantula");
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/SpecAssertion.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/SpecAssertion.java 2009-01-09 12:13:56 UTC (rev 847)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/SpecAssertion.java 2009-01-09 12:17:03 UTC (rev 848)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.tck.test;
+package org.jboss.webbeans.tck.impl.test;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/SpecVersion.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/SpecVersion.java 2009-01-09 12:13:56 UTC (rev 847)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/SpecVersion.java 2009-01-09 12:17:03 UTC (rev 848)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.tck.test;
+package org.jboss.webbeans.tck.impl.test;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/AnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/AnimalStereotype.java 2009-01-09 12:13:56 UTC (rev 847)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/AnimalStereotype.java 2009-01-09 12:17:03 UTC (rev 848)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.tck.test.annotations;
+package org.jboss.webbeans.tck.impl.test.annotations;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
@@ -11,7 +11,7 @@
import javax.webbeans.RequestScoped;
import javax.webbeans.Stereotype;
-import org.jboss.webbeans.tck.test.beans.Animal;
+import org.jboss.webbeans.tck.impl.test.beans.Animal;
@Stereotype(requiredTypes=Animal.class)
@Target( { TYPE, METHOD, FIELD })
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/AnotherDeploymentType.java 2009-01-09 12:13:56 UTC (rev 847)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/AnotherDeploymentType.java 2009-01-09 12:17:03 UTC (rev 848)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.tck.test.annotations;
+package org.jboss.webbeans.tck.impl.test.annotations;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.TYPE;
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/Chunky.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/Chunky.java 2009-01-09 12:13:56 UTC (rev 847)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/Chunky.java 2009-01-09 12:17:03 UTC (rev 848)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.tck.test.annotations;
+package org.jboss.webbeans.tck.impl.test.annotations;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/HornedAnimalDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/HornedAnimalDeploymentType.java 2009-01-09 12:13:56 UTC (rev 847)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/HornedAnimalDeploymentType.java 2009-01-09 12:17:03 UTC (rev 848)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.tck.test.annotations;
+package org.jboss.webbeans.tck.impl.test.annotations;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.TYPE;
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/Synchronous.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/Synchronous.java 2009-01-09 12:13:56 UTC (rev 847)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/Synchronous.java 2009-01-09 12:17:03 UTC (rev 848)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.tck.test.annotations;
+package org.jboss.webbeans.tck.impl.test.annotations;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.PARAMETER;
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/Tame.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/Tame.java 2009-01-09 12:13:56 UTC (rev 847)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/Tame.java 2009-01-09 12:17:03 UTC (rev 848)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.tck.test.annotations;
+package org.jboss.webbeans.tck.impl.test.annotations;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/Whitefish.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/Whitefish.java 2009-01-09 12:13:56 UTC (rev 847)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/annotations/Whitefish.java 2009-01-09 12:17:03 UTC (rev 848)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.tck.test.annotations;
+package org.jboss.webbeans.tck.impl.test.annotations;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Animal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Animal.java 2009-01-09 12:13:56 UTC (rev 847)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Animal.java 2009-01-09 12:17:03 UTC (rev 848)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.tck.test.beans;
+package org.jboss.webbeans.tck.impl.test.beans;
public interface Animal
{
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Barn.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Barn.java 2009-01-09 12:13:56 UTC (rev 847)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Barn.java 2009-01-09 12:17:03 UTC (rev 848)
@@ -1,6 +1,6 @@
-package org.jboss.webbeans.tck.test.beans;
+package org.jboss.webbeans.tck.impl.test.beans;
-import org.jboss.webbeans.tck.test.annotations.Tame;
+import org.jboss.webbeans.tck.impl.test.annotations.Tame;
public class Barn
{
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/BlackWidow.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/BlackWidow.java 2009-01-09 12:13:56 UTC (rev 847)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/BlackWidow.java 2009-01-09 12:17:03 UTC (rev 848)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.tck.test.beans;
+package org.jboss.webbeans.tck.impl.test.beans;
public class BlackWidow extends Spider implements DeadlySpider
{
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Cat.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Cat.java 2009-01-09 12:13:56 UTC (rev 847)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Cat.java 2009-01-09 12:17:03 UTC (rev 848)
@@ -1,8 +1,8 @@
-package org.jboss.webbeans.tck.test.beans;
+package org.jboss.webbeans.tck.impl.test.beans;
import javax.webbeans.Production;
-import org.jboss.webbeans.test.annotations.Synchronous;
+import org.jboss.webbeans.tck.impl.test.annotations.Synchronous;
@Production
@Synchronous
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Cod.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Cod.java 2009-01-09 12:13:56 UTC (rev 847)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Cod.java 2009-01-09 12:17:03 UTC (rev 848)
@@ -1,10 +1,10 @@
-package org.jboss.webbeans.tck.test.beans;
+package org.jboss.webbeans.tck.impl.test.beans;
import javax.webbeans.Named;
import javax.webbeans.Production;
-import org.jboss.webbeans.tck.test.annotations.Chunky;
-import org.jboss.webbeans.tck.test.annotations.Whitefish;
+import org.jboss.webbeans.tck.impl.test.annotations.Chunky;
+import org.jboss.webbeans.tck.impl.test.annotations.Whitefish;
@Production
@Whitefish
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DaddyLongLegs.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DaddyLongLegs.java 2009-01-09 12:13:56 UTC (rev 847)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DaddyLongLegs.java 2009-01-09 12:17:03 UTC (rev 848)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.tck.test.beans;
+package org.jboss.webbeans.tck.impl.test.beans;
public class DaddyLongLegs extends Spider
{
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DeadlyAnimal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DeadlyAnimal.java 2009-01-09 12:13:56 UTC (rev 847)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DeadlyAnimal.java 2009-01-09 12:17:03 UTC (rev 848)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.tck.test.beans;
+package org.jboss.webbeans.tck.impl.test.beans;
public interface DeadlyAnimal
{
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DeadlySpider.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DeadlySpider.java 2009-01-09 12:13:56 UTC (rev 847)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DeadlySpider.java 2009-01-09 12:17:03 UTC (rev 848)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.tck.test.beans;
+package org.jboss.webbeans.tck.impl.test.beans;
public interface DeadlySpider extends DeadlyAnimal
{
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DefangedTarantula.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DefangedTarantula.java 2009-01-09 12:13:56 UTC (rev 847)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/DefangedTarantula.java 2009-01-09 12:17:03 UTC (rev 848)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.tck.test.beans;
+package org.jboss.webbeans.tck.impl.test.beans;
public class DefangedTarantula extends Tarantula
{
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/FunnelWeaver.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/FunnelWeaver.java 2009-01-09 12:13:56 UTC (rev 847)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/FunnelWeaver.java 2009-01-09 12:17:03 UTC (rev 848)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.tck.test.beans;
+package org.jboss.webbeans.tck.impl.test.beans;
public class FunnelWeaver<T>
{
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/LadybirdSpider.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/LadybirdSpider.java 2009-01-09 12:13:56 UTC (rev 847)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/LadybirdSpider.java 2009-01-09 12:17:03 UTC (rev 848)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.tck.test.beans;
+package org.jboss.webbeans.tck.impl.test.beans;
import javax.webbeans.ApplicationScoped;
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Order.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Order.java 2009-01-09 12:13:56 UTC (rev 847)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Order.java 2009-01-09 12:17:03 UTC (rev 848)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.tck.test.beans;
+package org.jboss.webbeans.tck.impl.test.beans;
import javax.webbeans.Production;
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/ScottishFish.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/ScottishFish.java 2009-01-09 12:13:56 UTC (rev 847)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/ScottishFish.java 2009-01-09 12:17:03 UTC (rev 848)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.tck.test.beans;
+package org.jboss.webbeans.tck.impl.test.beans;
public interface ScottishFish extends Animal
{
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Spider.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Spider.java 2009-01-09 12:13:56 UTC (rev 847)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Spider.java 2009-01-09 12:17:03 UTC (rev 848)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.tck.test.beans;
+package org.jboss.webbeans.tck.impl.test.beans;
public class Spider implements Animal
{
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/SpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/SpiderProducer.java 2009-01-09 12:13:56 UTC (rev 847)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/SpiderProducer.java 2009-01-09 12:17:03 UTC (rev 848)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.tck.test.beans;
+package org.jboss.webbeans.tck.impl.test.beans;
import javax.webbeans.Dependent;
import javax.webbeans.Named;
@@ -6,9 +6,9 @@
import javax.webbeans.Production;
import javax.webbeans.RequestScoped;
-import org.jboss.webbeans.tck.test.annotations.AnimalStereotype;
-import org.jboss.webbeans.tck.test.annotations.AnotherDeploymentType;
-import org.jboss.webbeans.tck.test.annotations.Tame;
+import org.jboss.webbeans.tck.impl.test.annotations.AnimalStereotype;
+import org.jboss.webbeans.tck.impl.test.annotations.AnotherDeploymentType;
+import org.jboss.webbeans.tck.impl.test.annotations.Tame;
@AnotherDeploymentType
public class SpiderProducer
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Tarantula.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Tarantula.java 2009-01-09 12:13:56 UTC (rev 847)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Tarantula.java 2009-01-09 12:17:03 UTC (rev 848)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.tck.test.beans;
+package org.jboss.webbeans.tck.impl.test.beans;
public class Tarantula extends Spider implements DeadlySpider
{
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/TrapdoorSpider.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/TrapdoorSpider.java 2009-01-09 12:13:56 UTC (rev 847)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/TrapdoorSpider.java 2009-01-09 12:17:03 UTC (rev 848)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.tck.test.beans;
+package org.jboss.webbeans.tck.impl.test.beans;
public class TrapdoorSpider
{
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Tuna.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Tuna.java 2009-01-09 12:13:56 UTC (rev 847)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/Tuna.java 2009-01-09 12:17:03 UTC (rev 848)
@@ -1,8 +1,8 @@
-package org.jboss.webbeans.tck.test.beans;
+package org.jboss.webbeans.tck.impl.test.beans;
import javax.webbeans.RequestScoped;
-import org.jboss.webbeans.tck.test.annotations.AnotherDeploymentType;
+import org.jboss.webbeans.tck.impl.test.annotations.AnotherDeploymentType;
@AnotherDeploymentType
@RequestScoped
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/WolfSpider.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/WolfSpider.java 2009-01-09 12:13:56 UTC (rev 847)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/WolfSpider.java 2009-01-09 12:17:03 UTC (rev 848)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.tck.test.beans;
+package org.jboss.webbeans.tck.impl.test.beans;
public class WolfSpider implements Animal
{
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/DeploymentProperties.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/DeploymentProperties.java 2009-01-09 12:13:56 UTC (rev 847)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/DeploymentProperties.java 2009-01-09 12:17:03 UTC (rev 848)
@@ -1,7 +1,5 @@
-package org.jboss.webbeans.tck.api.util;
+package org.jboss.webbeans.tck.impl.util;
-import static org.jboss.webbeans.tck.api.util.Strings.split;
-
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
@@ -109,7 +107,7 @@
{
if (value != null)
{
- String[] properties = split(value, ":");
+ String[] properties = Strings.split(value, ":");
for (String property : properties)
{
values.add(property);
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/EnumerationIterable.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/EnumerationIterable.java 2009-01-09 12:13:56 UTC (rev 847)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/EnumerationIterable.java 2009-01-09 12:17:03 UTC (rev 848)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.tck.api.util;
+package org.jboss.webbeans.tck.impl.util;
import java.util.Enumeration;
import java.util.Iterator;
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/EnumerationIterator.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/EnumerationIterator.java 2009-01-09 12:13:56 UTC (rev 847)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/EnumerationIterator.java 2009-01-09 12:17:03 UTC (rev 848)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.tck.api.util;
+package org.jboss.webbeans.tck.impl.util;
import java.util.Enumeration;
import java.util.Iterator;
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/Reflections.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/Reflections.java 2009-01-09 12:13:56 UTC (rev 847)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/Reflections.java 2009-01-09 12:17:03 UTC (rev 848)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.tck.api.util;
+package org.jboss.webbeans.tck.impl.util;
import java.beans.Introspector;
import java.io.Serializable;
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/ResourceLoadingException.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/ResourceLoadingException.java 2009-01-09 12:13:56 UTC (rev 847)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/ResourceLoadingException.java 2009-01-09 12:17:03 UTC (rev 848)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.tck.api.util;
+package org.jboss.webbeans.tck.impl.util;
import javax.webbeans.ExecutionException;
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/SimpleResourceLoader.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/SimpleResourceLoader.java 2009-01-09 12:13:56 UTC (rev 847)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/SimpleResourceLoader.java 2009-01-09 12:17:03 UTC (rev 848)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.tck.api.util;
+package org.jboss.webbeans.tck.impl.util;
import java.io.IOException;
import java.net.URL;
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/Strings.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/Strings.java 2009-01-09 12:13:56 UTC (rev 847)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/Strings.java 2009-01-09 12:17:03 UTC (rev 848)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.tck.api.util;
+package org.jboss.webbeans.tck.impl.util;
import java.util.StringTokenizer;
More information about the weld-commits
mailing list