You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2018/02/06 15:33:10 UTC
svn commit: r1823350 - in /openwebbeans/meecrowave/trunk/meecrowave-core/src/main: java/org/apache/meecrowave/cdi/ java/org/apache/meecrowave/openwebbeans/ resources/META-INF/openwebbeans/

Author: struberg
Date: Tue Feb  6 15:33:10 2018
New Revision: 1823350

URL: http://svn.apache.org/viewvc?rev=1823350&view=rev
Log:
Knowclasses -> KnownClassesFilter

Added:
    openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/KnownClassesFilter.java
      - copied, changed from r1823349, openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/KnowClassesFilter.java
Removed:
    openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/KnowClassesFilter.java
Modified:
    openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/cdi/MeecrowaveSeContainerInitializer.java
    openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/OWBTomcatWebScannerService.java
    openwebbeans/meecrowave/trunk/meecrowave-core/src/main/resources/META-INF/openwebbeans/openwebbeans.properties

Modified: openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/cdi/MeecrowaveSeContainerInitializer.java
URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/cdi/MeecrowaveSeContainerInitializer.java?rev=1823350&r1=1823349&r2=1823350&view=diff
==============================================================================
--- openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/cdi/MeecrowaveSeContainerInitializer.java (original)
+++ openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/cdi/MeecrowaveSeContainerInitializer.java Tue Feb  6 15:33:10 2018
@@ -22,7 +22,7 @@ import org.apache.meecrowave.Meecrowave;
 import org.apache.meecrowave.logging.jul.Log4j2Logger;
 import org.apache.meecrowave.logging.openwebbeans.Log4j2LoggerFactory;
 import org.apache.meecrowave.logging.tomcat.Log4j2Log;
-import org.apache.meecrowave.openwebbeans.KnowClassesFilter;
+import org.apache.meecrowave.openwebbeans.KnownClassesFilter;
 import org.apache.meecrowave.openwebbeans.OWBTomcatWebScannerService;
 import org.apache.openwebbeans.se.OWBContainer;
 import org.apache.openwebbeans.se.OWBInitializer;
@@ -106,7 +106,7 @@ public class MeecrowaveSeContainerInitia
     @Override
     protected void addCustomServices(final Map<String, Object> services) {
         final Set<String> forced = this.scannerService.configuredClasses().stream().map(Class::getName).collect(toSet());
-        services.put(Filter.class.getName(), new KnowClassesFilter() { // override it to make programmatic configuration working OOTB
+        services.put(Filter.class.getName(), new KnownClassesFilter() { // override it to make programmatic configuration working OOTB
             @Override
             public boolean accept(final String name) {
                 return forced.contains(name) || super.accept(name);

Copied: openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/KnownClassesFilter.java (from r1823349, openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/KnowClassesFilter.java)
URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/KnownClassesFilter.java?p2=openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/KnownClassesFilter.java&p1=openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/KnowClassesFilter.java&r1=1823349&r2=1823350&rev=1823350&view=diff
==============================================================================
--- openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/KnowClassesFilter.java (original)
+++ openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/KnownClassesFilter.java Tue Feb  6 15:33:10 2018
@@ -28,7 +28,7 @@ import java.util.stream.Stream;
 
 import static java.util.Optional.ofNullable;
 
-public class KnowClassesFilter implements Filter { // one easy and efficient solution for fatjars
+public class KnownClassesFilter implements Filter { // one easy and efficient solution for fatjars
     private static final String[] EMPTY_ARRAY = new String[0];
 
     // this has to be configured from the root config
@@ -38,7 +38,7 @@ public class KnowClassesFilter implement
     private final Filter delegateAccept;
     private final Filter delegateSkip;
 
-    public KnowClassesFilter() {
+    public KnownClassesFilter() {
         final Set<String> excluded = new HashSet<>();
         excluded.add("com.codehale.metrics");
         excluded.add("com.ctc.wstx");

Modified: openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/OWBTomcatWebScannerService.java
URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/OWBTomcatWebScannerService.java?rev=1823350&r1=1823349&r2=1823350&view=diff
==============================================================================
--- openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/OWBTomcatWebScannerService.java (original)
+++ openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/OWBTomcatWebScannerService.java Tue Feb  6 15:33:10 2018
@@ -302,8 +302,8 @@ public class OWBTomcatWebScannerService
         }
 
         final Filter userFilter = webBeansContext().getService(Filter.class);
-        if (KnowClassesFilter.class.isInstance(userFilter)) {
-            KnowClassesFilter.class.cast(userFilter).init(config);
+        if (KnownClassesFilter.class.isInstance(userFilter)) {
+            KnownClassesFilter.class.cast(userFilter).init(config);
         }
     }
 

Modified: openwebbeans/meecrowave/trunk/meecrowave-core/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-core/src/main/resources/META-INF/openwebbeans/openwebbeans.properties?rev=1823350&r1=1823349&r2=1823350&view=diff
==============================================================================
--- openwebbeans/meecrowave/trunk/meecrowave-core/src/main/resources/META-INF/openwebbeans/openwebbeans.properties (original)
+++ openwebbeans/meecrowave/trunk/meecrowave-core/src/main/resources/META-INF/openwebbeans/openwebbeans.properties Tue Feb  6 15:33:10 2018
@@ -15,6 +15,6 @@
 #specific language governing permissions and limitations
 #under the License.
 configuration.ordinal=1000
-org.apache.xbean.finder.filter.Filter=org.apache.meecrowave.openwebbeans.KnowClassesFilter
+org.apache.xbean.finder.filter.Filter=org.apache.meecrowave.openwebbeans.KnownClassesFilter
 org.apache.webbeans.spi.ScannerService=org.apache.meecrowave.openwebbeans.OWBTomcatWebScannerService
 org.apache.webbeans.spi.SecurityService=org.apache.meecrowave.openwebbeans.MeecrowaveSecurityService