You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by st...@apache.org on 2021/09/24 18:46:34 UTC
[deltaspike] 04/04: DELTASPIKE-1438 remove EAR support
This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/deltaspike.git
commit ec5b4fe9b88f9c1a5c4d5c3182e7fb5bda99baf1
Author: Mark Struberg <st...@apache.org>
AuthorDate: Fri Sep 24 20:44:40 2021 +0200
DELTASPIKE-1438 remove EAR support
most containers do not properly support CDI in EARs anyway.
Plus EARs are barely used these times.
---
.../apache/deltaspike/core/util/ParentExtensionStorage.java | 0
.../apache/deltaspike/core/util/ClassDeactivationUtils.java | 2 +-
.../test/core/api/exclude/ExcludeEarFileTest.java | 0
.../core/api/provider/BeanManagerProviderEarFileTest.java | 0
.../core/impl/activation/ClassDeactivationEarFileTest.java | 0
.../impl/custom/spi/PartialBeanAsInterfaceEarFileTest.java | 0
.../test/core/impl/jmx/SimpleRegistrationEarFileTest.java | 0
.../test/core/impl/util/JndiUtilsEarFileTest.java | 0
.../core/impl/message/MessageBundleExtension.java | 8 --------
.../security/impl/extension/SecurityExtension.java | 13 -------------
10 files changed, 1 insertion(+), 22 deletions(-)
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ParentExtensionStorage.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/ParentExtensionStorage.java
similarity index 100%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ParentExtensionStorage.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/ParentExtensionStorage.java
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ClassDeactivationUtils.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ClassDeactivationUtils.java
index c3a10f2..d448d5a 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ClassDeactivationUtils.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ClassDeactivationUtils.java
@@ -46,7 +46,7 @@ public abstract class ClassDeactivationUtils
* The Map then contains a List of {@link ClassDeactivator}s in order of their configured ordinal.
*/
private static Map<ClassLoader, List<ClassDeactivator>> classDeactivatorMap
- = new ConcurrentHashMap<ClassLoader, List<ClassDeactivator>>();
+ = new ConcurrentHashMap<>();
/**
* Cache for the result. It won't contain many classes but it might be accessed frequently.
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/exclude/ExcludeEarFileTest.java b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/api/exclude/ExcludeEarFileTest.java
similarity index 100%
rename from deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/exclude/ExcludeEarFileTest.java
rename to deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/api/exclude/ExcludeEarFileTest.java
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/BeanManagerProviderEarFileTest.java b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/api/provider/BeanManagerProviderEarFileTest.java
similarity index 100%
rename from deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/BeanManagerProviderEarFileTest.java
rename to deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/api/provider/BeanManagerProviderEarFileTest.java
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/activation/ClassDeactivationEarFileTest.java b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/activation/ClassDeactivationEarFileTest.java
similarity index 100%
rename from deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/activation/ClassDeactivationEarFileTest.java
rename to deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/activation/ClassDeactivationEarFileTest.java
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/custom/spi/PartialBeanAsInterfaceEarFileTest.java b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/custom/spi/PartialBeanAsInterfaceEarFileTest.java
similarity index 100%
rename from deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/custom/spi/PartialBeanAsInterfaceEarFileTest.java
rename to deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/custom/spi/PartialBeanAsInterfaceEarFileTest.java
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/jmx/SimpleRegistrationEarFileTest.java b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/jmx/SimpleRegistrationEarFileTest.java
similarity index 100%
rename from deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/jmx/SimpleRegistrationEarFileTest.java
rename to deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/jmx/SimpleRegistrationEarFileTest.java
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/util/JndiUtilsEarFileTest.java b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/util/JndiUtilsEarFileTest.java
similarity index 100%
rename from deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/util/JndiUtilsEarFileTest.java
rename to deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/util/JndiUtilsEarFileTest.java
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleExtension.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleExtension.java
index 0f34576..7b83f14 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleExtension.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleExtension.java
@@ -43,7 +43,6 @@ import org.apache.deltaspike.core.api.message.Message;
import org.apache.deltaspike.core.api.message.MessageBundle;
import org.apache.deltaspike.core.api.message.MessageTemplate;
import org.apache.deltaspike.core.util.ClassUtils;
-import org.apache.deltaspike.core.util.ParentExtensionStorage;
import org.apache.deltaspike.core.spi.activation.Deactivatable;
import org.apache.deltaspike.core.util.ClassDeactivationUtils;
@@ -65,7 +64,6 @@ public class MessageBundleExtension implements Extension, Deactivatable
protected void init(@Observes BeforeBeanDiscovery beforeBeanDiscovery)
{
isActivated = ClassDeactivationUtils.isActivated(getClass());
- ParentExtensionStorage.addExtension(this);
}
@SuppressWarnings("UnusedDeclaration")
@@ -138,12 +136,6 @@ public class MessageBundleExtension implements Extension, Deactivatable
return;
}
- MessageBundleExtension parentExtension = ParentExtensionStorage.getParentExtension(this);
- if (parentExtension != null)
- {
- messageBundleTypes.addAll(parentExtension.messageBundleTypes);
- }
-
for (AnnotatedType<?> mbType : messageBundleTypes)
{
abd.addBean()
diff --git a/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/extension/SecurityExtension.java b/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/extension/SecurityExtension.java
index 45b69a6..285da20 100644
--- a/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/extension/SecurityExtension.java
+++ b/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/extension/SecurityExtension.java
@@ -21,7 +21,6 @@ package org.apache.deltaspike.security.impl.extension;
import org.apache.deltaspike.core.spi.activation.Deactivatable;
import org.apache.deltaspike.core.util.ClassDeactivationUtils;
-import org.apache.deltaspike.core.util.ParentExtensionStorage;
import org.apache.deltaspike.core.util.metadata.builder.AnnotatedTypeBuilder;
import org.apache.deltaspike.security.api.authorization.Secures;
import org.apache.deltaspike.security.api.authorization.SecurityDefinitionException;
@@ -57,7 +56,6 @@ public class SecurityExtension implements Extension, Deactivatable
{
isActivated = ClassDeactivationUtils.isActivated(getClass());
securityMetaDataStorage = new SecurityMetaDataStorage();
- ParentExtensionStorage.addExtension(this);
}
//workaround for OWB
@@ -139,17 +137,6 @@ public class SecurityExtension implements Extension, Deactivatable
SecurityMetaDataStorage metaDataStorage = getMetaDataStorage();
- SecurityExtension parentExtension = ParentExtensionStorage.getParentExtension(this);
- if (parentExtension != null)
- {
- // also add the authorizers from the parent extension
- Set<Authorizer> parentAuthorizers = parentExtension.getMetaDataStorage().getAuthorizers();
- for (Authorizer parentAuthorizer : parentAuthorizers)
- {
- metaDataStorage.addAuthorizer(parentAuthorizer);
- }
- }
-
metaDataStorage.registerSecuredMethods();
for (final AnnotatedMethod<?> method : metaDataStorage.getSecuredMethods())