openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r1448017 - in /openwebbeans/trunk: webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/ webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/xbean/ webbeans-web/src/main/java/org/apache/webbeans/web/scanner/
Date Wed, 20 Feb 2013 07:22:03 GMT
Author: struberg
Date: Wed Feb 20 07:22:02 2013
New Revision: 1448017

URL: http://svn.apache.org/r1448017
Log:
OWB-779 fix TCK tests

Modified:
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/xbean/CdiArchive.java
    openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java?rev=1448017&r1=1448016&r2=1448017&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java
Wed Feb 20 07:22:02 2013
@@ -112,6 +112,7 @@ public abstract class AbstractMetaDataDi
         try
         {
             configure();
+            initFinder();
         }
         catch (Exception e)
         {

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/xbean/CdiArchive.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/xbean/CdiArchive.java?rev=1448017&r1=1448016&r2=1448017&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/xbean/CdiArchive.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/xbean/CdiArchive.java
Wed Feb 20 07:22:02 2013
@@ -37,10 +37,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-// this delegate pattern is interesting
-// because we will be able to add
-// some exclusion config through it
-// using Filter + FilterArchive
+/**
+ * this delegate pattern is interesting
+ * because we will be able to add
+ * some exclusion config through it
+ * using Filter + FilterArchive
+ */
 public class CdiArchive implements Archive
 {
     private final Map<URL, Collection<String>> map = new HashMap<URL, Collection<String>>();

Modified: openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java?rev=1448017&r1=1448016&r2=1448017&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java
(original)
+++ openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java
Wed Feb 20 07:22:02 2013
@@ -44,8 +44,6 @@ public class WebScannerService extends A
 {
     private final static Logger logger = WebBeansLoggerFacade.getLogger(WebScannerService.class);
 
-    private boolean configure = false;
-
     protected ServletContext servletContext = null;
 
     public WebScannerService()
@@ -95,20 +93,6 @@ public class WebScannerService extends A
     
     protected void configure()
     {
-        try
-        {
-            if (!configure)
-            {
-                initFinder();
-                configure = true;
-            }
-
-        }
-        catch (Exception e)
-        {
-            throw new WebBeansConfigurationException(WebBeansLoggerFacade.getTokenString(OWBLogConst.ERROR_0002),
e);
-        }
-
     }
 
     /**



Mime
View raw message