[webbeans-commits] Webbeans SVN: r1172 - examples/trunk/translator.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-01-22 09:25:28 -0500 (Thu, 22 Jan 2009)
New Revision: 1172
Modified:
examples/trunk/translator/
Log:
ignores
Property changes on: examples/trunk/translator
___________________________________________________________________
Name: svn:ignore
+ .classpath
.project
16 years, 8 months
[webbeans-commits] Webbeans SVN: r1171 - in examples/trunk/translator: webbeans-translator-ejb and 1 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-01-22 09:23:03 -0500 (Thu, 22 Jan 2009)
New Revision: 1171
Modified:
examples/trunk/translator/webbeans-translator-ear/
examples/trunk/translator/webbeans-translator-ejb/
examples/trunk/translator/webbeans-translator-war/
Log:
ignores
Property changes on: examples/trunk/translator/webbeans-translator-ear
___________________________________________________________________
Name: svn:ignore
- .classpath
target
.project
.settings
+ .classpath
target
.project
.settings
bin
Property changes on: examples/trunk/translator/webbeans-translator-ejb
___________________________________________________________________
Name: svn:ignore
- .classpath
target
.project
.settings
+ .classpath
target
.project
.settings
bin
Property changes on: examples/trunk/translator/webbeans-translator-war
___________________________________________________________________
Name: svn:ignore
- .classpath
target
.project
.settings
+ .classpath
target
.project
.settings
bin
16 years, 8 months
[webbeans-commits] Webbeans SVN: r1170 - in examples/trunk: translator and 1 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-01-22 09:21:34 -0500 (Thu, 22 Jan 2009)
New Revision: 1170
Added:
examples/trunk/translator/target/
Modified:
examples/trunk/
Log:
ignores
Property changes on: examples/trunk
___________________________________________________________________
Name: svn:ignore
- target
+ target
.project
.settings
.classpath
Property changes on: examples/trunk/translator/target
___________________________________________________________________
Name: svn:ignore
+ classes
test-classes
16 years, 8 months
[webbeans-commits] Webbeans SVN: r1169 - doc/trunk/xslt and 1 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-01-22 09:20:20 -0500 (Thu, 22 Jan 2009)
New Revision: 1169
Modified:
doc/trunk/reference/
doc/trunk/xslt/
ri/trunk/
Log:
ignores
Property changes on: doc/trunk/reference
___________________________________________________________________
Name: svn:ignore
- target
.project
webbeans_reference.pdf
+ target
.project
webbeans_reference.pdf
.settings
Property changes on: doc/trunk/xslt
___________________________________________________________________
Name: svn:ignore
- .project
.classpath
target
+ .project
.classpath
target
.settings
Property changes on: ri/trunk
___________________________________________________________________
Name: svn:ignore
- target
+ target
.classpath
.settings
.project
16 years, 8 months
[webbeans-commits] Webbeans SVN: r1168 - in tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization: producer/method and 1 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-01-22 08:54:13 -0500 (Thu, 22 Jan 2009)
New Revision: 1168
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/producer/method/ProducerMethodSpecializationTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/SimpleBeanSpecializationTest.java
Log:
bad imports
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-01-22 13:48:13 UTC (rev 1167)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-01-22 13:54:13 UTC (rev 1168)
@@ -14,8 +14,6 @@
import org.jboss.webbeans.tck.impl.SpecAssertion;
import org.testng.annotations.Test;
-import sun.swing.SwingUtilities2.Section;
-
/**
* @see Section 3.2.7, 3.3.7, 3.4.5, 6.7, 6.8, 8.5.8
*
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-01-22 13:48:13 UTC (rev 1167)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java 2009-01-22 13:54:13 UTC (rev 1168)
@@ -14,8 +14,6 @@
import org.jboss.webbeans.tck.impl.SpecAssertion;
import org.testng.annotations.Test;
-import sun.swing.SwingUtilities2.Section;
-
/**
* @see Section 3.2.7, 3.3.7, 3.4.5, 6.7, 6.8, 8.5.8
*
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-01-22 13:48:13 UTC (rev 1167)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/SimpleBeanSpecializationTest.java 2009-01-22 13:54:13 UTC (rev 1168)
@@ -14,8 +14,6 @@
import org.jboss.webbeans.tck.impl.SpecAssertion;
import org.testng.annotations.Test;
-import sun.swing.SwingUtilities2.Section;
-
/**
* @see Section 3.2.7, 3.3.7, 3.4.5, 6.7, 6.8, 8.5.8
*
16 years, 8 months
[webbeans-commits] Webbeans SVN: r1167 - ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/el and 5 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-01-22 08:48:13 -0500 (Thu, 22 Jan 2009)
New Revision: 1167
Added:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/el/ForwardingELContext.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/el/
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/el/EL.java
Modified:
ri/trunk/webbeans-ri/pom.xml
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ContainersImpl.java
tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Containers.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/DependentContextTest.java
Log:
Fix broken EL test
Modified: ri/trunk/webbeans-ri/pom.xml
===================================================================
--- ri/trunk/webbeans-ri/pom.xml 2009-01-22 13:01:09 UTC (rev 1166)
+++ ri/trunk/webbeans-ri/pom.xml 2009-01-22 13:48:13 UTC (rev 1167)
@@ -96,6 +96,11 @@
</dependency>
<dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-ri</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
</dependency>
Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/el/ForwardingELContext.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/el/ForwardingELContext.java (rev 0)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/el/ForwardingELContext.java 2009-01-22 13:48:13 UTC (rev 1167)
@@ -0,0 +1,88 @@
+package org.jboss.webbeans.el;
+
+import java.util.Locale;
+
+import javax.el.ELContext;
+import javax.el.ELResolver;
+import javax.el.FunctionMapper;
+import javax.el.VariableMapper;
+
+public abstract class ForwardingELContext extends ELContext
+{
+
+ protected abstract ELContext delgate();
+
+ @Override
+ public ELResolver getELResolver()
+ {
+ return delgate().getELResolver();
+ }
+
+ @Override
+ public FunctionMapper getFunctionMapper()
+ {
+ return delgate().getFunctionMapper();
+ }
+
+ @Override
+ public VariableMapper getVariableMapper()
+ {
+ return delgate().getVariableMapper();
+ }
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ return delgate().equals(obj);
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public Object getContext(Class key)
+ {
+ return delgate().getContext(key);
+ }
+
+ @Override
+ public Locale getLocale()
+ {
+ return delgate().getLocale();
+ }
+
+ @Override
+ public int hashCode()
+ {
+ return delgate().hashCode();
+ }
+
+ @Override
+ public boolean isPropertyResolved()
+ {
+ return delgate().isPropertyResolved();
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public void putContext(Class key, Object contextObject)
+ {
+ delgate().putContext(key, contextObject);
+ }
+
+ @Override
+ public void setLocale(Locale locale)
+ {
+ delgate().setLocale(locale);
+ }
+
+ @Override
+ public void setPropertyResolved(boolean resolved)
+ {
+ delgate().setPropertyResolved(resolved);
+ }
+
+ @Override
+ public String toString()
+ {
+ return delgate().toString();
+ }
+}
Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/el/ForwardingELContext.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/el/EL.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/el/EL.java (rev 0)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/el/EL.java 2009-01-22 13:48:13 UTC (rev 1167)
@@ -0,0 +1,76 @@
+package org.jboss.webbeans.test.mock.el;
+
+import javax.el.ArrayELResolver;
+import javax.el.BeanELResolver;
+import javax.el.CompositeELResolver;
+import javax.el.ELContext;
+import javax.el.ELResolver;
+import javax.el.ExpressionFactory;
+import javax.el.FunctionMapper;
+import javax.el.ListELResolver;
+import javax.el.MapELResolver;
+import javax.el.ResourceBundleELResolver;
+import javax.el.VariableMapper;
+
+import org.jboss.webbeans.el.WebBeansELResolver;
+
+import com.sun.el.ExpressionFactoryImpl;
+import com.sun.el.lang.FunctionMapperImpl;
+import com.sun.el.lang.VariableMapperImpl;
+
+/**
+ * An instance of JBoss EL.
+ *
+ * @author Gavin King
+ *
+ */
+public class EL
+{
+ public static final ELResolver EL_RESOLVER = createELResolver();
+
+ public static final ExpressionFactory EXPRESSION_FACTORY = new ExpressionFactoryImpl();
+
+ private static ELResolver createELResolver()
+ {
+ CompositeELResolver resolver = new CompositeELResolver();
+ resolver.add( new WebBeansELResolver() );
+ resolver.add( new MapELResolver() );
+ resolver.add( new ListELResolver() );
+ resolver.add( new ArrayELResolver() );
+ resolver.add( new ResourceBundleELResolver() );
+ resolver.add( new BeanELResolver() );
+ return resolver;
+ }
+
+ public static ELContext createELContext() {
+ return createELContext( EL_RESOLVER, new FunctionMapperImpl() );
+ }
+
+ public static ELContext createELContext(final ELResolver resolver, final FunctionMapper functionMapper)
+ {
+ return new ELContext()
+ {
+ final VariableMapperImpl variableMapper = new VariableMapperImpl();
+
+ @Override
+ public ELResolver getELResolver()
+ {
+ return resolver;
+ }
+
+ @Override
+ public FunctionMapper getFunctionMapper()
+ {
+ return functionMapper;
+ }
+
+ @Override
+ public VariableMapper getVariableMapper()
+ {
+ return variableMapper;
+ }
+
+ };
+ }
+
+}
Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/el/EL.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ContainersImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ContainersImpl.java 2009-01-22 13:01:09 UTC (rev 1166)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ContainersImpl.java 2009-01-22 13:48:13 UTC (rev 1167)
@@ -3,12 +3,14 @@
import java.lang.annotation.Annotation;
import java.util.List;
+import javax.el.ELContext;
import javax.webbeans.manager.Manager;
import org.jboss.webbeans.ManagerImpl;
import org.jboss.webbeans.tck.api.Containers;
import org.jboss.webbeans.test.mock.MockBootstrap;
import org.jboss.webbeans.test.mock.MockWebBeanDiscovery;
+import org.jboss.webbeans.test.mock.el.EL;
public class ContainersImpl implements Containers
{
@@ -31,15 +33,17 @@
return deploy(null, classes);
}
+ @SuppressWarnings("unchecked")
public <T> T evaluateValueExpression(String expression, Class<T> expectedType)
{
- // TODO implement
- throw new UnsupportedOperationException();
+ ELContext elContext = EL.createELContext();
+ return (T) EL.EXPRESSION_FACTORY.createValueExpression(elContext, expression, expectedType).getValue(elContext);
}
- public <T> T evaluateMethodExpression(String expression, Class<T> expectedType, Class<?>[] expectedParamTypes)
+ @SuppressWarnings("unchecked")
+ public <T> T evaluateMethodExpression(String expression, Class<T> expectedType, Class<?>[] expectedParamTypes, Object[] expectedParams)
{
- // TODO implement
- throw new UnsupportedOperationException();
+ ELContext elContext = EL.createELContext();
+ return (T) EL.EXPRESSION_FACTORY.createMethodExpression(elContext, expression, expectedType, expectedParamTypes).invoke(elContext, expectedParams);
}
}
Modified: tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Containers.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Containers.java 2009-01-22 13:01:09 UTC (rev 1166)
+++ tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Containers.java 2009-01-22 13:48:13 UTC (rev 1167)
@@ -58,5 +58,5 @@
* @param expectedParamTypes
* @return
*/
- <T> T evaluateMethodExpression(String expression, Class<T> expectedType, Class<?>[] expectedParamTypes);
+ <T> T evaluateMethodExpression(String expression, Class<T> expectedType, Class<?>[] expectedParamTypes, Object[] expectedParams);
}
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-01-22 13:01:09 UTC (rev 1166)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/DependentContextTest.java 2009-01-22 13:48:13 UTC (rev 1167)
@@ -43,7 +43,7 @@
* Any instance of the (@Dependent-scoped) Web Bean that is used to evaluate a Unified EL
* expression exists to service that evaluation only.
*/
- @Test(groups = { "contexts", "el", "broken" })
+ @Test(groups = { "contexts", "el"})
@SpecAssertion(section = "9.3")
public void testInstanceUsedForElEvaluationNotShared() throws Exception
{
@@ -58,8 +58,8 @@
Bean<Fox> foxBean = foxBeans.iterator().next();
manager.addBean(foxBean);
- Fox fox1 = configuration().getContainers().evaluateValueExpression("fox", Fox.class);
- Fox fox2 = configuration().getContainers().evaluateValueExpression("fox", Fox.class);
+ Fox fox1 = configuration().getContainers().evaluateValueExpression("#{fox}", Fox.class);
+ Fox fox2 = configuration().getContainers().evaluateValueExpression("#{fox}", Fox.class);
assert !fox1.equals(fox2);
}
}.run();
16 years, 8 months
[webbeans-commits] Webbeans SVN: r1166 - tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent.
by webbeans-commits＠lists.jboss.org
Author: dallen6
Date: 2009-01-22 08:01:09 -0500 (Thu, 22 Jan 2009)
New Revision: 1166
Modified:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/DependentContextTest.java
Log:
Marked dependent context test broken for now.
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-01-22 12:55:55 UTC (rev 1165)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/DependentContextTest.java 2009-01-22 13:01:09 UTC (rev 1166)
@@ -43,7 +43,7 @@
* Any instance of the (@Dependent-scoped) Web Bean that is used to evaluate a Unified EL
* expression exists to service that evaluation only.
*/
- @Test(groups = { "contexts", "el" })
+ @Test(groups = { "contexts", "el", "broken" })
@SpecAssertion(section = "9.3")
public void testInstanceUsedForElEvaluationNotShared() throws Exception
{
16 years, 8 months
[webbeans-commits] Webbeans SVN: r1165 - in tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit: implementation/enterprise and 3 other directories.
by webbeans-commits＠lists.jboss.org
Author: dallen6
Date: 2009-01-22 07:55:55 -0500 (Thu, 22 Jan 2009)
New Revision: 1165
Added:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/TarantulaConsumer.java
Removed:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/CairnsTerrier.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Armant_Broken.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/GoldenRetriever.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/GoodDoggie.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/JackRussellTerrier.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Pitbull.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Rottweiler.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/RussellTerrier.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Shrike.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/OtherSpiderProducer.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/OtherSpiderProducer_Broken.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/SpiderProducer_Broken.java
Log:
Cleanup of @Destructor references (not the the tests) and added producer field lifecycle test.
Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/CairnsTerrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/CairnsTerrier.java 2009-01-22 12:25:28 UTC (rev 1164)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/CairnsTerrier.java 2009-01-22 12:55:55 UTC (rev 1165)
@@ -1,17 +0,0 @@
-package org.jboss.webbeans.tck.unit.event;
-
-import javax.ejb.Stateless;
-import javax.webbeans.Destructor;
-import javax.webbeans.Observes;
-import javax.webbeans.manager.Initialized;
-import javax.webbeans.manager.Manager;
-
-@Stateless
-class CairnsTerrier
-{
- @Destructor
- public void observeInitialized(@Observes @Initialized Manager manager)
- {
- }
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Armant_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Armant_Broken.java 2009-01-22 12:25:28 UTC (rev 1164)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Armant_Broken.java 2009-01-22 12:55:55 UTC (rev 1165)
@@ -2,12 +2,11 @@
import javax.ejb.Remove;
import javax.ejb.Stateless;
-import javax.webbeans.Destructor;
@Stateless
class Armant_Broken
{
- @Destructor @Remove
+ @Remove
public void bye() {
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/GoldenRetriever.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/GoldenRetriever.java 2009-01-22 12:25:28 UTC (rev 1164)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/GoldenRetriever.java 2009-01-22 12:55:55 UTC (rev 1165)
@@ -2,7 +2,6 @@
import javax.ejb.Remove;
import javax.ejb.Stateful;
-import javax.webbeans.Destructor;
import javax.webbeans.Disposes;
import javax.webbeans.RequestScoped;
@@ -10,7 +9,7 @@
@RequestScoped
class GoldenRetriever
{
- @Remove @Destructor
+ @Remove
public void bye(@Disposes Object something) {
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/GoodDoggie.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/GoodDoggie.java 2009-01-22 12:25:28 UTC (rev 1164)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/GoodDoggie.java 2009-01-22 12:55:55 UTC (rev 1165)
@@ -2,7 +2,6 @@
import javax.ejb.Remove;
import javax.ejb.Stateful;
-import javax.webbeans.Destructor;
@Stateful
class GoodDoggie implements LocalGoodDoggie
@@ -10,7 +9,7 @@
public static boolean destructorCalled = false;
- @Destructor @Remove
+ @Remove
public void bye() {
destructorCalled = true;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/JackRussellTerrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/JackRussellTerrier.java 2009-01-22 12:25:28 UTC (rev 1164)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/JackRussellTerrier.java 2009-01-22 12:55:55 UTC (rev 1165)
@@ -2,7 +2,6 @@
import javax.ejb.Remove;
import javax.ejb.Stateful;
-import javax.webbeans.Destructor;
import javax.webbeans.Observes;
import javax.webbeans.RequestScoped;
@@ -10,7 +9,7 @@
@RequestScoped
class JackRussellTerrier
{
- @Remove @Destructor
+ @Remove
public void bye(@Observes Object something) {
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Pitbull.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Pitbull.java 2009-01-22 12:25:28 UTC (rev 1164)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Pitbull.java 2009-01-22 12:55:55 UTC (rev 1165)
@@ -3,7 +3,6 @@
import javax.ejb.Remove;
import javax.ejb.Stateful;
import javax.webbeans.ApplicationScoped;
-import javax.webbeans.Destructor;
import javax.webbeans.Named;
@Stateful
@@ -14,7 +13,7 @@
public static boolean destructorCalled = false;
- @Remove @Destructor
+ @Remove
public void bye()
{
destructorCalled = true;
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Rottweiler.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Rottweiler.java 2009-01-22 12:25:28 UTC (rev 1164)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Rottweiler.java 2009-01-22 12:55:55 UTC (rev 1165)
@@ -1,19 +1,16 @@
package org.jboss.webbeans.tck.unit.implementation.enterprise;
import javax.ejb.Stateful;
-import javax.webbeans.Destructor;
import javax.webbeans.RequestScoped;
@Stateful
@RequestScoped
class Rottweiler
{
- @Destructor
public void bye() {
}
- @Destructor
public void bye2() {
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/RussellTerrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/RussellTerrier.java 2009-01-22 12:25:28 UTC (rev 1164)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/RussellTerrier.java 2009-01-22 12:55:55 UTC (rev 1165)
@@ -1,14 +1,12 @@
package org.jboss.webbeans.tck.unit.implementation.enterprise;
import javax.ejb.Stateful;
-import javax.webbeans.Destructor;
import javax.webbeans.RequestScoped;
@Stateful
@RequestScoped
class RussellTerrier
{
- @Destructor
public void bye() {
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Shrike.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Shrike.java 2009-01-22 12:25:28 UTC (rev 1164)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Shrike.java 2009-01-22 12:55:55 UTC (rev 1165)
@@ -1,6 +1,5 @@
package org.jboss.webbeans.tck.unit.implementation.initializer;
-import javax.webbeans.Destructor;
import javax.webbeans.Initializer;
class Shrike
@@ -8,7 +7,6 @@
@Initializer
- @Destructor
public void setName(String name)
{
// No-op
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/OtherSpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/OtherSpiderProducer.java 2009-01-22 12:25:28 UTC (rev 1164)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/OtherSpiderProducer.java 2009-01-22 12:55:55 UTC (rev 1165)
@@ -14,7 +14,7 @@
@Produces @Tame public Tarantula produceTameTarantula = new DefangedTarantula();
- @Produces public Tarantula produceTarantula = new Tarantula();
+ @Produces public static Tarantula produceTarantula = new Tarantula();
@Produces @Named("blackWidow") public BlackWidow produceBlackWidow = new BlackWidow();
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/OtherSpiderProducer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/OtherSpiderProducer_Broken.java 2009-01-22 12:25:28 UTC (rev 1164)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/OtherSpiderProducer_Broken.java 2009-01-22 12:55:55 UTC (rev 1165)
@@ -1,6 +1,5 @@
package org.jboss.webbeans.tck.unit.implementation.producer.field;
-import javax.webbeans.Destructor;
import javax.webbeans.Disposes;
import javax.webbeans.Observes;
import javax.webbeans.Produces;
@@ -23,7 +22,7 @@
return "foo";
}
- @Produces @Destructor
+ @Produces
public String destroy()
{
return "foo";
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-01-22 12:25:28 UTC (rev 1164)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java 2009-01-22 12:55:55 UTC (rev 1165)
@@ -1,6 +1,7 @@
package org.jboss.webbeans.tck.unit.implementation.producer.field;
import java.lang.reflect.Field;
+import java.util.Set;
import javax.webbeans.IllegalProductException;
import javax.webbeans.manager.Bean;
@@ -13,40 +14,62 @@
@SpecVersion("20081206")
public class ProducerFieldLifecycleTest extends AbstractTest
{
-
- @SuppressWarnings("unchecked")
- @Test(groups={"producerField", "broken"}) @SpecAssertion(section="5.6")
+
+ /**
+ * When the create() method of a Bean object that represents a producer field
+ * is called, the container must access the producer field to obtain the
+ * current value of the field.
+ *
+ * • If the producer method is static, the container must access the field
+ * value.
+ *
+ * @throws Exception
+ */
+ @Test(groups = { "producerField", "broken" })
+ @SpecAssertion(section = "5.6")
+ public void testProducerStaticFieldBean()
+ {
+ deployBeans(OtherSpiderProducer.class, TarantulaConsumer.class);
+ TarantulaConsumer tarantulaConsumer = manager.getInstanceByType(TarantulaConsumer.class);
+ assert tarantulaConsumer.getConsumedTarantula().equals(OtherSpiderProducer.produceTarantula);
+ }
+
+ @Test(groups = { "producerField", "broken" })
+ @SpecAssertion(section = "5.6")
public void testProducerFieldBeanCreate() throws Exception
{
- Bean<OtherSpiderProducer> spiderProducer = createSimpleBean(OtherSpiderProducer.class);
- manager.addBean(spiderProducer);
+ deployBeans(OtherSpiderProducer.class);
+ Set<Bean<OtherSpiderProducer>> beans = manager.resolveByType(OtherSpiderProducer.class);
+ assert beans.size() == 1;
+ Bean<OtherSpiderProducer> spiderProducer = beans.iterator().next();
Field method = OtherSpiderProducer.class.getField("produceTarantula");
Bean<Tarantula> tarantulaBean = createProducerFieldBean(method, spiderProducer);
Tarantula tarantula = tarantulaBean.create();
assert tarantula != null;
}
-
- @Test(groups={"stub", "specialization"}) @SpecAssertion(section="3.3.3")
+
+ @Test(groups = { "stub", "specialization" })
+ @SpecAssertion(section = "3.3.3")
public void testSpecializedBeanAlwaysUsed()
{
// TODO Placeholder
assert false;
}
-
-
- @SuppressWarnings("unchecked")
- @Test(groups={"producerField", "broken"}) @SpecAssertion(section={"3.5", "5.6", "8.3"})
+
+ @Test(groups = { "producerField", "broken" })
+ @SpecAssertion(section = { "3.5", "5.6", "8.3" })
public void testProducerFieldReturnsNullIsDependent() throws Exception
{
- Bean<OtherSpiderProducer> spiderProducer = createSimpleBean(OtherSpiderProducer.class);
+ Bean<OtherSpiderProducer> spiderProducer = createSimpleBean(OtherSpiderProducer.class);
manager.addBean(spiderProducer);
Field method = OtherSpiderProducer.class.getField("getNullSpider");
Bean<Spider> spiderBean = createProducerFieldBean(method, spiderProducer);
Spider spider = spiderBean.create();
assert spider == null;
}
-
- @Test(groups="producerField", expectedExceptions=IllegalProductException.class) @SpecAssertion(section={"3.5", "5.6"})
+
+ @Test(groups = "producerField", expectedExceptions = IllegalProductException.class)
+ @SpecAssertion(section = { "3.5", "5.6" })
public void testProducerFieldReturnsNullIsNotDependent() throws Exception
{
Bean<OtherSpiderProducer_Broken> spiderProducer = createSimpleBean(OtherSpiderProducer_Broken.class);
@@ -54,5 +77,5 @@
Field method = OtherSpiderProducer_Broken.class.getField("getRequestScopedSpider");
createProducerFieldBean(method, spiderProducer).create();
}
-
+
}
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/TarantulaConsumer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/TarantulaConsumer.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/TarantulaConsumer.java 2009-01-22 12:55:55 UTC (rev 1165)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.webbeans.tck.unit.implementation.producer.field;
+
+import javax.webbeans.Current;
+
+/**
+ * This bean contains an injection point for a Tarantula that must be provided
+ * by the container via a producer field.
+ *
+ * @author David Allen
+ *
+ */
+public class TarantulaConsumer
+{
+ @Current
+ private Tarantula consumedTarantula;
+
+ public Tarantula getConsumedTarantula()
+ {
+ return consumedTarantula;
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/TarantulaConsumer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/SpiderProducer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/SpiderProducer_Broken.java 2009-01-22 12:25:28 UTC (rev 1164)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/SpiderProducer_Broken.java 2009-01-22 12:55:55 UTC (rev 1165)
@@ -1,6 +1,5 @@
package org.jboss.webbeans.tck.unit.implementation.producer.method;
-import javax.webbeans.Destructor;
import javax.webbeans.Disposes;
import javax.webbeans.Observes;
import javax.webbeans.Produces;
@@ -16,7 +15,7 @@
return null;
}
- @Produces @Destructor
+ @Produces
public String destroy()
{
return "foo";
16 years, 8 months
[webbeans-commits] Webbeans SVN: r1164 - tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api.
by webbeans-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-01-22 07:25:28 -0500 (Thu, 22 Jan 2009)
New Revision: 1164
Modified:
tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Containers.java
Log:
new spi methods for el eval
Modified: tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Containers.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Containers.java 2009-01-22 12:19:11 UTC (rev 1163)
+++ tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Containers.java 2009-01-22 12:25:28 UTC (rev 1164)
@@ -41,4 +41,22 @@
public Manager deploy(Class<?>...classes);
+ /**
+ *
+ * @param <T>
+ * @param expression
+ * @param expectedType
+ * @return
+ */
+ <T> T evaluateValueExpression(String expression, Class<T> expectedType);
+
+ /**
+ *
+ * @param <T>
+ * @param expression
+ * @param expectedType
+ * @param expectedParamTypes
+ * @return
+ */
+ <T> T evaluateMethodExpression(String expression, Class<T> expectedType, Class<?>[] expectedParamTypes);
}
16 years, 8 months
[webbeans-commits] Webbeans SVN: r1163 - ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck.
by webbeans-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-01-22 07:19:11 -0500 (Thu, 22 Jan 2009)
New Revision: 1163
Modified:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ContainersImpl.java
Log:
fix exception
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ContainersImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ContainersImpl.java 2009-01-22 12:04:20 UTC (rev 1162)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ContainersImpl.java 2009-01-22 12:19:11 UTC (rev 1163)
@@ -10,8 +10,6 @@
import org.jboss.webbeans.test.mock.MockBootstrap;
import org.jboss.webbeans.test.mock.MockWebBeanDiscovery;
-import sun.reflect.generics.reflectiveObjects.NotImplementedException;
-
public class ContainersImpl implements Containers
{
@@ -36,12 +34,12 @@
public <T> T evaluateValueExpression(String expression, Class<T> expectedType)
{
// TODO implement
- throw new NotImplementedException();
+ throw new UnsupportedOperationException();
}
public <T> T evaluateMethodExpression(String expression, Class<T> expectedType, Class<?>[] expectedParamTypes)
{
// TODO implement
- throw new NotImplementedException();
+ throw new UnsupportedOperationException();
}
}
16 years, 8 months