openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gerdo...@apache.org
Subject svn commit: r1056920 - in /openwebbeans/trunk: webbeans-impl/src/main/java/org/apache/webbeans/el/WebBeansELResolver.java webbeans-porting/src/main/java/org/apache/webbeans/test/tck/ELImpl.java webbeans-tck/pom.xml
Date Sun, 09 Jan 2011 11:53:37 GMT
Author: gerdogdu
Date: Sun Jan  9 11:53:37 2011
New Revision: 1056920

URL: http://svn.apache.org/viewvc?rev=1056920&view=rev
Log:
[OWB-516] Get TCK standalone 1.0.4 CR2 and also updates TCK EK resolver

Modified:
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WebBeansELResolver.java
    openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/ELImpl.java
    openwebbeans/trunk/webbeans-tck/pom.xml

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WebBeansELResolver.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WebBeansELResolver.java?rev=1056920&r1=1056919&r2=1056920&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WebBeansELResolver.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WebBeansELResolver.java
Sun Jan  9 11:53:37 2011
@@ -160,7 +160,7 @@ public class WebBeansELResolver extends 
         return contextualInstance;
     }
 
-    private Object getNormalScopedContextualInstance(BeanManagerImpl manager, ELContextStore
store, ELContext context, Bean<Object> bean, String beanName)
+    protected Object getNormalScopedContextualInstance(BeanManagerImpl manager, ELContextStore
store, ELContext context, Bean<Object> bean, String beanName)
     {
         CreationalContext<Object> creationalContext = manager.createCreationalContext(bean);
         Object contextualInstance = manager.getReference(bean, Object.class, creationalContext);
@@ -175,7 +175,7 @@ public class WebBeansELResolver extends 
     }
 
 
-    private Object getDependentContextualInstance(BeanManagerImpl manager, ELContextStore
store, ELContext context, Bean<Object> bean)
+    protected Object getDependentContextualInstance(BeanManagerImpl manager, ELContextStore
store, ELContext context, Bean<Object> bean)
     {
         Object contextualInstance = store.getDependent(bean);
         if(contextualInstance != null)

Modified: openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/ELImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/ELImpl.java?rev=1056920&r1=1056919&r2=1056920&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/ELImpl.java
(original)
+++ openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/ELImpl.java
Sun Jan  9 11:53:37 2011
@@ -35,7 +35,6 @@ import javax.el.VariableMapper;
 import org.apache.el.ExpressionFactoryImpl;
 import org.apache.el.lang.FunctionMapperImpl;
 import org.apache.el.lang.VariableMapperImpl;
-import org.apache.webbeans.el.WebBeansELResolver;
 import org.apache.webbeans.el.WrappedExpressionFactory;
 import org.jboss.jsr299.tck.spi.EL;
 
@@ -55,7 +54,7 @@ public class ELImpl implements EL
         composite.add(new MapELResolver());
         composite.add(new ListELResolver());
         composite.add(new ResourceBundleELResolver());
-        composite.add(new WebBeansELResolver());
+        composite.add(new OwbTckElResolver());
         
         return composite;
     }

Modified: openwebbeans/trunk/webbeans-tck/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tck/pom.xml?rev=1056920&r1=1056919&r2=1056920&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-tck/pom.xml (original)
+++ openwebbeans/trunk/webbeans-tck/pom.xml Sun Jan  9 11:53:37 2011
@@ -33,7 +33,7 @@
 
     <properties>
         <!--  <webbeans.tck.version>1.0.1-Final</webbeans.tck.version> -->
-        <webbeans.tck.version>1.0.4.CR1</webbeans.tck.version>
+        <webbeans.tck.version>1.0.4.CR2</webbeans.tck.version>
     </properties>
 
     <!--Used for jboss-test-harness-api not in central maven -->



Mime
View raw message