[webbeans-commits] Webbeans SVN: r1751 - in extensions/trunk/se: src/main/java/org/jboss/webbeans/environment/se and 2 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Mon Mar 2 16:47:12 EST 2009
Author: peteroyle
Date: 2009-03-02 16:47:11 -0500 (Mon, 02 Mar 2009)
New Revision: 1751
Modified:
extensions/trunk/se/pom.xml
extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java
extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/AbstractScanner.java
extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/DeploymentStrategy.java
extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/Scanner.java
extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/URLScanner.java
extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/WebBeanDiscoveryImpl.java
Log:
decoupled DeploymentStrategy from URLScanner
Modified: extensions/trunk/se/pom.xml
===================================================================
--- extensions/trunk/se/pom.xml 2009-03-02 14:12:02 UTC (rev 1750)
+++ extensions/trunk/se/pom.xml 2009-03-02 21:47:11 UTC (rev 1751)
@@ -96,7 +96,6 @@
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-ri-spi</artifactId>
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-03-02 14:12:02 UTC (rev 1750)
+++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java 2009-03-02 21:47:11 UTC (rev 1751)
@@ -16,7 +16,6 @@
*/
package org.jboss.webbeans.environment.se;
-import org.jboss.webbeans.context.api.helpers.ConcurrentHashMapBeanStore;
import org.jboss.webbeans.environment.se.boot.WebBeansBootstrap;
/**
Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/AbstractScanner.java
===================================================================
--- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/AbstractScanner.java 2009-03-02 14:12:02 UTC (rev 1750)
+++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/AbstractScanner.java 2009-03-02 21:47:11 UTC (rev 1751)
@@ -146,24 +146,27 @@
}
private static final LogProvider log = Logging.getLogProvider( Scanner.class );
- private DeploymentStrategy deploymentStrategy;
+ private Set<DeploymentHandler> deploymentHandlers;
+ private ClassLoader classLoader;
- public AbstractScanner( DeploymentStrategy deploymentStrategy )
+
+ public AbstractScanner( Set<DeploymentHandler> deploymentHandlers, ClassLoader classLoader )
{
- this.deploymentStrategy = deploymentStrategy;
+ this.deploymentHandlers = deploymentHandlers;
+ this.classLoader = classLoader;
ClassFile.class.getPackage( ); //to force loading of javassist, throwing an exception if it is missing
}
- public DeploymentStrategy getDeploymentStrategy( )
+ protected boolean handle( String name )
{
- return deploymentStrategy;
+ return new Handler( name,
+ deploymentHandlers,
+ classLoader ).handle( );
}
- protected boolean handle( String name )
+ public ClassLoader getClassLoader()
{
- return new Handler( name,
- deploymentStrategy.getDeploymentHandlers( ),
- deploymentStrategy.getClassLoader( ) ).handle( );
+ return classLoader;
}
}
Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/DeploymentStrategy.java
===================================================================
--- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/DeploymentStrategy.java 2009-03-02 14:12:02 UTC (rev 1750)
+++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/DeploymentStrategy.java 2009-03-02 21:47:11 UTC (rev 1751)
@@ -119,7 +119,7 @@
}
log.debug( "Using default URLScanner" );
- this.scanner = new URLScanner( this );
+ ////this.scanner = new URLScanner( this );
}
private Scanner instantiateScanner( String className )
Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/Scanner.java
===================================================================
--- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/Scanner.java 2009-03-02 14:12:02 UTC (rev 1750)
+++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/Scanner.java 2009-03-02 21:47:11 UTC (rev 1751)
@@ -42,9 +42,4 @@
*/
public void scanResources( String[] resources );
- /**
- * Get the deployment strategy this scanner is used by
- */
- public DeploymentStrategy getDeploymentStrategy( );
-
}
Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/URLScanner.java
===================================================================
--- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/URLScanner.java 2009-03-02 14:12:02 UTC (rev 1750)
+++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/URLScanner.java 2009-03-02 21:47:11 UTC (rev 1751)
@@ -45,9 +45,9 @@
{
private static final LogProvider log = Logging.getLogProvider( URLScanner.class );
- public URLScanner( DeploymentStrategy deploymentStrategy )
+ public URLScanner( Set<DeploymentHandler> deploymentHandlers, ClassLoader classLoader )
{
- super( deploymentStrategy );
+ super( deploymentHandlers, classLoader );
}
@Override
@@ -67,7 +67,7 @@
{
try
{
- Enumeration<URL> urlEnum = getDeploymentStrategy( ).getClassLoader( ).getResources( resourceName );
+ Enumeration<URL> urlEnum = getClassLoader( ).getResources( resourceName );
while ( urlEnum.hasMoreElements( ) )
{
Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/WebBeanDiscoveryImpl.java
===================================================================
--- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/WebBeanDiscoveryImpl.java 2009-03-02 14:12:02 UTC (rev 1750)
+++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/WebBeanDiscoveryImpl.java 2009-03-02 21:47:11 UTC (rev 1751)
@@ -16,17 +16,21 @@
*/
package org.jboss.webbeans.environment.se.discovery;
+import java.io.File;
import org.apache.log4j.Logger;
import org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery;
import org.jboss.webbeans.ejb.spi.EjbDescriptor;
import org.jboss.webbeans.environment.se.deployment.ClassDescriptor;
import org.jboss.webbeans.environment.se.deployment.FileDescriptor;
-import org.jboss.webbeans.environment.se.deployment.StandardDeploymentStrategy;
import java.net.URL;
import java.util.HashSet;
import java.util.Set;
+import org.jboss.webbeans.environment.se.deployment.DeploymentHandler;
+import org.jboss.webbeans.environment.se.deployment.SimpleWebBeansDeploymentHandler;
+import org.jboss.webbeans.environment.se.deployment.URLScanner;
+import org.jboss.webbeans.environment.se.deployment.WebBeansXmlDeploymentHandler;
/**
* The means by which Web Beans are discovered on the classpath. This will only
@@ -39,16 +43,26 @@
{
private Set<Class<?>> wbClasses = new HashSet<Class<?>>( );
private Set<URL> wbUrls = new HashSet<URL>( );
- private StandardDeploymentStrategy deploymentStrategy;
+// private StandardDeploymentStrategy deploymentStrategy;
+ private SimpleWebBeansDeploymentHandler simpleWebBeansDeploymentHandler = new SimpleWebBeansDeploymentHandler();
+ private WebBeansXmlDeploymentHandler webBeansXmlDeploymentHandler = new WebBeansXmlDeploymentHandler();
+ URLScanner urlScanner;
+
// The log provider
private static Logger log = Logger.getLogger( WebBeanDiscoveryImpl.class.getName( ) );
public WebBeanDiscoveryImpl( )
{
- deploymentStrategy = new StandardDeploymentStrategy( Thread.currentThread( ).getContextClassLoader( ) );
- deploymentStrategy.scan( );
+ final ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+ Set<DeploymentHandler> deploymentHandlers = new HashSet<DeploymentHandler>();
+ deploymentHandlers.add( simpleWebBeansDeploymentHandler );
+ deploymentHandlers.add( webBeansXmlDeploymentHandler );
+ urlScanner = new URLScanner( deploymentHandlers, contextClassLoader );
+ urlScanner.scanResources( new String[] { "beans.xml"} );
+ urlScanner.scanDirectories( new File[]{} );
+
findWebBeansXmlUrls( );
findWebBeansAnnotatedClasses( );
}
@@ -71,7 +85,7 @@
private void findWebBeansAnnotatedClasses( )
throws WebBeanDiscoveryException
{
- for ( ClassDescriptor classDesc : deploymentStrategy.getSimpleWebBeans( ) )
+ for ( ClassDescriptor classDesc : simpleWebBeansDeploymentHandler.getClasses() )
{
final Class<?> clazz = classDesc.getClazz( );
wbClasses.add( clazz );
@@ -80,7 +94,7 @@
private void findWebBeansXmlUrls( )
{
- for ( FileDescriptor fileDesc : deploymentStrategy.getWebBeansXMLs( ) )
+ for ( FileDescriptor fileDesc : webBeansXmlDeploymentHandler.getResources() )
{
wbUrls.add( fileDesc.getUrl( ) );
}
More information about the weld-commits
mailing list