[jboss-cvs] JBossAS SVN: r92128 - in projects/webbeans-ri-int/trunk: deployer/src/main/java/org/jboss/webbeans/integration/deployer/env and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Aug 7 08:59:41 EDT 2009
Author: pete.muir at jboss.org
Date: 2009-08-07 08:59:41 -0400 (Fri, 07 Aug 2009)
New Revision: 92128
Added:
projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/lib-int/faces/META-INF/.faces-config.xml.jsfdia
Modified:
projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/lib-int/faces/META-INF/faces-config.xml
projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/FlatDeployment.java
projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/FlatDeploymentDeployer.java
projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/JBossBeanDeploymentArchive.java
projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/JBossDeployment.java
projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/WebBeanDiscoveryEnvironment.java
projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/deployers/support/WBDEWrapper.java
projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/deployers/test/AbstractDeploymentTest.java
projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossMessageDrivenBeanDescriptorAdaptor.java
projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossSessionBeanDescriptorAdaptor.java
Log:
WBRI-322, also ensure dependent instance always used for an evaluation, alter SPI methods to expose collection, not Iterable, add some decorator tests
Added: projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/lib-int/faces/META-INF/.faces-config.xml.jsfdia
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/lib-int/faces/META-INF/.faces-config.xml.jsfdia (rev 0)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/lib-int/faces/META-INF/.faces-config.xml.jsfdia 2009-08-07 12:59:41 UTC (rev 92128)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PROCESS model-entity="JSFProcess"/>
Modified: projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/lib-int/faces/META-INF/faces-config.xml
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/lib-int/faces/META-INF/faces-config.xml 2009-08-07 12:55:03 UTC (rev 92127)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/lib-int/faces/META-INF/faces-config.xml 2009-08-07 12:59:41 UTC (rev 92128)
@@ -4,6 +4,10 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
+ <factory>
+ <application-factory>org.jboss.webbeans.jsf.WebBeansApplicationFactory</application-factory>
+ </factory>
+
<application>
<el-resolver>org.jboss.webbeans.el.WebBeansELResolver</el-resolver>
<view-handler>org.jboss.webbeans.jsf.ConversationAwareViewHandler</view-handler>
Modified: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/FlatDeployment.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/FlatDeployment.java 2009-08-07 12:55:03 UTC (rev 92127)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/FlatDeployment.java 2009-08-07 12:59:41 UTC (rev 92128)
@@ -16,6 +16,7 @@
*/
package org.jboss.webbeans.integration.deployer.env;
+import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -37,7 +38,7 @@
private final BeanDeploymentArchive beanDeploymentArchive;
private final List<BeanDeploymentArchive> beanDeploymentArchives;
- public FlatDeployment(WebBeanDiscoveryEnvironment environment, Iterable<EjbDescriptor<?>> ejbDescriptors)
+ public FlatDeployment(WebBeanDiscoveryEnvironment environment, Collection<EjbDescriptor<?>> ejbDescriptors)
{
this.beanDeploymentArchive = new JBossBeanDeploymentArchive(environment, ejbDescriptors);
this.beanDeploymentArchives = Collections.singletonList(beanDeploymentArchive);
Modified: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/FlatDeploymentDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/FlatDeploymentDeployer.java 2009-08-07 12:55:03 UTC (rev 92127)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/FlatDeploymentDeployer.java 2009-08-07 12:59:41 UTC (rev 92128)
@@ -21,6 +21,8 @@
*/
package org.jboss.webbeans.integration.deployer.env;
+import java.util.Collection;
+
import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.webbeans.bootstrap.spi.Deployment;
@@ -53,6 +55,6 @@
{
WebBeanDiscoveryEnvironment env = unit.getAttachment(WebBeanDiscoveryEnvironment.class);
builder.addConstructorParameter(WebBeanDiscoveryEnvironment.class.getName(), env);
- builder.addConstructorParameter(Iterable.class.getName(), builder.createInject(info.getEjbServices().getUnderlyingValue(), "ejbs"));
+ builder.addConstructorParameter(Collection.class.getName(), builder.createInject(info.getEjbServices().getUnderlyingValue(), "ejbs"));
}
}
\ No newline at end of file
Modified: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/JBossBeanDeploymentArchive.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/JBossBeanDeploymentArchive.java 2009-08-07 12:55:03 UTC (rev 92127)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/JBossBeanDeploymentArchive.java 2009-08-07 12:59:41 UTC (rev 92128)
@@ -1,6 +1,7 @@
package org.jboss.webbeans.integration.deployer.env;
import java.net.URL;
+import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -12,15 +13,15 @@
private final WebBeanDiscoveryEnvironment environment;
- private final Iterable<EjbDescriptor<?>> ejbDescriptors;
+ private final Collection<EjbDescriptor<?>> ejbDescriptors;
- public JBossBeanDeploymentArchive(WebBeanDiscoveryEnvironment environment, Iterable<EjbDescriptor<?>> ejbDescriptors)
+ public JBossBeanDeploymentArchive(WebBeanDiscoveryEnvironment environment, Collection<EjbDescriptor<?>> ejbDescriptors)
{
this.environment = environment;
this.ejbDescriptors = ejbDescriptors;
}
- public Iterable<Class<?>> getBeanClasses()
+ public Collection<Class<?>> getBeanClasses()
{
return environment.getWebBeanClasses();
}
@@ -30,12 +31,12 @@
return Collections.emptyList();
}
- public Iterable<URL> getBeansXml()
+ public Collection<URL> getBeansXml()
{
return environment.getWebBeansXml();
}
- public Iterable<EjbDescriptor<?>> getEjbs()
+ public Collection<EjbDescriptor<?>> getEjbs()
{
return ejbDescriptors;
}
Modified: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/JBossDeployment.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/JBossDeployment.java 2009-08-07 12:55:03 UTC (rev 92127)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/JBossDeployment.java 2009-08-07 12:59:41 UTC (rev 92128)
@@ -17,6 +17,7 @@
package org.jboss.webbeans.integration.deployer.env;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
import org.jboss.webbeans.bootstrap.spi.BeanDeploymentArchive;
@@ -38,7 +39,7 @@
private final BeanDeploymentArchive beanDeploymentArchive;
private final List<BeanDeploymentArchive> beanDeploymentArchives;
- public JBossDeployment(WebBeanDiscoveryEnvironment environment, Iterable<EjbDescriptor<?>> ejbDescriptors)
+ public JBossDeployment(WebBeanDiscoveryEnvironment environment, Collection<EjbDescriptor<?>> ejbDescriptors)
{
this.beanDeploymentArchive = new JBossBeanDeploymentArchive(environment, ejbDescriptors);
this.beanDeploymentArchives = new ArrayList<BeanDeploymentArchive>();
Modified: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/WebBeanDiscoveryEnvironment.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/WebBeanDiscoveryEnvironment.java 2009-08-07 12:55:03 UTC (rev 92127)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/WebBeanDiscoveryEnvironment.java 2009-08-07 12:59:41 UTC (rev 92128)
@@ -22,6 +22,7 @@
package org.jboss.webbeans.integration.deployer.env;
import java.net.URL;
+import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
@@ -60,7 +61,7 @@
*
* @return the wb classes
*/
- public Iterable<Class<?>> getWebBeanClasses()
+ public Collection<Class<?>> getWebBeanClasses()
{
return classes;
}
@@ -70,7 +71,7 @@
*
* @return the wb xmls
*/
- public Iterable<URL> getWebBeansXml()
+ public Collection<URL> getWebBeansXml()
{
return urls;
}
Modified: projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/deployers/support/WBDEWrapper.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/deployers/support/WBDEWrapper.java 2009-08-07 12:55:03 UTC (rev 92127)
+++ projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/deployers/support/WBDEWrapper.java 2009-08-07 12:59:41 UTC (rev 92128)
@@ -22,9 +22,9 @@
package org.jboss.test.deployers.support;
import java.net.URL;
-import java.util.List;
+import java.util.Collection;
+import java.util.HashSet;
import java.util.Set;
-import java.util.HashSet;
import org.jboss.webbeans.bootstrap.spi.BeanDeploymentArchive;
import org.jboss.webbeans.bootstrap.spi.Deployment;
@@ -45,7 +45,7 @@
public Iterable<Class<?>> discoverWebBeanClasses()
{
Set<Class<?>> result = new HashSet<Class<?>>();
- List<BeanDeploymentArchive> bdas = deployment.getBeanDeploymentArchives();
+ Collection<BeanDeploymentArchive> bdas = deployment.getBeanDeploymentArchives();
for (BeanDeploymentArchive bda : bdas)
{
for (Class<?> clazz : bda.getBeanClasses())
@@ -57,7 +57,7 @@
public Iterable<URL> discoverWebBeansXml()
{
Set<URL> result = new HashSet<URL>();
- List<BeanDeploymentArchive> bdas = deployment.getBeanDeploymentArchives();
+ Collection<BeanDeploymentArchive> bdas = deployment.getBeanDeploymentArchives();
for (BeanDeploymentArchive bda : bdas)
{
for (URL url : bda.getBeansXml())
Modified: projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/deployers/test/AbstractDeploymentTest.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/deployers/test/AbstractDeploymentTest.java 2009-08-07 12:55:03 UTC (rev 92127)
+++ projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/deployers/test/AbstractDeploymentTest.java 2009-08-07 12:59:41 UTC (rev 92128)
@@ -23,6 +23,7 @@
import java.net.URL;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -54,7 +55,7 @@
super(name);
}
- protected void getArchives(List<BeanDeploymentArchive> result, List<BeanDeploymentArchive> archives)
+ protected void getArchives(List<BeanDeploymentArchive> result, Collection<BeanDeploymentArchive> archives)
{
for (BeanDeploymentArchive bda : archives)
{
Modified: projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossMessageDrivenBeanDescriptorAdaptor.java
===================================================================
--- projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossMessageDrivenBeanDescriptorAdaptor.java 2009-08-07 12:55:03 UTC (rev 92127)
+++ projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossMessageDrivenBeanDescriptorAdaptor.java 2009-08-07 12:59:41 UTC (rev 92128)
@@ -1,6 +1,7 @@
package org.jboss.webbeans.integration.ejb;
import java.lang.reflect.Method;
+import java.util.Collection;
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.ejb3.common.resolvers.spi.EjbReferenceResolver;
@@ -14,13 +15,13 @@
super(messageDrivenBeanMetaData, deploymentUnit, resolver);
}
- public Iterable<BusinessInterfaceDescriptor<?>> getLocalBusinessInterfaces()
+ public Collection<BusinessInterfaceDescriptor<?>> getLocalBusinessInterfaces()
{
// Not relevant for MDBs
return null;
}
- public Iterable<Method> getRemoveMethods()
+ public Collection<Method> getRemoveMethods()
{
// Not relevant for MDBs
return null;
Modified: projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossSessionBeanDescriptorAdaptor.java
===================================================================
--- projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossSessionBeanDescriptorAdaptor.java 2009-08-07 12:55:03 UTC (rev 92127)
+++ projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossSessionBeanDescriptorAdaptor.java 2009-08-07 12:59:41 UTC (rev 92128)
@@ -2,6 +2,7 @@
import java.lang.reflect.Method;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
import org.jboss.deployers.structure.spi.DeploymentUnit;
@@ -81,12 +82,12 @@
this.deploymentUnit = deploymentUnit;
}
- public Iterable<BusinessInterfaceDescriptor<?>> getLocalBusinessInterfaces()
+ public Collection<BusinessInterfaceDescriptor<?>> getLocalBusinessInterfaces()
{
return localBusinessInterfaces;
}
- public Iterable<Method> getRemoveMethods()
+ public Collection<Method> getRemoveMethods()
{
return removeMethods;
}
More information about the jboss-cvs-commits
mailing list