Author: pete.muir(a)jboss.org Date: 2009-09-22 06:52:17 -0400 (Tue, 22 Sep 2009) New Revision: 3717 Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/ShutdownManager.java extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/beans/ParametersFactory.java 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/AbstractScanner.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/discovery/SEWebBeansDeployment.java extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/Scanner.java extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/URLScanner.java 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/util/Reflections.java extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/util/WebBeansManagerUtils.java extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/StartMainTest.java extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/beans/CustomEvent.java extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/beans/MainTestBean.java extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/beans/ObserverTestBean.java extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/beans/ParametersTestBean.java Log: ws Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/ShutdownManager.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/ShutdownManager.java 2009-09-21 21:45:58 UTC (rev 3716) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/ShutdownManager.java 2009-09-22 10:52:17 UTC (rev 3717) @@ -32,7 +32,9 @@ { private static LogProvider log = Logging.getLogProvider(ShutdownManager.class); - private @Inject WebBeansManager manager; + + @Inject + private WebBeansManager manager; private boolean hasShutdownBeenCalled = false; @@ -66,7 +68,8 @@ * Shutdown WebBeans SE gracefully (call this as an alternative to firing the * "@Shutdown Manager" event. */ - public void shutdown() { + public void shutdown() + { shutdown(manager); } @@ -74,5 +77,5 @@ { this.bootstrap = bootstrap; } - + } Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java 2009-09-21 21:45:58 UTC (rev 3716) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java 2009-09-22 10:52:17 UTC (rev 3717) @@ -40,51 +40,56 @@ public class StartMain { - private static final String BOOTSTRAP_IMPL_CLASS_NAME = "org.jboss.webbeans.bootstrap.WebBeansBootstrap"; - private final Bootstrap bootstrap; - private final BeanStore applicationBeanStore; - public static String[] PARAMETERS; - private WebBeansManager manager; + private static final String BOOTSTRAP_IMPL_CLASS_NAME = "org.jboss.webbeans.bootstrap.WebBeansBootstrap"; + private final Bootstrap bootstrap; + private final BeanStore applicationBeanStore; + public static String[] PARAMETERS; + private WebBeansManager manager; - public StartMain(String[] commandLineArgs) - { - PARAMETERS = commandLineArgs; - try { - bootstrap = Reflections.newInstance(BOOTSTRAP_IMPL_CLASS_NAME, Bootstrap.class); - } catch (Exception e) { - throw new IllegalStateException("Error loading Web Beans bootstrap, check that Web Beans is on the classpath", e); - } - this.applicationBeanStore = new ConcurrentHashMapBeanStore(); - } + public StartMain(String[] commandLineArgs) + { + PARAMETERS = commandLineArgs; + try + { + bootstrap = Reflections.newInstance(BOOTSTRAP_IMPL_CLASS_NAME, Bootstrap.class); + } + catch (Exception e) + { + throw new IllegalStateException("Error loading Web Beans bootstrap, check that Web Beans is on the classpath", e); + } + this.applicationBeanStore = new ConcurrentHashMapBeanStore(); + } - public BeanManager go() { - SEWebBeansDeployment deployment = new SEWebBeansDeployment() {}; - bootstrap.startContainer(Environments.SE, deployment, this.applicationBeanStore); - final BeanDeploymentArchive mainBeanDepArch = deployment.getBeanDeploymentArchives().get(0); - this.manager = bootstrap.getManager(mainBeanDepArch); - bootstrap.startInitialization(); - bootstrap.deployBeans(); - WebBeansManagerUtils.getInstanceByType(manager, ShutdownManager.class).setBootstrap(bootstrap); - bootstrap.validateBeans(); - bootstrap.endInitialization(); - return this.manager; - } + public BeanManager go() + { + SEWebBeansDeployment deployment = new SEWebBeansDeployment() + { + }; + bootstrap.startContainer(Environments.SE, deployment, this.applicationBeanStore); + final BeanDeploymentArchive mainBeanDepArch = deployment.getBeanDeploymentArchives().get(0); + this.manager = bootstrap.getManager(mainBeanDepArch); + bootstrap.startInitialization(); + bootstrap.deployBeans(); + WebBeansManagerUtils.getInstanceByType(manager, ShutdownManager.class).setBootstrap(bootstrap); + bootstrap.validateBeans(); + bootstrap.endInitialization(); + return this.manager; + } - /** - * The main method called from the command line. - * - * @param args - * the command line arguments - */ - public static void main(String[] args) - { - new StartMain(args).go(); - } + /** + * The main method called from the command line. + * + * @param args the command line arguments + */ + public static void main(String[] args) + { + new StartMain(args).go(); + } - public static String[] getParameters() - { - // TODO(PR): make immutable - return PARAMETERS; - } - + public static String[] getParameters() + { + // TODO(PR): make immutable + return PARAMETERS; + } + } Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/beans/ParametersFactory.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/beans/ParametersFactory.java 2009-09-21 21:45:58 UTC (rev 3716) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/beans/ParametersFactory.java 2009-09-22 10:52:17 UTC (rev 3717) @@ -40,16 +40,18 @@ private String[] args; private List<String> argsList; - public ParametersFactory() { - this.setArgs(StartMain.PARAMETERS); - } - + public ParametersFactory() + { + this.setArgs(StartMain.PARAMETERS); + } + /** * Producer method for the injectable command line args. * * @return The command line arguments. */ - @Produces @Parameters + @Produces + @Parameters public List<String> getArgs() { return argsList; @@ -57,10 +59,12 @@ /** * Producer method for the injectable command line args. + * * @return The command line arguments. */ - @Produces @Parameters - public String[] getArgsAsArray( ) + @Produces + @Parameters + public String[] getArgsAsArray() { return this.args; } @@ -68,17 +72,17 @@ /** * StartMain passes in the command line args here. * - * @param args - * The command line arguments. If null is given then an empty array - * will be used instead. + * @param args The command line arguments. If null is given then an empty + * array will be used instead. */ public void setArgs(String[] args) { - if (args == null) { + if (args == null) + { args = new String[] {}; } this.args = args; - this.argsList = Collections.unmodifiableList( new ArrayList<String>( Arrays.asList( args ) ) ); + this.argsList = Collections.unmodifiableList(new ArrayList<String>(Arrays.asList(args))); } } 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-09-21 21:45:58 UTC (rev 3716) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/bindings/Parameters.java 2009-09-22 10:52:17 UTC (rev 3717) @@ -22,7 +22,6 @@ import java.lang.annotation.Target; import javax.inject.Qualifier; - /** * * @author Peter Royle Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/AbstractScanner.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/AbstractScanner.java 2009-09-21 21:45:58 UTC (rev 3716) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/AbstractScanner.java 2009-09-22 10:52:17 UTC (rev 3717) @@ -31,17 +31,17 @@ */ public abstract class AbstractScanner implements Scanner { - + private static final LogProvider log = Logging.getLogProvider(Scanner.class); private final ClassLoader classLoader; private final SEWebBeanDiscovery webBeanDiscovery; - + public AbstractScanner(ClassLoader classLoader, SEWebBeanDiscovery webBeanDiscovery) { this.classLoader = classLoader; this.webBeanDiscovery = webBeanDiscovery; } - + protected void handle(String name, URL url) { if (name.endsWith(".class")) @@ -65,19 +65,18 @@ webBeanDiscovery.getWbUrls().add(url); } } - + public ClassLoader getClassLoader() { return classLoader; } - + /** * Convert a path to a class file to a class name */ public static String filenameToClassname(String filename) { - return filename.substring( 0, filename.lastIndexOf(".class") ) - .replace('/', '.').replace('\\', '.'); + return filename.substring(0, filename.lastIndexOf(".class")).replace('/', '.').replace('\\', '.'); } - + } 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-09-21 21:45:58 UTC (rev 3716) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/SEBeanDeploymentArchive.java 2009-09-22 10:52:17 UTC (rev 3717) @@ -35,50 +35,53 @@ */ public class SEBeanDeploymentArchive implements BeanDeploymentArchive { - private final SEWebBeanDiscovery wbDiscovery; - private final ServiceRegistry serviceRegistry; + private final SEWebBeanDiscovery wbDiscovery; + private final ServiceRegistry serviceRegistry; - public SEBeanDeploymentArchive() - { - wbDiscovery = new SEWebBeanDiscovery() {}; - serviceRegistry = new SimpleServiceRegistry(); - } + public SEBeanDeploymentArchive() + { + wbDiscovery = new SEWebBeanDiscovery() + { + }; + serviceRegistry = new SimpleServiceRegistry(); + } - /** - * @return a collection of all Bean classes on the classpath. - */ - public Collection<Class<?>> getBeanClasses() - { - return wbDiscovery.getWbClasses(); - } + /** + * @return a collection of all Bean classes on the classpath. + */ + public Collection<Class<?>> getBeanClasses() + { + return wbDiscovery.getWbClasses(); + } - /** - * @return an empty collection, since this instance is the only logical - * archive for the current SE classloader. - */ - public List<BeanDeploymentArchive> getBeanDeploymentArchives() - { - return Collections.EMPTY_LIST; - } + /** + * @return an empty collection, since this instance is the only logical + * archive for the current SE classloader. + */ + public List<BeanDeploymentArchive> getBeanDeploymentArchives() + { + return Collections.EMPTY_LIST; + } - /** - * @return all beans.xml decriptors found on the classpath. - */ - public Collection<URL> getBeansXml() - { - return wbDiscovery.discoverWebBeansXml(); - } + /** + * @return all beans.xml decriptors found on the classpath. + */ + public Collection<URL> getBeansXml() + { + return wbDiscovery.discoverWebBeansXml(); + } - /** - * @return an empty collection since there are no EJBs in Java SE. - */ - public Collection<EjbDescriptor<?>> getEjbs() - { - return Collections.EMPTY_SET; - } + /** + * @return an empty collection since there are no EJBs in Java SE. + */ + public Collection<EjbDescriptor<?>> getEjbs() + { + return Collections.EMPTY_SET; + } - public ServiceRegistry getServices() { - return this.serviceRegistry; - } + public ServiceRegistry getServices() + { + return this.serviceRegistry; + } } 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-09-21 21:45:58 UTC (rev 3716) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/SEWebBeanDiscovery.java 2009-09-22 10:52:17 UTC (rev 3717) @@ -34,41 +34,41 @@ */ public abstract class SEWebBeanDiscovery { - + private final Set<Class<?>> wbClasses; private final Set<URL> wbUrls; - + public SEWebBeanDiscovery() { this.wbClasses = new HashSet<Class<?>>(); this.wbUrls = new HashSet<URL>(); scan(); } - + public Iterable<Class<?>> discoverWebBeanClasses() { return Collections.unmodifiableSet(wbClasses); } - + public Collection<URL> discoverWebBeansXml() { return Collections.unmodifiableSet(wbUrls); } - + public Set<Class<?>> getWbClasses() { return wbClasses; } - + public Set<URL> getWbUrls() { return wbUrls; } - + private void scan() { Scanner scanner = new URLScanner(Reflections.getClassLoader(), this); scanner.scanResources(new String[] { "META-INF/beans.xml" }); } - + } Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/SEWebBeansDeployment.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/SEWebBeansDeployment.java 2009-09-21 21:45:58 UTC (rev 3716) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/SEWebBeansDeployment.java 2009-09-22 10:52:17 UTC (rev 3717) @@ -24,44 +24,46 @@ /** * WebBeans Deployment for Java SE environment. - * + * * @author Peter Royle */ public abstract class SEWebBeansDeployment implements Deployment { - private final BeanDeploymentArchive beanDeploymentArchive; - private final List<BeanDeploymentArchive> archInCollection; + private final BeanDeploymentArchive beanDeploymentArchive; + private final List<BeanDeploymentArchive> archInCollection; - public SEWebBeansDeployment() - { - this.beanDeploymentArchive = new SEBeanDeploymentArchive(); - this.archInCollection = new ArrayList<BeanDeploymentArchive>(1); - this.archInCollection.add(this.beanDeploymentArchive); - } + public SEWebBeansDeployment() + { + this.beanDeploymentArchive = new SEBeanDeploymentArchive(); + this.archInCollection = new ArrayList<BeanDeploymentArchive>(1); + this.archInCollection.add(this.beanDeploymentArchive); + } + /** + * {@inheritDoc} + * + * @return A collection containing the singular logical BeanDeploymentArchive + * consisting of all Bean classes and beans.xml descriptors in the + * current classpath. + */ + public List<BeanDeploymentArchive> getBeanDeploymentArchives() + { + return this.archInCollection; + } - /** - * {@inheritDoc} - * @return A collection containing the singular logical BeanDeploymentArchive - * consisting of all Bean classes and beans.xml descriptors in the current - * classpath. - */ - public List<BeanDeploymentArchive> getBeanDeploymentArchives() - { - return this.archInCollection; - } + /** + * {@inheritDoc} + * + * @return The singular logical BeanDeploymentArchive consisting of all which + * contains all Beans classes. + */ + public BeanDeploymentArchive loadBeanDeploymentArchive(Class<?> beanClass) + { + return this.beanDeploymentArchive; + } - /** - * {@inheritDoc} - * @return The singular logical BeanDeploymentArchive consisting of all - * which contains all Beans classes. - */ - public BeanDeploymentArchive loadBeanDeploymentArchive(Class<?> beanClass) - { - return this.beanDeploymentArchive; - } - - public ServiceRegistry getServices() { - return this.beanDeploymentArchive.getServices(); - } + public ServiceRegistry getServices() + { + return this.beanDeploymentArchive.getServices(); + } } Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/Scanner.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/Scanner.java 2009-09-21 21:45:58 UTC (rev 3716) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/Scanner.java 2009-09-22 10:52:17 UTC (rev 3717) @@ -31,17 +31,15 @@ /** * Recursively scan directories. * - * @param directories - * An array of the roots of the directory trees to scan + * @param directories An array of the roots of the directory trees to scan */ public void scanDirectories(File[] directories); - + /** * Scan for structures which contain any of the given resources in their root * - * @param resources - * The resources to scan for + * @param resources The resources to scan for */ public void scanResources(String[] resources); - + } Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/URLScanner.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/URLScanner.java 2009-09-21 21:45:58 UTC (rev 3716) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/URLScanner.java 2009-09-22 10:52:17 UTC (rev 3717) @@ -32,7 +32,6 @@ import org.jboss.webbeans.log.LogProvider; import org.jboss.webbeans.log.Logging; - /** * Implementation of {@link Scanner} which can scan a {@link URLClassLoader} * @@ -45,7 +44,7 @@ public class URLScanner extends AbstractScanner { private static final LogProvider log = Logging.getLogProvider(URLScanner.class); - + public URLScanner(ClassLoader classLoader, SEWebBeanDiscovery webBeanDiscovery) { super(classLoader, webBeanDiscovery); @@ -58,27 +57,27 @@ handleDirectory(directory, null); } } - + public void scanResources(String[] resources) { Set<String> paths = new HashSet<String>(); - + for (String resourceName : resources) { try { Enumeration<URL> urlEnum = getClassLoader().getResources(resourceName); - + while (urlEnum.hasMoreElements()) { String urlPath = urlEnum.nextElement().getFile(); urlPath = URLDecoder.decode(urlPath, "UTF-8"); - + if (urlPath.startsWith("file:")) { urlPath = urlPath.substring(5); } - + if (urlPath.indexOf('!') > 0) { urlPath = urlPath.substring(0, urlPath.indexOf('!')); @@ -86,16 +85,16 @@ else { File dirOrArchive = new File(urlPath); - + if ((resourceName != null) && (resourceName.lastIndexOf('/') > 0)) { // for META-INF/components.xml dirOrArchive = dirOrArchive.getParentFile(); } - + urlPath = dirOrArchive.getParent(); } - + paths.add(urlPath); } } @@ -104,10 +103,10 @@ log.warn("could not read: " + resourceName, ioe); } } - + handle(paths); } - + protected void handle(Set<String> paths) { for (String urlPath : paths) @@ -115,9 +114,9 @@ try { log.trace("scanning: " + urlPath); - + File file = new File(urlPath); - + if (file.isDirectory()) { handleDirectory(file, null); @@ -133,16 +132,16 @@ } } } - + private void handleArchiveByFile(File file) throws IOException { try { log.trace("archive: " + file); - + ZipFile zip = new ZipFile(file); Enumeration<? extends ZipEntry> entries = zip.entries(); - + while (entries.hasMoreElements()) { ZipEntry entry = entries.nextElement(); @@ -155,12 +154,12 @@ throw new RuntimeException("Error handling file " + file, e); } } - + private void handleDirectory(File file, String path) { handleDirectory(file, path, new File[0]); } - + private void handleDirectory(File file, String path, File[] excludedDirectories) { for (File excludedDirectory : excludedDirectories) @@ -168,17 +167,17 @@ if (file.equals(excludedDirectory)) { log.trace("skipping excluded directory: " + file); - + return; } } - + log.trace("handling directory: " + file); - + for (File child : file.listFiles()) { String newPath = (path == null) ? child.getName() : (path + '/' + child.getName()); - + if (child.isDirectory()) { handleDirectory(child, newPath, excludedDirectories); @@ -196,5 +195,5 @@ } } } - + } 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-09-21 21:45:58 UTC (rev 3716) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/events/Shutdown.java 2009-09-22 10:52:17 UTC (rev 3717) @@ -32,4 +32,4 @@ @Qualifier @Retention(RetentionPolicy.RUNTIME) @Target( { ElementType.PARAMETER, ElementType.METHOD, ElementType.FIELD, ElementType.TYPE }) -public @interface Shutdown{} +public @interface Shutdown {} Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/util/Reflections.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/util/Reflections.java 2009-09-21 21:45:58 UTC (rev 3716) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/util/Reflections.java 2009-09-22 10:52:17 UTC (rev 3717) @@ -24,17 +24,17 @@ */ public abstract class Reflections { - + private Reflections() { // TODO Auto-generated constructor stub } - + public static <T> T newInstance(String className, Class<T> expectedType) throws InstantiationException, IllegalAccessException, ClassNotFoundException { return loadClass(className, expectedType).newInstance(); } - + public static <T> Class<? extends T> loadClass(String className, Class<T> expectedType) throws ClassNotFoundException { if (Thread.currentThread().getContextClassLoader() != null) @@ -46,7 +46,7 @@ return Class.forName(className).asSubclass(expectedType); } } - + public static ClassLoader getClassLoader() { if (Thread.currentThread().getContextClassLoader() != null) @@ -58,5 +58,5 @@ return Reflections.class.getClassLoader(); } } - + } Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/util/WebBeansManagerUtils.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/util/WebBeansManagerUtils.java 2009-09-21 21:45:58 UTC (rev 3716) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/util/WebBeansManagerUtils.java 2009-09-22 10:52:17 UTC (rev 3717) @@ -26,16 +26,18 @@ * * @author Peter Royle */ -public class WebBeansManagerUtils { +public class WebBeansManagerUtils +{ - public static <T> T getInstanceByType(BeanManager manager, Class<T> type, Annotation... bindings) { - final Bean<?> bean = manager.getBeans(type).iterator().next(); - CreationalContext cc = manager.createCreationalContext(bean); - return (T)manager.getReference(bean, type, cc); - } + public static <T> T getInstanceByType(BeanManager manager, Class<T> type, Annotation... bindings) + { + final Bean<?> bean = manager.getBeans(type).iterator().next(); + CreationalContext cc = manager.createCreationalContext(bean); + return (T) manager.getReference(bean, type, cc); + } - public static <T> T getInstanceByType(BeanManager manager, Class<T> type, CreationalContext cc, Annotation... bindings) { - return (T)manager.getReference( - manager.getBeans(type).iterator().next(), type, cc); - } + public static <T> T getInstanceByType(BeanManager manager, Class<T> type, CreationalContext cc, Annotation... bindings) + { + return (T) manager.getReference(manager.getBeans(type).iterator().next(), type, cc); + } } Modified: extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/StartMainTest.java =================================================================== --- extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/StartMainTest.java 2009-09-21 21:45:58 UTC (rev 3716) +++ extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/StartMainTest.java 2009-09-22 10:52:17 UTC (rev 3717) @@ -30,84 +30,86 @@ import org.testng.annotations.Test; /** - * + * * @author Peter Royle */ -public class StartMainTest { +public class StartMainTest +{ - public static String[] ARGS = new String[] { "arg1", "arg2", "arg3"}; - public static String[] ARGS_EMPTY = new String[] { }; + public static String[] ARGS = new String[] { "arg1", "arg2", "arg3" }; + public static String[] ARGS_EMPTY = new String[] {}; - /** - * Test of main method, of class StartMain. Checks that the beans - * found in the org.jboss.webbeans.environment.se.beans package are - * initialised as expected. - */ - @Test - public void testMain() - { - String[] args = ARGS ; - BeanManager manager = new StartMain(args).go(); + /** + * Test of main method, of class StartMain. Checks that the beans found in + * the org.jboss.webbeans.environment.se.beans package are initialised as + * expected. + */ + @Test + public void testMain() + { + String[] args = ARGS; + BeanManager manager = new StartMain(args).go(); - MainTestBean mainTestBean = WebBeansManagerUtils.getInstanceByType( manager, MainTestBean.class ); - Assert.assertNotNull( mainTestBean ); + MainTestBean mainTestBean = WebBeansManagerUtils.getInstanceByType(manager, MainTestBean.class); + Assert.assertNotNull(mainTestBean); - ParametersTestBean paramsBean = mainTestBean.getParametersTestBean(); - Assert.assertNotNull( paramsBean ); - Assert.assertNotNull( paramsBean.getParameters() ); - Assert.assertNotNull( paramsBean.getParameters().get(0) ); - Assert.assertEquals( ARGS[0], paramsBean.getParameters().get(0) ); - Assert.assertNotNull( paramsBean.getParameters().get(1) ); - Assert.assertEquals( ARGS[1], paramsBean.getParameters().get(1) ); - Assert.assertNotNull( paramsBean.getParameters().get(2) ); - Assert.assertEquals( ARGS[2], paramsBean.getParameters().get(2) ); + ParametersTestBean paramsBean = mainTestBean.getParametersTestBean(); + Assert.assertNotNull(paramsBean); + Assert.assertNotNull(paramsBean.getParameters()); + Assert.assertNotNull(paramsBean.getParameters().get(0)); + Assert.assertEquals(ARGS[0], paramsBean.getParameters().get(0)); + Assert.assertNotNull(paramsBean.getParameters().get(1)); + Assert.assertEquals(ARGS[1], paramsBean.getParameters().get(1)); + Assert.assertNotNull(paramsBean.getParameters().get(2)); + Assert.assertEquals(ARGS[2], paramsBean.getParameters().get(2)); - shutdownManager(manager); - } + shutdownManager(manager); + } - /** - * Test of main method, of class StartMain when no command-line args are - * provided. - */ - @Test - public void testMainEmptyArgs() - { - BeanManager manager = new StartMain(ARGS_EMPTY).go(); + /** + * Test of main method, of class StartMain when no command-line args are + * provided. + */ + @Test + public void testMainEmptyArgs() + { + BeanManager manager = new StartMain(ARGS_EMPTY).go(); - MainTestBean mainTestBean = WebBeansManagerUtils.getInstanceByType( manager, MainTestBean.class ); - Assert.assertNotNull( mainTestBean ); + MainTestBean mainTestBean = WebBeansManagerUtils.getInstanceByType(manager, MainTestBean.class); + Assert.assertNotNull(mainTestBean); - ParametersTestBean paramsBean = mainTestBean.getParametersTestBean(); - Assert.assertNotNull( paramsBean ); - Assert.assertNotNull( paramsBean.getParameters() ); + ParametersTestBean paramsBean = mainTestBean.getParametersTestBean(); + Assert.assertNotNull(paramsBean); + Assert.assertNotNull(paramsBean.getParameters()); - shutdownManager(manager); - } + shutdownManager(manager); + } - @Test - public void testObservers() { - BeanManager manager = new StartMain(ARGS_EMPTY).go(); + @Test + public void testObservers() + { + BeanManager manager = new StartMain(ARGS_EMPTY).go(); - manager.fireEvent( new CustomEvent() ); + manager.fireEvent(new CustomEvent()); - ObserverTestBean observerTestBean = WebBeansManagerUtils.getInstanceByType( manager, ObserverTestBean.class ); - Assert.assertNotNull( observerTestBean ); - Assert.assertTrue( observerTestBean.isCustomObserved() ); - Assert.assertTrue( observerTestBean.isBuiltInObserved() ); + ObserverTestBean observerTestBean = WebBeansManagerUtils.getInstanceByType(manager, ObserverTestBean.class); + Assert.assertNotNull(observerTestBean); + Assert.assertTrue(observerTestBean.isCustomObserved()); + Assert.assertTrue(observerTestBean.isBuiltInObserved()); - } + } - private void shutdownManager( BeanManager manager ) - { - manager.fireEvent( manager, new ShutdownAnnotation() ); - } + private void shutdownManager(BeanManager manager) + { + manager.fireEvent(manager, new ShutdownAnnotation()); + } - private static class ShutdownAnnotation extends AnnotationLiteral<Shutdown> - { + private static class ShutdownAnnotation extends AnnotationLiteral<Shutdown> + { - public ShutdownAnnotation() - { - } - } + public ShutdownAnnotation() + { + } + } } Modified: extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/beans/CustomEvent.java =================================================================== --- extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/beans/CustomEvent.java 2009-09-21 21:45:58 UTC (rev 3716) +++ extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/beans/CustomEvent.java 2009-09-22 10:52:17 UTC (rev 3717) @@ -22,6 +22,7 @@ * * @author Peter Royle */ -public class CustomEvent { +public class CustomEvent +{ } Modified: extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/beans/MainTestBean.java =================================================================== --- extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/beans/MainTestBean.java 2009-09-21 21:45:58 UTC (rev 3716) +++ extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/beans/MainTestBean.java 2009-09-22 10:52:17 UTC (rev 3717) @@ -23,40 +23,42 @@ import javax.inject.Inject; /** - * + * * @author Peter Royle */ @ApplicationScoped public class MainTestBean implements Serializable { - boolean initialised = false; - ParametersTestBean parametersTestBean; + boolean initialised = false; + ParametersTestBean parametersTestBean; - public MainTestBean() { - } + public MainTestBean() + { + } - @Inject - public MainTestBean(ParametersTestBean paramsTestBean) - { - this.initialised = true; - this.parametersTestBean = paramsTestBean; - // this call is important. It invokes initialiser on the proxy - paramsTestBean.getParameters(); - } + @Inject + public MainTestBean(ParametersTestBean paramsTestBean) + { + this.initialised = true; + this.parametersTestBean = paramsTestBean; + // this call is important. It invokes initialiser on the proxy + paramsTestBean.getParameters(); + } - public void mainMethod(@Observes AfterDeploymentValidation after) { - System.out.println( "Starting main test app" ); - } + public void mainMethod(@Observes AfterDeploymentValidation after) + { + System.out.println("Starting main test app"); + } - public ParametersTestBean getParametersTestBean() - { - return parametersTestBean; - } + public ParametersTestBean getParametersTestBean() + { + return parametersTestBean; + } - public boolean isInitialised() - { - return initialised; - } - + public boolean isInitialised() + { + return initialised; + } + } Modified: extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/beans/ObserverTestBean.java =================================================================== --- extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/beans/ObserverTestBean.java 2009-09-21 21:45:58 UTC (rev 3716) +++ extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/beans/ObserverTestBean.java 2009-09-22 10:52:17 UTC (rev 3717) @@ -26,37 +26,41 @@ * @author Peter Royle */ @ApplicationScoped -public class ObserverTestBean { +public class ObserverTestBean +{ - private boolean builtInObserved = false; - private boolean customObserved = false; + private boolean builtInObserved = false; + private boolean customObserved = false; - public ObserverTestBean() { - } + public ObserverTestBean() + { + } - public void observeBuiltInEvent(@Observes AfterDeploymentValidation after) { - this.builtInObserved = true; - } + public void observeBuiltInEvent(@Observes AfterDeploymentValidation after) + { + this.builtInObserved = true; + } - public void observeCustomEvent(@Observes CustomEvent event) { - this.customObserved = true; + public void observeCustomEvent(@Observes CustomEvent event) + { + this.customObserved = true; - } - - /** - * @return the observed - */ - public boolean isBuiltInObserved() { - return builtInObserved; - } + } - /** - * @return - */ - public boolean isCustomObserved() { - return customObserved; - } + /** + * @return the observed + */ + public boolean isBuiltInObserved() + { + return builtInObserved; + } + /** + * @return + */ + public boolean isCustomObserved() + { + return customObserved; + } - } Modified: extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/beans/ParametersTestBean.java =================================================================== --- extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/beans/ParametersTestBean.java 2009-09-21 21:45:58 UTC (rev 3716) +++ extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/beans/ParametersTestBean.java 2009-09-22 10:52:17 UTC (rev 3717) @@ -27,27 +27,31 @@ import org.testng.Assert; /** - * + * * @author Peter Royle */ @ApplicationScoped -public class ParametersTestBean implements Serializable { +public class ParametersTestBean implements Serializable +{ - List<String> parameters; + List<String> parameters; - public ParametersTestBean() { - } + public ParametersTestBean() + { + } - @Inject - public ParametersTestBean(@Parameters List<String> params) { - this.parameters = params; - // even if no args are given, it should will always at least be an empty array - Assert.assertNotNull( params ); - } + @Inject + public ParametersTestBean(@Parameters List<String> params) + { + this.parameters = params; + // even if no args are given, it should will always at least be an empty + // array + Assert.assertNotNull(params); + } - public List<String> getParameters() - { - return parameters; - } + public List<String> getParameters() + { + return parameters; + } }