[webbeans-commits] Webbeans SVN: r3480 - in ri/trunk: jboss-tck-runner and 6 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Thu Aug 13 09:27:16 EDT 2009
Author: pete.muir at jboss.org
Date: 2009-08-13 09:27:15 -0400 (Thu, 13 Aug 2009)
New Revision: 3480
Removed:
ri/trunk/spi/src/main/java/org/jboss/webbeans/messaging/spi/JmsServices.java
ri/trunk/spi/src/main/java/org/jboss/webbeans/ws/spi/WebServices.java
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingELResolver.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingExpressionFactory.java
ri/trunk/jboss-tck-runner/pom.xml
ri/trunk/porting-package/pom.xml
ri/trunk/tests/pom.xml
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/ELResolverTest.java
ri/trunk/version-matrix/pom.xml
Log:
WBRI-348
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingELResolver.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingELResolver.java 2009-08-13 12:55:10 UTC (rev 3479)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingELResolver.java 2009-08-13 13:27:15 UTC (rev 3480)
@@ -16,6 +16,7 @@
*/
package org.jboss.webbeans.util.el;
+import java.beans.FeatureDescriptor;
import java.util.Iterator;
import javax.el.ELContext;
@@ -33,7 +34,7 @@
}
@Override
- public Iterator<?> getFeatureDescriptors(ELContext context, Object base)
+ public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext context, Object base)
{
return delegate().getFeatureDescriptors(context, base);
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingExpressionFactory.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingExpressionFactory.java 2009-08-13 12:55:10 UTC (rev 3479)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingExpressionFactory.java 2009-08-13 13:27:15 UTC (rev 3480)
@@ -31,30 +31,26 @@
protected abstract ExpressionFactory delegate();
- @SuppressWarnings("unchecked")
@Override
- public Object coerceToType(Object obj, Class targetType)
+ public Object coerceToType(Object obj, Class<?> targetType)
{
return delegate().coerceToType(obj, targetType);
}
- @SuppressWarnings("unchecked")
@Override
- public MethodExpression createMethodExpression(ELContext context, String expression, Class expectedReturnType, Class[] expectedParamTypes)
+ public MethodExpression createMethodExpression(ELContext context, String expression, Class<?> expectedReturnType, Class<?>[] expectedParamTypes)
{
return delegate().createMethodExpression(context, expression, expectedReturnType, expectedParamTypes);
}
- @SuppressWarnings("unchecked")
@Override
- public ValueExpression createValueExpression(Object instance, Class expectedType)
+ public ValueExpression createValueExpression(Object instance, Class<?> expectedType)
{
return delegate().createValueExpression(instance, expectedType);
}
- @SuppressWarnings("unchecked")
@Override
- public ValueExpression createValueExpression(ELContext context, String expression, Class expectedType)
+ public ValueExpression createValueExpression(ELContext context, String expression, Class<?> expectedType)
{
return delegate().createValueExpression(context, expression, expectedType);
}
Modified: ri/trunk/jboss-tck-runner/pom.xml
===================================================================
--- ri/trunk/jboss-tck-runner/pom.xml 2009-08-13 12:55:10 UTC (rev 3479)
+++ ri/trunk/jboss-tck-runner/pom.xml 2009-08-13 13:27:15 UTC (rev 3480)
@@ -76,8 +76,8 @@
<outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
</artifactItem>
<artifactItem>
- <groupId>javax.el</groupId>
- <artifactId>el-ri</artifactId>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>el-impl</artifactId>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
</artifactItem>
Modified: ri/trunk/porting-package/pom.xml
===================================================================
--- ri/trunk/porting-package/pom.xml 2009-08-13 12:55:10 UTC (rev 3479)
+++ ri/trunk/porting-package/pom.xml 2009-08-13 13:27:15 UTC (rev 3480)
@@ -29,9 +29,9 @@
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
</dependency>
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-ri</artifactId>
+ <dependency>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>el-impl</artifactId>
</dependency>
<dependency>
Deleted: ri/trunk/spi/src/main/java/org/jboss/webbeans/messaging/spi/JmsServices.java
===================================================================
--- ri/trunk/spi/src/main/java/org/jboss/webbeans/messaging/spi/JmsServices.java 2009-08-13 12:55:10 UTC (rev 3479)
+++ ri/trunk/spi/src/main/java/org/jboss/webbeans/messaging/spi/JmsServices.java 2009-08-13 13:27:15 UTC (rev 3480)
@@ -1,45 +0,0 @@
-package org.jboss.webbeans.messaging.spi;
-
-
-import javax.jms.Destination;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.TopicConnectionFactory;
-
-import org.jboss.webbeans.bootstrap.api.Service;
-
-/**
- * A container should implement this interface to allow Web Beans to resolve Jms
- * Services
- *
- * @author Pete Muir
- *
- */
-public interface JmsServices extends Service
-{
-
- /**
- * Resolve the destination for the given JNDI name and mapped name
- *
- * @param injectionPoint
- * the injection point metadata
- * @return an instance of the resource
- * @throws IllegalStateException
- * if no resource can be resolved for injection
- */
- public <T extends Destination> T resolveDestination(String jndiName, String mappedName);
-
- /**
- * Get a QueueConnectionFactory
- *
- * @return the queue connection factory
- */
- public QueueConnectionFactory getQueueConnectionFactory();
-
- /**
- * Get a TopicConnectionFactory
- *
- * @return
- */
- public TopicConnectionFactory getTopicConnectionFactory();
-
-}
\ No newline at end of file
Deleted: ri/trunk/spi/src/main/java/org/jboss/webbeans/ws/spi/WebServices.java
===================================================================
--- ri/trunk/spi/src/main/java/org/jboss/webbeans/ws/spi/WebServices.java 2009-08-13 12:55:10 UTC (rev 3479)
+++ ri/trunk/spi/src/main/java/org/jboss/webbeans/ws/spi/WebServices.java 2009-08-13 13:27:15 UTC (rev 3480)
@@ -1,27 +0,0 @@
-package org.jboss.webbeans.ws.spi;
-
-
-import org.jboss.webbeans.bootstrap.api.Service;
-
-/**
- * A container should implement this interface to allow Web Beans to resolve Web
- * Services
- *
- * @author Pete Muir
- *
- */
-public interface WebServices extends Service
-{
-
- /**
- * Resolve the value for the given JNDI name and mapped name
- *
- * @param injectionPoint
- * the injection point metadata
- * @return an instance of the resource
- * @throws IllegalStateException
- * if no resource can be resolved for injection
- */
- public Object resolveResource(String jndiName, String mappedName);
-
-}
\ No newline at end of file
Modified: ri/trunk/tests/pom.xml
===================================================================
--- ri/trunk/tests/pom.xml 2009-08-13 12:55:10 UTC (rev 3479)
+++ ri/trunk/tests/pom.xml 2009-08-13 13:27:15 UTC (rev 3480)
@@ -40,8 +40,8 @@
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-ri</artifactId>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>el-impl</artifactId>
</dependency>
<dependency>
@@ -159,8 +159,8 @@
<outputDirectory>${project.build.directory}/classes/lib</outputDirectory>
</artifactItem>
<artifactItem>
- <groupId>javax.el</groupId>
- <artifactId>el-ri</artifactId>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>el-impl</artifactId>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
</artifactItem>
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/ELResolverTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/ELResolverTest.java 2009-08-13 12:55:10 UTC (rev 3479)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/ELResolverTest.java 2009-08-13 13:27:15 UTC (rev 3480)
@@ -20,13 +20,6 @@
public class ELResolverTest extends AbstractWebBeansTest
{
- @Test(groups="incontainer-broken")
- public void testNonBeanDoesntResolveToNamespace()
- {
- ELContext elContext = EL.createELContext();
- assert EL.EXPRESSION_FACTORY.createValueExpression(elContext, "#{foo.bar}", Object.class).getValue(elContext) == null;
- }
-
/**
* Test that the WebBeansELResolver only works to resolve the base of an EL
* expression, in this case a named bean. Once the base is resolved, the
Modified: ri/trunk/version-matrix/pom.xml
===================================================================
--- ri/trunk/version-matrix/pom.xml 2009-08-13 12:55:10 UTC (rev 3479)
+++ ri/trunk/version-matrix/pom.xml 2009-08-13 13:27:15 UTC (rev 3480)
@@ -151,7 +151,7 @@
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
- <version>1.2</version>
+ <version>2.1.2-b04</version>
</dependency>
<dependency>
@@ -217,21 +217,15 @@
</dependency>
<dependency>
- <groupId>org.jboss.el</groupId>
- <artifactId>jboss-el</artifactId>
- <version>1.0_02.CR2</version>
- </dependency>
-
- <dependency>
<groupId>com.sun.facelets</groupId>
<artifactId>jsf-facelets</artifactId>
<version>1.1.15.B1</version>
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-ri</artifactId>
- <version>1.2</version>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>el-impl</artifactId>
+ <version>2.1.2-b04</version>
</dependency>
<dependency>
More information about the weld-commits
mailing list