Author: peteroyle Date: 2009-08-09 06:29:46 -0400 (Sun, 09 Aug 2009) New Revision: 3409 Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/bindings/Parameters.java extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/SEBeanDeploymentArchive.java extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/SEWebBeanDiscovery.java extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/events/Shutdown.java Log: Updated for API change: Iterable --> Collection, and stricter validation of Binding Types. Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/bindings/Parameters.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/bindings/Parameters.java 2009-08-07 18:54:14 UTC (rev 3408) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/bindings/Parameters.java 2009-08-09 10:29:46 UTC (rev 3409) @@ -29,5 +29,5 @@ */ @BindingType @Retention(RetentionPolicy.RUNTIME) -@Target( { ElementType.PARAMETER, ElementType.METHOD, ElementType.FIELD }) +@Target( { ElementType.PARAMETER, ElementType.METHOD, ElementType.FIELD, ElementType.TYPE }) public @interface Parameters {} Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/SEBeanDeploymentArchive.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/SEBeanDeploymentArchive.java 2009-08-07 18:54:14 UTC (rev 3408) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/SEBeanDeploymentArchive.java 2009-08-09 10:29:46 UTC (rev 3409) @@ -17,6 +17,7 @@ package org.jboss.webbeans.environment.se.discovery; import java.net.URL; +import java.util.Collection; import java.util.Collections; import java.util.List; import org.jboss.webbeans.bootstrap.spi.BeanDeploymentArchive; @@ -42,7 +43,7 @@ /** * @return a collection of all Bean classes on the classpath. */ - public Iterable<Class<?>> getBeanClasses() + public Collection<Class<?>> getBeanClasses() { return wbDiscovery.getWbClasses(); } @@ -59,7 +60,7 @@ /** * @return all beans.xml decriptors found on the classpath. */ - public Iterable<URL> getBeansXml() + public Collection<URL> getBeansXml() { return wbDiscovery.discoverWebBeansXml(); } @@ -67,7 +68,7 @@ /** * @return an empty collection since there are no EJBs in Java SE. */ - public Iterable<EjbDescriptor<?>> getEjbs() + public Collection<EjbDescriptor<?>> getEjbs() { return Collections.EMPTY_SET; } Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/SEWebBeanDiscovery.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/SEWebBeanDiscovery.java 2009-08-07 18:54:14 UTC (rev 3408) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/SEWebBeanDiscovery.java 2009-08-09 10:29:46 UTC (rev 3409) @@ -17,6 +17,7 @@ package org.jboss.webbeans.environment.se.discovery; import java.net.URL; +import java.util.Collection; import java.util.Collections; import java.util.HashSet; import java.util.Set; @@ -50,7 +51,7 @@ return Collections.unmodifiableSet(wbClasses); } - public Iterable<URL> discoverWebBeansXml() + public Collection<URL> discoverWebBeansXml() { return Collections.unmodifiableSet(wbUrls); } Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/events/Shutdown.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/events/Shutdown.java 2009-08-07 18:54:14 UTC (rev 3408) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/events/Shutdown.java 2009-08-09 10:29:46 UTC (rev 3409) @@ -31,5 +31,5 @@ */ @BindingType @Retention(RetentionPolicy.RUNTIME) -@Target( { ElementType.PARAMETER, ElementType.METHOD, ElementType.FIELD }) +@Target( { ElementType.PARAMETER, ElementType.METHOD, ElementType.FIELD, ElementType.TYPE }) public @interface Shutdown{}