simplify replacements since some went to owb [GERONIMO-6796]
diff --git a/knights/openwebbeans-knight/src/main/java/org/apache/geronimo/arthur/knight/openwebbeans/OpenWebBeansExtension.java b/knights/openwebbeans-knight/src/main/java/org/apache/geronimo/arthur/knight/openwebbeans/OpenWebBeansExtension.java
index 1547d30..31e9bee 100644
--- a/knights/openwebbeans-knight/src/main/java/org/apache/geronimo/arthur/knight/openwebbeans/OpenWebBeansExtension.java
+++ b/knights/openwebbeans-knight/src/main/java/org/apache/geronimo/arthur/knight/openwebbeans/OpenWebBeansExtension.java
@@ -422,10 +422,6 @@
properties.setProperty("org.apache.webbeans.spi.DefiningClassService", runtime ?
"org.apache.webbeans.service.ClassLoaderProxyService$LoadOnly" :
"org.apache.webbeans.service.ClassLoaderProxyService$Spy");
- if (runtime) {
- properties.setProperty(
- properties.getProperty("org.apache.webbeans.spi.DefiningClassService") + ".skipPackages", "true");
- }
properties.setProperty("org.apache.webbeans.spi.ApplicationBoundaryService",
"org.apache.webbeans.corespi.se.SimpleApplicationBoundaryService");
}
diff --git a/knights/openwebbeans-knight/src/main/java/org/apache/geronimo/arthur/knight/openwebbeans/replacement/AbstractMetaDataDiscovery.java b/knights/openwebbeans-knight/src/main/java/org/apache/geronimo/arthur/knight/openwebbeans/replacement/AbstractMetaDataDiscovery.java
deleted file mode 100644
index c4a08fd..0000000
--- a/knights/openwebbeans-knight/src/main/java/org/apache/geronimo/arthur/knight/openwebbeans/replacement/AbstractMetaDataDiscovery.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.geronimo.arthur.knight.openwebbeans.replacement;
-
-import com.oracle.svm.core.annotate.Substitute;
-import com.oracle.svm.core.annotate.TargetClass;
-
-@TargetClass(org.apache.webbeans.corespi.scanner.AbstractMetaDataDiscovery.class)
-public final class AbstractMetaDataDiscovery {
- @Substitute
- protected void registerBeanArchives(final ClassLoader loader) {
- // no-op: we don't discover we just take the generated/configured scanning
- }
-}
diff --git a/knights/openwebbeans-knight/src/main/java/org/apache/geronimo/arthur/knight/openwebbeans/replacement/OWBInitializer.java b/knights/openwebbeans-knight/src/main/java/org/apache/geronimo/arthur/knight/openwebbeans/replacement/OWBInitializer.java
index 159652c..84f302f 100644
--- a/knights/openwebbeans-knight/src/main/java/org/apache/geronimo/arthur/knight/openwebbeans/replacement/OWBInitializer.java
+++ b/knights/openwebbeans-knight/src/main/java/org/apache/geronimo/arthur/knight/openwebbeans/replacement/OWBInitializer.java
@@ -21,12 +21,12 @@
import org.apache.openwebbeans.se.PreScannedCDISeScannerService;
import org.apache.webbeans.spi.ScannerService;
+import java.util.Map;
+
@TargetClass(org.apache.openwebbeans.se.OWBInitializer.class)
public final class OWBInitializer {
@Substitute
- protected ScannerService getScannerService() {
- final PreScannedCDISeScannerService scannerService = new PreScannedCDISeScannerService();
- scannerService.loader(Thread.currentThread().getContextClassLoader());
- return scannerService;
+ protected void addCustomServices(final Map<String, Object> services) {
+ services.put(ScannerService.class.getName(), new PreScannedCDISeScannerService());
}
}
